Update CI and deps (#367)

Author: sethvargo

.github/workflows/cleanup.yml

@@ -0,0 +1,36 @@
+name: 'Cleanup'
+
+on:
+  schedule:
+    - cron: '0 */4 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: 'read'
+  id-token: 'write'
+
+jobs:
+  cleanup:
+    runs-on: 'ubuntu-latest'
+
+    steps:
+    - uses: 'actions/checkout@v3'
+
+    - uses: 'google-github-actions/auth@main'
+      with:
+        workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
+        service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
+
+    - uses: 'google-github-actions/setup-gcloud@main'
+
+    - name: Delete services
+      run: |-
+        BUFFER="$(TZ=GMT+4 date +%Y-%m-%d)"
+
+        gcloud config set core/project "${{ secrets.PROJECT_ID }}"
+        gcloud config set functions/region "us-central1"
+
+        (IFS=$'\n'; for NAME in $(gcloud functions list --format="value(name)" --filter="updateTime.date('%Y-%m-%d', Z) < '${BUFFER}'"); do
+          echo "Deleting ${NAME}..."
+          gcloud functions delete ${NAME} --quiet
+        done)

.github/workflows/integration.yml

@@ -33,23 +33,17 @@ jobs:
     - uses: 'google-github-actions/auth@main'
       with:
         workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
-        service_account: '${{ secrets.DEPLOY_CF_SA_EMAIL }}'
+        service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
 
     - id: 'deploy'
       uses: './'
       with:
         name: 'https-trigger-${{ github.run_number }}'
-        runtime: 'nodejs10'
+        runtime: 'nodejs16'
         entry_point: 'helloWorld'
         source_dir: './tests/test-node-func/'
         https_trigger_security_level: 'secure_always'
 
-    - name: 'cleanup'
-      if: ${{ always() }}
-      env:
-        CLEANUP_FUNCTION_NAME: '${{ steps.deploy.outputs.id }}'
-      run: 'npm run cleanup'
-
   event_trigger:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     permissions:
@@ -69,31 +63,26 @@ jobs:
     - uses: 'google-github-actions/auth@main'
       with:
         workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
-        service_account: '${{ secrets.DEPLOY_CF_SA_EMAIL }}'
+        service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
 
     - id: 'deploy'
       uses: './'
       with:
         name: 'event-trigger-${{ github.run_number }}'
-        runtime: 'nodejs10'
+        runtime: 'nodejs16'
         entry_point: 'helloWorld'
         source_dir: './tests/test-node-func/'
         event_trigger_type: 'providers/cloud.pubsub/eventTypes/topic.publish'
-        event_trigger_resource: '${{ secrets.DEPLOY_CF_EVENT_PUBSUB_TOPIC }}'
+        event_trigger_resource: '${{ secrets.PUBSUB_TOPIC_NAME }}'
         event_trigger_retry: true
         env_vars_file: './tests/env-var-files/test.good.yaml'
         build_environment_variables: 'FOO=bar, ZIP=zap'
         build_environment_variables_file: './tests/env-var-files/test.good.yaml'
         secret_environment_variables: |-
-          FOO=${{ secrets.DEPLOY_CF_SECRET_VERSION_REF }}
-          BAR=${{ secrets.DEPLOY_CF_SECRET_REF }}
-        secret_volumes: '/etc/secrets/foo=${{ secrets.DEPLOY_CF_SECRET_VERSION_REF }}'
+          FOO=${{ secrets.SECRET_VERSION_NAME }}
+          BAR=${{ secrets.SECRET_NAME }}
+        secret_volumes: '/etc/secrets/foo=${{ secrets.SECRET_VERSION_NAME }}'
+        service_account_email: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
         min_instances: 2
         max_instances: 5
         timeout: 300
-
-    - name: 'cleanup'
-      if: ${{ always() }}
-      env:
-        CLEANUP_FUNCTION_NAME: '${{ steps.deploy.outputs.id }}'
-      run: 'npm run cleanup'

.github/workflows/unit.yml

@@ -48,11 +48,11 @@ jobs:
       if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
       with:
         workload_identity_provider: '${{ secrets.WIF_PROVIDER_NAME }}'
-        service_account: '${{ secrets.DEPLOY_CF_SA_EMAIL }}'
+        service_account: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
 
     - name: 'npm test'
       env:
-        DEPLOY_CF_PROJECT_ID: '${{ secrets.DEPLOY_CF_PROJECT_ID }}'
-        DEPLOY_CF_SA_EMAIL: '${{ secrets.DEPLOY_CF_SA_EMAIL }}'
-        DEPLOY_CF_SECRET_VERSION_REF: '${{ secrets.DEPLOY_CF_SECRET_VERSION_REF }}'
+        TEST_PROJECT_ID: '${{ secrets.PROJECT_ID }}'
+        TEST_SERVICE_ACCOUNT_EMAIL: '${{ secrets.SERVICE_ACCOUNT_EMAIL }}'
+        TEST_SECRET_VERSION_NAME: '${{ secrets.SECRET_VERSION_NAME }}'
       run: 'npm run test'