Merge pull request #818 from makerdao/develop

Update GHA
makerdao · Aug 9, 2024 · 8092540 · 8092540
2 parents 8da238d + 4535f2f
commit 8092540
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/.github/workflows/angular-dev.yml b/.github/workflows/angular-dev.yml
@@ -8,6 +8,10 @@ on:
       - ".github/workflows/angular-dev.yml"
       - "helm/staging/frontend*"
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,8 +29,8 @@ jobs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
+        role-to-assume: ${{ secrets.GA_OIDC_EKS_STAGING }}
+        role-session-name: AngularDevMips
         aws-region: ${{ env.REGION }}
 
     - name: Login to AWS ECR

diff --git a/.github/workflows/angular-prod.yml b/.github/workflows/angular-prod.yml
@@ -8,6 +8,10 @@ on:
       - ".github/workflows/angular-prod.yml"
       - "helm/prod/frontend*"
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,8 +29,8 @@ jobs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        aws-access-key-id: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+        role-to-assume: ${{ secrets.GA_OIDC_EKS_PROD }}
+        role-session-name: AngularProdMips
         aws-region: ${{ env.REGION }}
 
     - name: Login to AWS ECR

diff --git a/.github/workflows/node.js-dev.yml b/.github/workflows/node.js-dev.yml
@@ -8,6 +8,10 @@ on:
       - ".github/workflows/node.js-dev.yml"
       - "helm/staging/backend*"
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
@@ -39,8 +43,8 @@ jobs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
+        role-to-assume: ${{ secrets.GA_OIDC_EKS_STAGING }}
+        role-session-name: NodeDevMips
         aws-region: ${{ env.REGION }}
 
     - name: Login to AWS ECR

diff --git a/.github/workflows/node.js-prod.yml b/.github/workflows/node.js-prod.yml
@@ -8,6 +8,10 @@ on:
       - ".github/workflows/node.js-prod.yml"
       - "helm/prod/backend*"
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
@@ -39,8 +43,8 @@ jobs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        aws-access-key-id: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+        role-to-assume: ${{ secrets.GA_OIDC_EKS_PROD }}
+        role-session-name: NodeProdMips
         aws-region: ${{ env.REGION }}
 
     - name: Login to AWS ECR

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -5,7 +5,7 @@ RUN npm install
 COPY . .
 RUN npm run build
 
-FROM mongo:4.4.8-focal
+FROM mongo:5-focal
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG REQUEST_GITHUB_URL_API_ENDPOINT

diff --git a/backend/README.md b/backend/README.md
@@ -24,6 +24,7 @@
 
 ## Description
 
+
 ## Installation
 
 ```bash