Fix reading google creds

Author: tmclaugh

.github/workflows/feature-branch.yml

@@ -70,13 +70,20 @@ jobs:
         run: |
           echo -e "$CONTENTS" > src/app-config.d/github-app-credentials.yaml
 
+      # Couldn't store JSON creds while retaining proper formatting so going to do this in two steps
       - 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/credentials/google-jwt.keys.json
+          echo -e "$CONTENTS" > src/app-config.d/credentials/google-jwt.keys.yaml
+
+      - name: Convert Google Admin API creds to YAML
+        id: google-admin-creds-yaml
+        shell: bash
+        run: |
+          yq -p yaml -o json src/app-config.d/credentials/google-jwt.keys.yaml > src/app-config.d/credentials/google-jwt.keys.json
 
       - name: Compile Typescript
         id: compile

.github/workflows/main.yml

@@ -70,13 +70,20 @@ jobs:
         run: |
           echo -e "$CONTENTS" > src/app-config.d/credentials/github-app-credentials.yaml
 
+      # Couldn't store JSON creds while retaining proper formatting so going to do this in two steps
       - 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/credentials/google-jwt.keys.json
+          echo -e "$CONTENTS" > src/app-config.d/credentials/google-jwt.keys.yaml
+
+      - name: Convert Google Admin API creds to YAML
+        id: google-admin-creds-yaml
+        shell: bash
+        run: |
+          yq -p yaml -o json src/app-config.d/credentials/google-jwt.keys.yaml > src/app-config.d/credentials/google-jwt.keys.json
 
       - name: Compile Typescript
         id: compile

src/app-config.production.yaml

@@ -60,7 +60,7 @@ catalog:
       auth:
         adminAccountEmail: tom@serverlessops.io
         clientCredentials:
-          $include: /app/app-config.d/credentials/google-jwt.keys.json
+          $include: /app/app-config.d/credentials/google-jwt.keys.yaml
       schedule:
         initialDelay: { seconds: 5 }
         frequency: { minutes: 1 }