chore(passport): change passport config

Author: duanhongyi

charts/passport/templates/_helpers.tpl

@@ -27,16 +27,16 @@ env:
     secretKeyRef:
       name: passport-creds
       key: django-secret-key
-- name: SOCIAL_AUTH_DRYCC_CONTROLLER_KEY
+- name: DRYCC_PASSPORT_CONTROLLER_KEY
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-controller-key
-- name: SOCIAL_AUTH_DRYCC_CONTROLLER_SECRET
+      key: drycc-passport-controller-key
+- name: DRYCC_PASSPORT_CONTROLLER_SECRET
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-controller-secret
+      key: drycc-passport-controller-secret
 - name: WORKFLOW_NAMESPACE
   valueFrom:
     fieldRef:
@@ -56,16 +56,16 @@ env:
 {{- end }}
 - name: GRAFANA_ON_CLUSTER
   value: "true"
-- name: SOCIAL_AUTH_DRYCC_GRAFANA_KEY
+- name: DRYCC_PASSPORT_GRAFANA_KEY
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-grafana-key
-- name: SOCIAL_AUTH_DRYCC_GRAFANA_SECRET
+      key: drycc-passport-grafana-key
+- name: DRYCC_PASSPORT_GRAFANA_SECRET
   valueFrom:
     secretKeyRef:
       name: passport-creds
-      key: social-auth-drycc-grafana-secret
+      key: drycc-passport-grafana-secret
 {{- end }}
 {{- if (.Values.databaseUrl) }}
 - name: DRYCC_DATABASE_URL

charts/passport/templates/passport-secret-creds.yaml

@@ -12,11 +12,11 @@ data:
   database-url: {{ .Values.databaseUrl | b64enc }}
   {{- end }}
   django-secret-key: {{ randAscii 64 | b64enc }}
-  social-auth-drycc-controller-key: {{ randAlphaNum 40 | b64enc }}
-  social-auth-drycc-controller-secret: {{ randAlphaNum 64 | b64enc }}
+  drycc-passport-controller-key: {{ randAlphaNum 40 | b64enc }}
+  drycc-passport-controller-secret: {{ randAlphaNum 64 | b64enc }}
   {{- if eq .Values.global.grafanaLocation "on-cluster" }}
-  social-auth-drycc-grafana-key: {{ randAlphaNum 40 | b64enc }}
-  social-auth-drycc-grafana-secret: {{ randAlphaNum 64 | b64enc }}
+  drycc-passport-grafana-key: {{ randAlphaNum 40 | b64enc }}
+  drycc-passport-grafana-secret: {{ randAlphaNum 64 | b64enc }}
   {{- end }}
   oidc-rsa-private-key: "{{genPrivateKey "rsa" | b64enc}}"
 {{- end }}

rootfs/api/management/commands/create_oauth2_application.py

@@ -22,11 +22,11 @@ def handle(self, *args, **options):
 
         for app in app_list:
             client_id = os.environ.get(
-                f'SOCIAL_AUTH_DRYCC_{app["name"]}_KEY') if os.environ.get(
-                f'SOCIAL_AUTH_DRYCC_{app["name"]}_KEY') else None
+                f'DRYCC_PASSPORT_{app["name"]}_KEY') if os.environ.get(
+                f'DRYCC_PASSPORT_{app["name"]}_KEY') else None
             client_secret = os.environ.get(
-                f'SOCIAL_AUTH_DRYCC_{app["name"]}_SECRET') if os.environ.get(
-                f'SOCIAL_AUTH_DRYCC_{app["name"]}_SECRET') else None
+                f'DRYCC_PASSPORT_{app["name"]}_SECRET') if os.environ.get(
+                f'DRYCC_PASSPORT_{app["name"]}_SECRET') else None
             if not all([client_id, client_secret]):
                 self.stdout.write('client_id or client_secret non-existent')
                 return