Merge cleanup;

CleanMicroservice · Aug 30, 2023 · 6f8be9d · 6f8be9d
2 parents 3d37a88 + 06aec3d
commit 6f8be9d
Show file tree

Hide file tree

Showing 38 changed files with 0 additions and 920 deletions.
diff --git a/src/CleanMicroserviceSystem.sln b/src/CleanMicroserviceSystem.sln
@@ -143,20 +143,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Ast
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Astra.Client", "MicroserviceComponents\NuGetServer\CleanMicroserviceSystem.Astra.Client\CleanMicroserviceSystem.Astra.Client.csproj", "{BC7B9B44-7A73-4697-9E17-E20F1BA88A43}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "K8sAgent", "K8sAgent", "{9EA646DE-73AB-4A84-9715-4FF81A196272}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.Application", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.Application\CleanMicroserviceSystem.Hermes.Application.csproj", "{E2E8761F-318B-460C-87F9-41111A901899}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.Client", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.Client\CleanMicroserviceSystem.Hermes.Client.csproj", "{E8731EC9-32FB-4C40-A16F-53D26965AB2A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.Contract", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.Contract\CleanMicroserviceSystem.Hermes.Contract.csproj", "{3F19D5F5-F204-4613-B0F4-49BE87D4500F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.Domain", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.Domain\CleanMicroserviceSystem.Hermes.Domain.csproj", "{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.Infrastructure", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.Infrastructure\CleanMicroserviceSystem.Hermes.Infrastructure.csproj", "{02DB66F2-BFA8-455C-A56D-828855883979}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Hermes.WebAPI", "MicroserviceComponents\K8sAgent\CleanMicroserviceSystem.Hermes.WebAPI\CleanMicroserviceSystem.Hermes.WebAPI.csproj", "{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CleanMicroserviceSystem.Themis.NTLMWeb", "MicroserviceComponents\IdentityService\CleanMicroserviceSystem.Themis.NTLMWeb\CleanMicroserviceSystem.Themis.NTLMWeb.csproj", "{C156834C-1DBB-4232-AC69-778473AD6D2F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BondiCompetition", "BondiCompetition", "{86342751-D959-4429-A59A-66FF4024AE28}"
@@ -522,54 +508,6 @@ Global
 		{BC7B9B44-7A73-4697-9E17-E20F1BA88A43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC7B9B44-7A73-4697-9E17-E20F1BA88A43}.Release|x86.ActiveCfg = Release|Any CPU
 		{BC7B9B44-7A73-4697-9E17-E20F1BA88A43}.Release|x86.Build.0 = Release|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Debug|x86.Build.0 = Debug|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Release|x86.ActiveCfg = Release|Any CPU
-		{E2E8761F-318B-460C-87F9-41111A901899}.Release|x86.Build.0 = Release|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Debug|x86.Build.0 = Debug|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A}.Release|x86.Build.0 = Release|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F}.Release|x86.Build.0 = Release|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Debug|x86.Build.0 = Debug|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Release|x86.ActiveCfg = Release|Any CPU
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14}.Release|x86.Build.0 = Release|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Debug|x86.Build.0 = Debug|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Release|x86.ActiveCfg = Release|Any CPU
-		{02DB66F2-BFA8-455C-A56D-828855883979}.Release|x86.Build.0 = Release|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Debug|x86.Build.0 = Debug|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Release|x86.ActiveCfg = Release|Any CPU
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB}.Release|x86.Build.0 = Release|Any CPU
 		{C156834C-1DBB-4232-AC69-778473AD6D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C156834C-1DBB-4232-AC69-778473AD6D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C156834C-1DBB-4232-AC69-778473AD6D2F}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -686,13 +624,6 @@ Global
 		{99D23F2F-3673-4423-83AB-005D0B6A2104} = {23FDB838-00DE-4A6A-9D22-9216984B4696}
 		{BCB0D073-0ABA-44AF-8800-C19C0769723B} = {23FDB838-00DE-4A6A-9D22-9216984B4696}
 		{BC7B9B44-7A73-4697-9E17-E20F1BA88A43} = {23FDB838-00DE-4A6A-9D22-9216984B4696}
-		{9EA646DE-73AB-4A84-9715-4FF81A196272} = {5B1F846E-EADB-49F2-9B23-12A25E4EC17D}
-		{E2E8761F-318B-460C-87F9-41111A901899} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
-		{E8731EC9-32FB-4C40-A16F-53D26965AB2A} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
-		{3F19D5F5-F204-4613-B0F4-49BE87D4500F} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
-		{8B1F2DFB-E622-454D-B01E-E4209E5E6F14} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
-		{02DB66F2-BFA8-455C-A56D-828855883979} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
-		{7EFE4FCE-F63B-4FA9-A467-0B99D9A46CAB} = {9EA646DE-73AB-4A84-9715-4FF81A196272}
 		{C156834C-1DBB-4232-AC69-778473AD6D2F} = {65AA7E50-47CF-4AA9-82F9-C1BB5926A81A}
 		{86342751-D959-4429-A59A-66FF4024AE28} = {5B1F846E-EADB-49F2-9B23-12A25E4EC17D}
 		{FB1E6147-29BD-429A-B0E6-40B4D6C76C35} = {86342751-D959-4429-A59A-66FF4024AE28}

diff --git a/...viceComponents/Gateway/CleanMicroserviceSystem.Uranus.WebAPI/appsettings.Development.json b/...viceComponents/Gateway/CleanMicroserviceSystem.Uranus.WebAPI/appsettings.Development.json
@@ -41,17 +41,6 @@
         "Type": "RoundRobin"
       }
     },
-    {
-      "DownstreamPathTemplate": "/{url}",
-      "DownstreamScheme": "https",
-      "UpstreamPathTemplate": "/Ocelot/Hermes/{url}",
-      "UpstreamHttpMethod": [ "Get", "Post", "Put", "Patch", "Delete", "Options", "Head" ],
-      "ServiceName": "K8sAgent-Hermes-Dev",
-      "UseServiceDiscovery": true,
-      "LoadBalancerOptions": {
-        "Type": "RoundRobin"
-      }
-    },
     {
       "DownstreamPathTemplate": "/{url}",
       "DownstreamScheme": "https",

diff --git a/...rviceComponents/Gateway/CleanMicroserviceSystem.Uranus.WebAPI/appsettings.Production.json b/...rviceComponents/Gateway/CleanMicroserviceSystem.Uranus.WebAPI/appsettings.Production.json
@@ -41,17 +41,6 @@
         "Type": "RoundRobin"
       }
     },
-    {
-      "DownstreamPathTemplate": "/{url}",
-      "DownstreamScheme": "https",
-      "UpstreamPathTemplate": "/Ocelot/Hermes/{url}",
-      "UpstreamHttpMethod": [ "Get", "Post", "Put", "Patch", "Delete", "Options", "Head" ],
-      "ServiceName": "K8sAgent-Hermes-Prod",
-      "UseServiceDiscovery": true,
-      "LoadBalancerOptions": {
-        "Type": "RoundRobin"
-      }
-    },
     {
       "DownstreamPathTemplate": "/{url}",
       "DownstreamScheme": "https",

diff --git a/...anMicroserviceSystem.Hermes.Application/CleanMicroserviceSystem.Hermes.Application.csproj b/...anMicroserviceSystem.Hermes.Application/CleanMicroserviceSystem.Hermes.Application.csproj
diff --git a/...sAgent/CleanMicroserviceSystem.Hermes.Client/CleanMicroserviceSystem.Hermes.Client.csproj b/...sAgent/CleanMicroserviceSystem.Hermes.Client/CleanMicroserviceSystem.Hermes.Client.csproj
diff --git a/src/MicroserviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClient.cs b/src/MicroserviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClient.cs
diff --git a/...eComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientConfiguration.cs b/...eComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientConfiguration.cs
diff --git a/...erviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientContract.cs b/...erviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientContract.cs
diff --git a/...rviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientExtension.cs b/...rviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Client/K8sAgentClientExtension.cs
diff --git a/...nt/CleanMicroserviceSystem.Hermes.Contract/CleanMicroserviceSystem.Hermes.Contract.csproj b/...nt/CleanMicroserviceSystem.Hermes.Contract/CleanMicroserviceSystem.Hermes.Contract.csproj
diff --git a/src/MicroserviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Contract/SendParameter.cs b/src/MicroserviceComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Contract/SendParameter.cs
diff --git a/...sAgent/CleanMicroserviceSystem.Hermes.Domain/CleanMicroserviceSystem.Hermes.Domain.csproj b/...sAgent/CleanMicroserviceSystem.Hermes.Domain/CleanMicroserviceSystem.Hermes.Domain.csproj
diff --git a/...oserviceSystem.Hermes.Infrastructure/CleanMicroserviceSystem.Hermes.Infrastructure.csproj b/...oserviceSystem.Hermes.Infrastructure/CleanMicroserviceSystem.Hermes.Infrastructure.csproj
diff --git a/...eComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Infrastructure/DependencyInjection.cs b/...eComponents/K8sAgent/CleanMicroserviceSystem.Hermes.Infrastructure/DependencyInjection.cs