configure prod for new provider

Author: tmclaugh

.github/workflows/main.yml

@@ -70,6 +70,14 @@ jobs:
         run: |
           echo -e "$CONTENTS" > src/app-config.d/github-app-credentials.yaml
 
+      - name: Write Google Admin API creds
+        id: google-admin-creds
+        shell: bash
+        env:
+          CONTENTS: ${{ secrets.CATALOG_GOOGLE_JWT_KEYS }}
+        run: |
+          echo -e "$CONTENTS" > src/app-config.d/google-jwt.keys.json
+
       - name: Compile Typescript
         id: compile
         shell: bash

.gitignore

@@ -76,3 +76,6 @@ codepipeline-config-*.yaml
 
 # AWS SAM
 .aws-sam/
+
+# Backstage credentials
+src/app-config.d/credentials

src/app-config.d/catalogs/groups.yaml

@@ -52,19 +52,19 @@ integrations:
   github:
     - host: github.com
       apps:
-        - $include: /app/app-config.d/github-app-credentials.yaml
+        - $include: /app/app-config.d/credentials/github-app-credentials.yaml
 
 catalog:
   providers:
     google:
-      baseUrl: https://google.com
       auth:
-        clientId: ${CATALOG_GOOGLE_CLIENT_ID}
-        clientSecret: ${CATALOG_GOOGLE_CLIENT_SECRET}
+        adminAccountEmail: tom@serverlessops.io
+        clientCredentials:
+          $include: /app/app-config.d/credentials/google-jwt.keys.json
       schedule:
         initialDelay: { seconds: 5 }
-        frequency: { minutes: 15 }
-        timeout: { seconds: 60 }
+        frequency: { minutes: 1 }
+        timeout: { seconds: 30 }
     serverlessops-catalog:
       baseUrl: ${SERVERLESSOPS_CATALOG_API_URL}
       namespace: default
@@ -87,14 +87,6 @@ catalog:
   # See https://backstage.io/docs/features/software-catalog/#adding-components-to-the-catalog for more details
   # on how to get entities into the catalog.
   locations:
-    - type: file
-      target: /app/app-config.d/catalogs/users.yaml
-      rules:
-        - allow: [User]
-    - type: file
-      target: /app/app-config.d/catalogs/groups.yaml
-      rules:
-        - allow: [Groups]
     - type: file
       target: /app/app-config.d/scaffolders/domain-add.yaml
       rules: