Remove deprecation warning about backend.auth.keys (#390)

* fixed default configration to remove deprecation warning about backend.auth.keys Signed-off-by: Kashish Mittal <[email protected]> * Regenerate bundle manifests Co-authored-by: 04kash <[email protected]> * added config value for backend.auth.externalAccess[0].options.subject Signed-off-by: Kashish Mittal <[email protected]> * added config value for backend.auth.externalAccess[0].options.subject Signed-off-by: Kashish Mittal <[email protected]> * Regenerate bundle manifests Co-authored-by: 04kash <[email protected]> --------- Signed-off-by: Kashish Mittal <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: 04kash <[email protected]>
janus-idp · Jul 4, 2024 · 83b7f91 · 83b7f91
1 parent 16cf9dd
commit 83b7f91
Show file tree

Hide file tree

Showing 8 changed files with 512 additions and 490 deletions.
diff --git a/.rhdh/docs/openshift.adoc b/.rhdh/docs/openshift.adoc
@@ -49,8 +49,11 @@ data:
        title: Red Hat Developer Hub
      backend:
        auth:
-         keys:
-           - secret: "${BACKEND_SECRET}"
+         externalAccess:
+            - type: legacy
+              options:
+                subject: legacy-default-config
+                secret: "${BACKEND_SECRET}"
        baseUrl: https://backstage-<CUSTOM_RESOURCE_NAME>-<NAMESPACE_NAME>.<OPENSHIFT_INGRESS_DOMAIN>
        cors:
          origin: https://backstage-<CUSTOM_RESOURCE_NAME>-<NAMESPACE_NAME>.<OPENSHIFT_INGRESS_DOMAIN>
@@ -72,8 +75,11 @@ data:
       baseUrl: https://backstage-backstage-sample-my-ns.apps.ci-ln-vtkzr22-72292.origin-ci-int-gce.dev.rhcloud.com
     backend:
       auth:
-        keys:
-          - secret: "${BACKEND_SECRET}"
+        externalAccess:
+            - type: legacy
+              options:
+                subject: legacy-default-config
+                secret: "${BACKEND_SECRET}"
       baseUrl: https://backstage-backstage-sample-my-ns.apps.ci-ln-vtkzr22-72292.origin-ci-int-gce.dev.rhcloud.com
       cors:
         origin: https://backstage-backstage-sample-my-ns.apps.ci-ln-vtkzr22-72292.origin-ci-int-gce.dev.rhcloud.com

diff --git a/bundle/manifests/backstage-default-config_v1_configmap.yaml b/bundle/manifests/backstage-default-config_v1_configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  app-config.yaml: |-
+  app-config.yaml: |
     apiVersion: v1
     kind: ConfigMap
     metadata:
@@ -9,9 +9,12 @@ data:
       default.app-config.yaml: |
         backend:
           auth:
-            keys:
-              # This is a default value, which you should change by providing your own app-config
-              - secret: "pl4s3Ch4ng3M3"
+            externalAccess:
+              - type: legacy
+                options:
+                  subject: legacy-default-config
+                  # This is a default value, which you should change by providing your own app-config
+                  secret: "pl4s3Ch4ng3M3"
   db-secret.yaml: |-
     apiVersion: v1
     kind: Secret

diff --git a/bundle/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/manifests/backstage-operator.clusterserviceversion.yaml
@@ -21,7 +21,7 @@ metadata:
         }
       ]
     capabilities: Seamless Upgrades
-    createdAt: "2024-06-04T03:39:33Z"
+    createdAt: "2024-07-02T14:30:16Z"
     operatorframework.io/suggested-namespace: backstage-system
     operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

diff --git a/config/manager/default-config/app-config.yaml b/config/manager/default-config/app-config.yaml
@@ -6,6 +6,9 @@ data:
   default.app-config.yaml: |
     backend:
       auth:
-        keys:
-          # This is a default value, which you should change by providing your own app-config
-          - secret: "pl4s3Ch4ng3M3"
+        externalAccess:
+          - type: legacy
+            options:
+              subject: legacy-default-config
+              # This is a default value, which you should change by providing your own app-config
+              secret: "pl4s3Ch4ng3M3"
diff --git a/examples/rhdh-cr-with-app-configs.yaml b/examples/rhdh-cr-with-app-configs.yaml
@@ -46,9 +46,11 @@ data:
   "app-config.backend-auth.yaml": |
     backend:
       auth:
-        keys:
-          - secret: "${BACKEND_SECRET}"
-
+        externalAccess:
+            - type: legacy
+              options:
+                subject: legacy-default-config
+                secret: "${BACKEND_SECRET}"
 ---
 apiVersion: v1
 kind: Secret
@@ -141,7 +143,7 @@ data:
         pluginConfig:
           catalog:
             providers:
-              gitlab: {} 
+              gitlab: {}
 
 ---
 apiVersion: v1

diff --git a/examples/rhdh-cr.yaml b/examples/rhdh-cr.yaml
@@ -22,8 +22,11 @@ data:
   "app-config-rhdh.yaml": |
     backend:
       auth:
-        keys:
-          - secret: "${BACKEND_SECRET}"
+        externalAccess:
+            - type: legacy
+              options:
+                subject: legacy-default-config
+                secret: "${BACKEND_SECRET}"
     auth:
       # see https://backstage.io/docs/auth/ to learn about auth providers
       environment: development

diff --git a/pkg/model/testdata/raw-app-config.yaml b/pkg/model/testdata/raw-app-config.yaml
@@ -10,6 +10,9 @@ data:
           password: ${POSTGRES_PASSWORD}
           user: ${POSTGRES_USER}
       auth:
-        keys:
-          # This is a default value, which you should change by providing your own app-config
-          - secret: "pl4s3Ch4ng3M3"
+        externalAccess:
+          - type: legacy
+            options:
+              subject: legacy-default-config
+              # This is a default value, which you should change by providing your own app-config
+              secret: "pl4s3Ch4ng3M3"
diff --git a/tests/e2e/testdata/backstage-operator-0.1.3.yaml b/tests/e2e/testdata/backstage-operator-0.1.3.yaml