Skip to content

Commit 4b461c4

Browse files
nikita-petkonikita-petko
committed
~ Clean up runner code by removing gRPC embedded.
~ Add client settings factory to the service provider. ~ Allow DEBUG builds to bypass token checks
1 parent bad3b1e commit 4b461c4

File tree

5 files changed

+98
-151
lines changed

5 files changed

+98
-151
lines changed

‎services/grid-bot/.component.yaml

+33-1
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,46 @@ deployment:
4141
static: 8101
4242
grpc:
4343
static: 5000
44+
http:
45+
static: 8080
4446
services:
45-
- name: grid-bot-${{ env.NOMAD_SHORT_ENVIRONMENT }}
47+
- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot
4648
port: metrics
4749
tags:
4850
- ${{ env.NOMAD_ENVIRONMENT }}
4951
checks:
5052
- type: http
5153
path: /metrics
54+
- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot-recovery
55+
port: grpc
56+
tags:
57+
- ${{ env.NOMAD_ENVIRONMENT }}
58+
checks:
59+
- type: grpc
60+
61+
- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web
62+
port: http
63+
tags:
64+
- ${{ env.NOMAD_ENVIRONMENT }}
65+
- "traefik.enable=true"
66+
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-http.rule=(HostRegexp(`{host:[a-zA-Z]+}.sitetest4.robloxlabs.com`) || Host(`versioncompatibility.api.sitetest4.robloxlabs.com`))"
67+
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-http.entrypoints=http"
68+
checks:
69+
- type: http
70+
path: /health
71+
72+
- name: ${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https
73+
port: http
74+
tags:
75+
- ${{ env.NOMAD_ENVIRONMENT }}
76+
- "traefik.enable=true"
77+
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.rule=(HostRegexp(`{host:[a-zA-Z]+}.sitetest4.robloxlabs.com`) || Host(`versioncompatibility.api.sitetest4.robloxlabs.com`))"
78+
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.entrypoints=https"
79+
- "traefik.http.routers.${{ env.NOMAD_ENVIRONMENT }}-grid-bot-web-https.tls=true"
80+
checks:
81+
- type: http
82+
path: /health
83+
5284
volumes:
5385
- '/var/run/docker.sock:/var/run/docker.sock'
5486
- '/tmp/.X11-unix:/tmp/.X11-unix'

‎services/grid-bot/grid-bot-bare.sln

+14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Settings", "lib\sett
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Utility", "lib\utility\Shared.Utility.csproj", "{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}"
1919
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Grpc", "lib\grpc\Grid.Bot.Grpc.csproj", "{BDC40A33-FB7D-4B64-8FD1-662092858DA8}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Web", "lib\web\Grid.Bot.Web.csproj", "{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}"
23+
EndProject
2024
Global
2125
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2226
Debug|Any CPU = Debug|Any CPU
@@ -43,6 +47,14 @@ Global
4347
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Debug|Any CPU.Build.0 = debug|Any CPU
4448
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Release|Any CPU.ActiveCfg = release|Any CPU
4549
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7}.Release|Any CPU.Build.0 = release|Any CPU
50+
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Debug|Any CPU.ActiveCfg = debug|Any CPU
51+
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Debug|Any CPU.Build.0 = debug|Any CPU
52+
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Release|Any CPU.ActiveCfg = release|Any CPU
53+
{BDC40A33-FB7D-4B64-8FD1-662092858DA8}.Release|Any CPU.Build.0 = release|Any CPU
54+
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Debug|Any CPU.ActiveCfg = debug|Any CPU
55+
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Debug|Any CPU.Build.0 = debug|Any CPU
56+
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Release|Any CPU.ActiveCfg = release|Any CPU
57+
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642}.Release|Any CPU.Build.0 = release|Any CPU
4658
EndGlobalSection
4759
GlobalSection(SolutionProperties) = preSolution
4860
HideSolutionNode = FALSE
@@ -53,5 +65,7 @@ Global
5365
{67005F02-FE69-4DCF-8D29-07989E8B4C18} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
5466
{425ECFC3-749B-4725-AF7B-A2CC56A06E6B} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
5567
{AB0EF72D-505F-4F0E-94AD-BA236218CEB7} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
68+
{BDC40A33-FB7D-4B64-8FD1-662092858DA8} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
69+
{EDD50BF5-0E1D-48FB-9BBB-61A9B3CE7642} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
5670
EndGlobalSection
5771
EndGlobal

‎services/grid-bot/grid-bot.sln

+14-7
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration", "..\..\lib\
5757
EndProject
5858
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Configuration.Core", "..\..\lib\src\configuration\core\Configuration.Core.csproj", "{0F99E3B7-B8A2-4166-94DD-E14E10B82782}"
5959
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientSettings.Client", "..\..\lib\src\clients\client-settings-client\ClientSettings.Client.csproj", "{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}"
61-
EndProject
6260
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thumbnails.Client", "..\..\lib\src\clients\thumbnails-client\Thumbnails.Client.csproj", "{067AC4F9-F1E9-435B-B837-9A9B05DDD621}"
6361
EndProject
6462
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Users.Client", "..\..\lib\src\clients\users-client\Users.Client.csproj", "{8702A9B1-8180-41FE-A639-AFE807B08512}"
6563
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Grpc", "lib\grpc\Grid.Bot.Grpc.csproj", "{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}"
65+
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grid.Bot.Web", "lib\web\Grid.Bot.Web.csproj", "{3AC6957F-78D6-4872-A0F1-C927FD545033}"
67+
EndProject
6668
Global
6769
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6870
Debug|Any CPU = Debug|Any CPU
@@ -169,10 +171,6 @@ Global
169171
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Debug|Any CPU.Build.0 = debug|Any CPU
170172
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Release|Any CPU.ActiveCfg = release|Any CPU
171173
{0F99E3B7-B8A2-4166-94DD-E14E10B82782}.Release|Any CPU.Build.0 = release|Any CPU
172-
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Debug|Any CPU.ActiveCfg = debug|Any CPU
173-
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Debug|Any CPU.Build.0 = debug|Any CPU
174-
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Release|Any CPU.ActiveCfg = release|Any CPU
175-
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E}.Release|Any CPU.Build.0 = release|Any CPU
176174
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Debug|Any CPU.ActiveCfg = debug|Any CPU
177175
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Debug|Any CPU.Build.0 = debug|Any CPU
178176
{067AC4F9-F1E9-435B-B837-9A9B05DDD621}.Release|Any CPU.ActiveCfg = release|Any CPU
@@ -181,6 +179,14 @@ Global
181179
{8702A9B1-8180-41FE-A639-AFE807B08512}.Debug|Any CPU.Build.0 = debug|Any CPU
182180
{8702A9B1-8180-41FE-A639-AFE807B08512}.Release|Any CPU.ActiveCfg = release|Any CPU
183181
{8702A9B1-8180-41FE-A639-AFE807B08512}.Release|Any CPU.Build.0 = release|Any CPU
182+
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Debug|Any CPU.ActiveCfg = debug|Any CPU
183+
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Debug|Any CPU.Build.0 = debug|Any CPU
184+
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Release|Any CPU.ActiveCfg = release|Any CPU
185+
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C}.Release|Any CPU.Build.0 = release|Any CPU
186+
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Debug|Any CPU.ActiveCfg = debug|Any CPU
187+
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Debug|Any CPU.Build.0 = debug|Any CPU
188+
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Release|Any CPU.ActiveCfg = release|Any CPU
189+
{3AC6957F-78D6-4872-A0F1-C927FD545033}.Release|Any CPU.Build.0 = release|Any CPU
184190
EndGlobalSection
185191
GlobalSection(SolutionProperties) = preSolution
186192
HideSolutionNode = FALSE
@@ -211,8 +217,9 @@ Global
211217
{67C7D321-75F2-4ADC-9C24-BC02E345E0E0} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
212218
{689B303F-6238-4F1A-8F24-2C8B4FE6C8BD} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
213219
{0F99E3B7-B8A2-4166-94DD-E14E10B82782} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
214-
{FDE94473-0D43-4FBC-9CDD-E29A3938BC1E} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
215220
{067AC4F9-F1E9-435B-B837-9A9B05DDD621} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
216221
{8702A9B1-8180-41FE-A639-AFE807B08512} = {6A79B4E5-D433-4FCF-9E6E-AED94F97099D}
222+
{C4BAE13A-0315-4B1F-A40F-10CAAD7F184C} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
223+
{3AC6957F-78D6-4872-A0F1-C927FD545033} = {4FA0281C-7E8F-45E6-820E-97554DE934AE}
217224
EndGlobalSection
218225
EndGlobal

‎services/grid-bot/src/Grid.Bot.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19+
<ProjectReference Include="../lib/grpc/Grid.Bot.Grpc.csproj" />
20+
<ProjectReference Include="../lib/web/Grid.Bot.Web.csproj" />
1921
<ProjectReference Include="..\lib\commands\Shared.Commands.csproj" />
2022
<ProjectReference Include="..\lib\events\Shared.Events.csproj" />
2123
<ProjectReference Include="..\lib\settings\Shared.Settings.csproj" />
@@ -37,11 +39,10 @@
3739
<ItemGroup>
3840
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
3941

40-
<PackageReference Include="Discord.Net.WebSocket" Version="3.15.3" />
41-
<PackageReference Include="Discord.Net.Commands" Version="3.15.3" />
42-
<PackageReference Include="Discord.Net.Interactions" Version="3.15.3" />
43-
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
44-
<PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
42+
<PackageReference Include="Discord.Net.WebSocket" Version="3.17.4" />
43+
<PackageReference Include="Discord.Net.Commands" Version="3.17.4" />
44+
<PackageReference Include="Discord.Net.Interactions" Version="3.17.4" />
45+
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
4546
</ItemGroup>
4647

4748

0 commit comments

Comments
 (0)