fix: issuer

formancehq · Dec 22, 2023 · 9fc042f · 9fc042f
1 parent 735dfb6
commit 9fc042f
Show file tree

Hide file tree

Showing 273 changed files with 745 additions and 138 deletions.
diff --git a/components/operator/apis/stack/v1beta3/stack_types.go b/components/operator/apis/stack/v1beta3/stack_types.go
@@ -206,6 +206,10 @@ func (s *Stack) GetScheme() string {
 	return "https"
 }
 
+func (s *Stack) PublicURL() string {
+	return fmt.Sprintf("%s://%s", s.GetScheme(), s.Spec.Host)
+}
+
 func (s *Stack) URL() string {
 	return "http://gateway:8000"
 }

diff --git a/...llers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/auth-config.yaml b/...llers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/auth-config.yaml
@@ -5,9 +5,9 @@ data:
             - public: false
               description: null
               redirectUris:
-                - http://example.net/auth/login
+                - http://gateway:8000/auth/login
               PostLogoutRedirectUris:
-                - http://example.net/auth/destroy
+                - http://gateway:8000/auth/destroy
               scopes:
                 - openid
                 - profile

diff --git a/...rs/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/gateway-config.yaml b/...rs/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/gateway-config.yaml
@@ -12,7 +12,7 @@ data:
 
         (auth) {
         	auth {
-        		issuer http://example.net/api/auth
+        		issuer http://gateway:8000/api/auth
 
         		read_key_set_max_retries 10
         	}

diff --git a/...onopod-disabled-one-service/results/deployments-apps-v1/monopod-disabled-one-service.yaml b/...onopod-disabled-one-service/results/deployments-apps-v1/monopod-disabled-one-service.yaml
@@ -70,6 +70,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: auth
@@ -137,13 +139,15 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: control
                     - name: STACK
                       value: monopod-disabled-one-service
                     - name: API_URL
-                      value: http://example.net
+                      value: http://gateway:8000
                     - name: ENCRYPTION_KEY
                       value: 9h44y2ZqrDuUy5R9NGLA9hca7uRUr932
                     - name: ENCRYPTION_IV
@@ -153,7 +157,7 @@ spec:
                     - name: CLIENT_SECRET
                       value: mocked-secret
                     - name: REDIRECT_URI
-                      value: http://example.net
+                      value: http://gateway:8000
                     - name: UNSECURE_COOKIES
                       value: "false"
                   image: ghcr.io/formancehq/control:latest
@@ -200,6 +204,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: gateway
@@ -270,6 +276,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: payments-api
@@ -351,6 +359,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: payments-connectors
@@ -415,6 +425,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: search
@@ -503,6 +515,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: search-benthos
@@ -592,6 +606,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: stargate
@@ -655,6 +671,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: wallets
@@ -728,6 +746,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: webhooks
@@ -805,6 +825,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: webhooks-worker

diff --git a/...nternal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/auth-config.yaml b/...nternal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/auth-config.yaml
@@ -5,9 +5,9 @@ data:
             - public: false
               description: null
               redirectUris:
-                - http://example.net/auth/login
+                - http://gateway:8000/auth/login
               PostLogoutRedirectUris:
-                - http://example.net/auth/destroy
+                - http://gateway:8000/auth/destroy
               scopes:
                 - openid
                 - profile

diff --git a/...rnal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/gateway-config.yaml b/...rnal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/gateway-config.yaml
@@ -12,7 +12,7 @@ data:
 
         (auth) {
         	auth {
-        		issuer http://example.net/api/auth
+        		issuer http://gateway:8000/api/auth
 
         		read_key_set_max_retries 10
         	}

diff --git a/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml b/...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml
@@ -70,6 +70,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: auth
@@ -137,13 +139,15 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: control
                     - name: STACK
                       value: monopod-latest
                     - name: API_URL
-                      value: http://example.net
+                      value: http://gateway:8000
                     - name: ENCRYPTION_KEY
                       value: 9h44y2ZqrDuUy5R9NGLA9hca7uRUr932
                     - name: ENCRYPTION_IV
@@ -153,7 +157,7 @@ spec:
                     - name: CLIENT_SECRET
                       value: mocked-secret
                     - name: REDIRECT_URI
-                      value: http://example.net
+                      value: http://gateway:8000
                     - name: UNSECURE_COOKIES
                       value: "false"
                   image: ghcr.io/formancehq/control:latest
@@ -200,6 +204,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: gateway
@@ -267,6 +273,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: ledger
@@ -344,6 +352,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: orchestration
@@ -423,6 +433,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: orchestration-worker
@@ -499,6 +511,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: payments-api
@@ -580,6 +594,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: payments-connectors
@@ -644,6 +660,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: search
@@ -732,6 +750,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: search-benthos
@@ -821,6 +841,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: stargate
@@ -884,6 +906,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: wallets
@@ -957,6 +981,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: webhooks
@@ -1034,6 +1060,8 @@ spec:
                     - name: DEV
                       value: "false"
                     - name: STACK_URL
+                      value: http://gateway:8000
+                    - name: STACK_PUBLIC_URL
                       value: http://example.net
                     - name: OTEL_SERVICE_NAME
                       value: webhooks-worker

diff --git a/...ernal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/auth-config.yaml b/...ernal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/auth-config.yaml
@@ -5,9 +5,9 @@ data:
             - public: false
               description: null
               redirectUris:
-                - http://example.net/auth/login
+                - http://gateway:8000/auth/login
               PostLogoutRedirectUris:
-                - http://example.net/auth/destroy
+                - http://gateway:8000/auth/destroy
               scopes:
                 - openid
                 - profile

diff --git a/...al/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/gateway-config.yaml b/...al/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/gateway-config.yaml
@@ -12,7 +12,7 @@ data:
 
         (auth) {
         	auth {
-        		issuer http://example.net/api/auth
+        		issuer http://gateway:8000/api/auth
 
         		read_key_set_max_retries 10
         	}