Merge branch 'main' into int

Author: varunsh-coder

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 3
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: docker
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 3

.github/workflows/automatePR.yml

@@ -16,12 +16,12 @@ jobs:
       actions: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
           repository: step-security/secure-workflows
 
       - name: Automate PR
-        uses: step-security/secure-workflows/Automate-PR@main
+        uses: step-security/secure-workflows/Automate-PR@98ff385ea512d8ac7a1445f95e199f6864f439e1
         with:
           github-token: ${{secrets.PAT }}
           issue-id: ${{ github.event.issue.number}}

.github/workflows/codeql.yml

@@ -0,0 +1,81 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["main"]
+  schedule:
+    - cron: "35 17 * * 4"
+
+permissions: # added using https://github.com/step-security/secure-workflows
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["go"]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - name: Checkout repository
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@e0e5ded33cabb451ae0a9768fc7b0410bad9ad44
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/int.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
+        uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
         with:
           egress-policy: audit
       - name: Checkout

.github/workflows/kbanalysis.yml

@@ -2,9 +2,13 @@ name: KBAnalysis
 on:
   issues:
     types:
-     - opened
-     - reopened
-     - closed
+      - opened
+      - reopened
+      - closed
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
 permissions:
   contents: read
 
@@ -15,19 +19,19 @@ jobs:
       issues: write
       contents: write
       pull-requests: write
-    
+
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
+        uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - uses: actions/checkout@d0651293c4a5a52e711f25b41b05b2212f385d28
         with:
           repository: step-security/secure-workflows
-    
+
       - name: KBAnalysis
-        uses: step-security/secure-workflows/kbanalysis@03a07b65449688ebe9e517e4446b9f323bb194a0
+        uses: step-security/secure-workflows/kbanalysis@9d85dcc91fadd9e87b427561d92e9fb82690940f
         with:
           github-token: ${{secrets.PAT }}
           issue-id: ${{ github.event.issue.number}}
@@ -43,7 +47,7 @@ jobs:
         uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672
         with:
           token: ${{secrets.PAT}} #  need to use PAT since GITHUB_TOKEN does not initiate workflows
-          body: "This PR adds a YAML file to describe token permissions needed for Action: ${{steps.get-action.outputs.id}}.\n Fixes #${{github.event.issue.number}}"
+          body: "This PR adds a YAML file to describe token permissions needed for Action: ${{steps.get-action.outputs.id}}."
           commit-message: "added KB for issue#${{github.event.issue.number}}"
           title: "[KB] Add GitHub token permissions for ${{steps.get-action.outputs.id}} Action"
           branch: "issue#${{github.event.issue.number}}"

.github/workflows/release.yml

@@ -2,11 +2,11 @@ name: Cfnrelease
 
 on:
   workflow_dispatch:
-  push: 
-    branches:    
-     - main
-    
-permissions:  # added using https://github.com/step-security/secure-workflows
+  push:
+    branches:
+      - main
+
+permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
 jobs:
@@ -17,14 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
+        uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5
         with:
           egress-policy: audit
       - name: Checkout
         uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
         with:
           fetch-depth: 0
-      - name: Set up Go 
+      - name: Set up Go
         uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8
         with:
           go-version: 1.17
@@ -33,29 +33,37 @@ jobs:
         env: 
           PAT: ${{ secrets.PAT }} 
 
-      - uses: step-security/wait-for-secrets@v1
+      - uses: step-security/wait-for-secrets@1204ba02d7a707c4ef2e906d2ea1e36eebd9bbd2
         id: wait-for-secrets
         with:
           slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
           secrets: |
-            AWS_ACCESS_KEY_ID
-            AWS_SECRET_ACCESS_KEY
-            
+            AWS_ACCESS_KEY_ID: 
+              name: 'AWS access key id'
+              description: 'Access key id for secure-workflows prod'
+            AWS_SECRET_ACCESS_KEY:
+              name: 'AWS secret access key'
+              description: 'Secret access key for secure-workflows prod'
+            AWS_SESSION_TOKEN:
+              name: 'AWS session token'
+              description: 'Session token for secure-workflows prod'
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@ea7b857d8a33dc2fb4ef5a724500044281b49a5e
         with:
-          aws-access-key-id: ${{ steps.wait-for-secrets.outputs.AWS_ACCESS_KEY_ID }}  
+          aws-access-key-id: ${{ steps.wait-for-secrets.outputs.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ steps.wait-for-secrets.outputs.AWS_SECRET_ACCESS_KEY }}
+          aws-session-token: ${{ steps.wait-for-secrets.outputs.AWS_SESSION_TOKEN }}
           aws-region: us-west-2
-          
+
       - name: Deploy to AWS CloudFormation
         uses: aws-actions/aws-cloudformation-github-deploy@72bea2c93ca6be253b71b5966ecde13f9e8af2d4
         with:
           name: secure-workflow-api-ecr
           template: cloudformation/ecr.yml
           parameter-overrides: "ResourceName=secure-workflow-api"
           no-fail-on-empty-changeset: "1"
-      
+
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2
@@ -68,7 +76,7 @@ jobs:
         run: |
           docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-      
+
       - name: Deploy to AWS CloudFormation
         uses: aws-actions/aws-cloudformation-github-deploy@72bea2c93ca6be253b71b5966ecde13f9e8af2d4
         with:
@@ -77,7 +85,5 @@ jobs:
           parameter-overrides: >-
             ResourceName=secure-workflow-api,
             ImageTag=${{ github.sha }},
-            PAT=${{ secrets.PAT }}                 
+            PAT=${{ secrets.PAT }}
           no-fail-on-empty-changeset: "1"
-      
-        

.github/workflows/test.yml

@@ -1,22 +1,23 @@
 name: Test
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - main
   push:
     branches:
-      - main  # to update code coverage
+      - main # to update code coverage
 
-permissions:  # added using https://github.com/step-security/secure-workflows
+permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
-
+concurrency:
+  group: ${{ github.workflow }}
 jobs:
   test:
     permissions:
       contents: read
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@14dc64f30986eaa2ad2dddcec073f5aab18e5a24 # v1
+      - uses: step-security/harden-runner@ebacdc22ef6c2cfb85ee5ded8f2e640f4c776dd5 # v1
         with:
           allowed-endpoints: >
             api.github.com:443
@@ -37,7 +38,7 @@ jobs:
         with:
           go-version: 1.17
       - name: Run coverage
-        run: go test -race -coverprofile=coverage.txt -covermode=atomic
+        run: go test ./...  -coverpkg=./... -race -coverprofile=coverage.txt -covermode=atomic
         env:
-          PAT: ${{ secrets.PAT_READ_ONLY }}
+          PAT: ${{ secrets.GITHUB_TOKEN }}
       - uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2