secrets

Author: aplr

.github/workflows/deploy.yml

@@ -21,6 +21,15 @@ on:
         description: "The build arguments to pass to the Docker build"
         required: false
     secrets:
+      aws-key-id:
+        description: "The AWS access key ID"
+        required: true
+      aws-secret-key:
+        description: "The AWS secret access key"
+        required: true
+      function-admin-api-key:
+        description: "The API key for the Lambda Feedback function admin API"
+        required: true
       build-secrets:
         description: "The Docker secrets to use for the build"
         required: false
@@ -74,9 +83,10 @@ jobs:
       build-target: ${{ inputs.build-target }}
       build-args: ${{ inputs.build-args }}
     secrets:
+      aws-key-id: ${{ secrets.aws-key-id }}
+      aws-secret-key: ${{ secrets.aws-secret-key }}
       build-secrets: ${{ secrets.build-secrets }}
 
-
   deploy-staging:
     uses: ./.github/workflows/lambda_deploy.yml
     needs: [setup, build]
@@ -86,6 +96,10 @@ jobs:
       image-name: ${{ needs.build.outputs.registry }}/lambda-feedback-staging-functions-repository:${{ needs.setup.outputs.evaluation_function_name }}
       function-name: ${{ needs.setup.outputs.evaluation_function_name }}
       region: ${{ inputs.region }}
+    secrets:
+      aws-key-id: ${{ secrets.aws-key-id }}
+      aws-secret-key: ${{ secrets.aws-secret-key }}
+      function-admin-api-key: ${{ secrets.function-admin-api-key }}
 
   deploy-production:
     uses: ./.github/workflows/lambda_deploy.yml
@@ -95,4 +109,8 @@ jobs:
       api-url: https://prod-api.lambdafeedback.com
       image-name: ${{ needs.build.outputs.registry }}/lambda-feedback-production-functions-repository:${{ needs.setup.outputs.evaluation_function_name }}
       function-name: ${{ needs.setup.outputs.evaluation_function_name }}
-      region: ${{ inputs.region }}
+      region: ${{ inputs.region }}
+    secrets:
+      aws-key-id: ${{ secrets.aws-key-id }}
+      aws-secret-key: ${{ secrets.aws-secret-key }}
+      function-admin-api-key: ${{ secrets.function-admin-api-key }}

.github/workflows/lambda_build.yml

@@ -25,6 +25,12 @@ on:
         description: "The build arguments to pass to the Docker build"
         required: false
     secrets:
+      aws-key-id:
+        description: "The AWS access key ID"
+        required: true
+      aws-secret-key:
+        description: "The AWS secret access key"
+        required: true
       build-secrets:
         description: "The Docker secrets to use for the build"
         required: false
@@ -52,8 +58,8 @@ jobs:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          aws-access-key-id: ${{ secrets.LAMBDA_CONTAINER_PIPELINE_AWS_ID }}
-          aws-secret-access-key: ${{ secrets.LAMBDA_CONTAINER_PIPELINE_AWS_SECRET }}
+          aws-access-key-id: ${{ secrets.aws-key-id }}
+          aws-secret-access-key: ${{ secrets.aws-secret-key }}
           aws-region: ${{ inputs.region }}
 
       - name: Login to Amazon ECR

.github/workflows/lambda_deploy.yml

@@ -24,6 +24,16 @@ on:
         description: "The AWS region to deploy to"
         default: "eu-west-2"
         required: false
+    secrets:
+      aws-key-id:
+        description: "The AWS access key ID"
+        required: true
+      aws-secret-key:
+        description: "The AWS secret access key"
+        required: true
+      function-admin-api-key:
+        description: "The API key for the Lambda Feedback function admin API"
+        required: true
 
 jobs:
   deploy:
@@ -37,15 +47,15 @@ jobs:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          aws-access-key-id: ${{ secrets.LAMBDA_CONTAINER_PIPELINE_AWS_ID }}
-          aws-secret-access-key: ${{ secrets.LAMBDA_CONTAINER_PIPELINE_AWS_SECRET }}
+          aws-access-key-id: ${{ secrets.aws-key-id }}
+          aws-secret-access-key: ${{ secrets.aws-secret-key }}
           aws-region: ${{ inputs.region }}
 
       - name: Deploy Evaluation Function
         id: deploy-evaluation-function
         env:
           BACKEND_API_URL: ${{ inputs.api-url }}
-          API_KEY: ${{ secrets.FUNCTION_ADMIN_API_KEY }}
+          API_KEY: ${{ secrets.function-admin-api-key }}
           IMAGE_NAME: ${{ inputs.image-name }}
           FUNCTION_NAME: ${{ inputs.function-name }}
         run: |