From 0cdb788490f1cb10fd97a63d8025a9f898fea4d7 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 24 Jan 2024 16:01:59 -0500 Subject: [PATCH 1/3] Fixed basket service deployment missing swagger client id --- .../eshoponabp/charts/basket/templates/basket-deployment.yaml | 4 +--- .../src/EShopOnAbp.BasketService/BasketServiceModule.cs | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml index 913ef657..7d29c260 100644 --- a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml @@ -42,9 +42,7 @@ spec: - name: "AuthServer__MetadataAddress" value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" - value: "{{ .Values.config.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.swaggerClientSecret }}" + value: "{{ .Values.config.authServer.swaggerClientId }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "RemoteServices__Catalog__BaseUrl" diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs index ea24e27e..92adfd78 100644 --- a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs +++ b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs @@ -100,7 +100,6 @@ public class BasketServiceModule : AbpModule var configuration = context.ServiceProvider.GetRequiredService(); options.SwaggerEndpoint("/swagger/v1/swagger.json", "Basket Service API"); options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]); - options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]); }); app.UseAbpSerilogEnrichers(); app.UseAuditing(); From 9dd6d951d92178699075f5820733d0bf30f94046 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 24 Jan 2024 16:02:28 -0500 Subject: [PATCH 2/3] removed clietn secret and added correct metadata address for swagger --- .../administration/templates/administration-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/basket/values.yaml | 1 - .../eshoponabp/charts/catalog/templates/catalog-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/catalog/values.yaml | 1 - .../eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/cmskit/values.yaml | 1 - .../templates/gateway-web-public-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml | 1 - .../charts/gateway-web/templates/gateway-web-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/gateway-web/values.yaml | 1 - .../charts/identity/templates/identity-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/identity/values.yaml | 1 - .../charts/ordering/templates/ordering-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/ordering/values.yaml | 1 - .../eshoponabp/charts/payment/templates/payment-deployment.yaml | 2 -- etc/k8s/eshoponabp/charts/payment/values.yaml | 1 - 16 files changed, 24 deletions(-) diff --git a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml index c5902d11..dc960458 100644 --- a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml @@ -43,8 +43,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "RabbitMQ__Connections__Default__HostName" diff --git a/etc/k8s/eshoponabp/charts/basket/values.yaml b/etc/k8s/eshoponabp/charts/basket/values.yaml index df2dda03..c5079d10 100644 --- a/etc/k8s/eshoponabp/charts/basket/values.yaml +++ b/etc/k8s/eshoponabp/charts/basket/values.yaml @@ -8,7 +8,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: "WebGateway_Swagger" - swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml index 6fab6b7b..d43f5e32 100644 --- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml @@ -51,8 +51,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "Kestrel__Endpoints__Http__Url" diff --git a/etc/k8s/eshoponabp/charts/catalog/values.yaml b/etc/k8s/eshoponabp/charts/catalog/values.yaml index a27e26ab..7285c682 100644 --- a/etc/k8s/eshoponabp/charts/catalog/values.yaml +++ b/etc/k8s/eshoponabp/charts/catalog/values.yaml @@ -9,7 +9,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq diff --git a/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml b/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml index a9d38fea..92f693cb 100644 --- a/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml @@ -45,8 +45,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: RemoteServices__AbpIdentity__BaseUrl diff --git a/etc/k8s/eshoponabp/charts/cmskit/values.yaml b/etc/k8s/eshoponabp/charts/cmskit/values.yaml index b1850731..e4ac387c 100644 --- a/etc/k8s/eshoponabp/charts/cmskit/values.yaml +++ b/etc/k8s/eshoponabp/charts/cmskit/values.yaml @@ -9,7 +9,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" remoteServices: abpIdentityBaseUrl: # dotnetEnv: Staging diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml index e341c241..b80913dc 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml @@ -41,8 +41,6 @@ spec: value: "{{ .Values.config.authServer.requireHttpsMetadata }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "ElasticSearch__Url" value: "{{ .Values.config.elasticsearchHost }}" {{- if .Values.env }} diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml index b8d13976..426216d9 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml @@ -5,7 +5,6 @@ config: authority: http://eshop-st-authserver requireHttpsMetadata: "false" swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq diff --git a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml index 9a729de6..b8d6f2da 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml @@ -43,8 +43,6 @@ spec: value: "{{ .Values.config.authServer.requireHttpsMetadata }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "ElasticSearch__Url" value: "{{ .Values.config.elasticsearchHost }}" - name: "StringEncryption__DefaultPassPhrase" diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml index 3e2a1273..12b18f4d 100644 --- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml +++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml @@ -6,7 +6,6 @@ config: authority: http://eshop-st-authserver requireHttpsMetadata: "false" swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" dotnetEnv: # redisHost: # rabbitmqHost: # diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml index cdb4a5f4..69c8d95a 100644 --- a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml @@ -53,8 +53,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" - name: "Clients__Web__RootUrl" diff --git a/etc/k8s/eshoponabp/charts/identity/values.yaml b/etc/k8s/eshoponabp/charts/identity/values.yaml index 02535f3f..118c1514 100644 --- a/etc/k8s/eshoponabp/charts/identity/values.yaml +++ b/etc/k8s/eshoponabp/charts/identity/values.yaml @@ -9,7 +9,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" keycloak: url: http://eshop-st-keycloak:8080 adminUsername: admin diff --git a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml index 76b9c998..6573f76e 100644 --- a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml @@ -46,8 +46,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" diff --git a/etc/k8s/eshoponabp/charts/ordering/values.yaml b/etc/k8s/eshoponabp/charts/ordering/values.yaml index da234936..6f2db053 100644 --- a/etc/k8s/eshoponabp/charts/ordering/values.yaml +++ b/etc/k8s/eshoponabp/charts/ordering/values.yaml @@ -9,7 +9,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq diff --git a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml index 2ac12514..71c386c9 100644 --- a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml +++ b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml @@ -45,8 +45,6 @@ spec: value: "{{ .Values.config.authServer.metadataAddress }}" - name: "AuthServer__SwaggerClientId" value: "{{ .Values.config.authServer.swaggerClientId }}" - - name: "AuthServer__SwaggerClientSecret" - value: "{{ .Values.config.authServer.swaggerClientSecret }}" - name: "StringEncryption__DefaultPassPhrase" value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}" {{- if .Values.env }} diff --git a/etc/k8s/eshoponabp/charts/payment/values.yaml b/etc/k8s/eshoponabp/charts/payment/values.yaml index fa51d483..7a54127e 100644 --- a/etc/k8s/eshoponabp/charts/payment/values.yaml +++ b/etc/k8s/eshoponabp/charts/payment/values.yaml @@ -9,7 +9,6 @@ config: requireHttpsMetadata: "false" metadataAddress: http://eshop-st-keycloak:8080 swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq From b6952ecce49ee6b0c607af0f2f46cf9501bb4529 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 24 Jan 2024 16:02:40 -0500 Subject: [PATCH 3/3] updated metadata address for swagger client --- etc/k8s/eshoponabp/values.st.yaml | 44 +++++++++++++------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml index 1f47f261..3ddc8275 100644 --- a/etc/k8s/eshoponabp/values.st.yaml +++ b/etc/k8s/eshoponabp/values.st.yaml @@ -83,9 +83,8 @@ identity: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -120,9 +119,8 @@ administration: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient remoteServices: abpIdentityBaseUrl: http://identity.eshoponabp.dev useCurrentToken: "false" @@ -147,8 +145,7 @@ gateway-web: authServer: authority: http://account.eshoponabp.dev requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -181,10 +178,10 @@ gateway-web-public: config: selfUrl: https://gateway-public.eshoponabp.dev authServer: - authority: http://account.eshoponabp.dev + authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -228,9 +225,8 @@ basket: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -256,9 +252,8 @@ catalog: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -286,9 +281,8 @@ ordering: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient dotnetEnv: Staging redisHost: eshop-st-redis rabbitmqHost: eshop-st-rabbitmq @@ -311,9 +305,8 @@ cmskit: authServer: authority: https://account.eshoponabp.dev/realms/master requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient remoteServices: abpIdentityBaseUrl: https://identity.eshoponabp.dev dotnetEnv: Staging @@ -340,9 +333,8 @@ payment: authServer: authority: http://account.eshoponabp.dev requireHttpsMetadata: "false" - metadataAddress: http://eshop-st-keycloak/realms/master - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" + metadataAddress: https://account.eshoponabp.dev/realms/master + swaggerClientId: SwaggerClient remoteServices: abpIdentityBaseUrl: https://identity.eshoponabp.dev dotnetEnv: Staging