Merge branch 'main' into pgollucci/ci/move_to_oidc

p6m7g8 · Oct 31, 2024 · 21265ee · 21265ee
2 parents 60fb9c5 + eb43c34
commit 21265ee
Show file tree

Hide file tree

Showing 8 changed files with 412 additions and 390 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,6 @@ jobs:
         run: |
           curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
           sudo apt-get install -y nodejs
-
       - name: Install pnpm and dependencies
         run: |
           corepack enable
@@ -30,19 +29,12 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-node-
-      # - name: Assume role using OIDC
-      #   uses: aws-actions/[email protected]
-      #   env:
-      #     AWS_REGION: ${{ secrets.CDK_DEPLOY_REGION }}
-      #   with:
-      #     role-to-assume: arn:aws:iam::346733622331:role/cdk-hnb659fds-lookup-role-346733622331-us-east-1
-      #     aws-region: $AWS_REGION
-      - name: Assume role using AWS credentials
+      - name: Assume role using OIDC
         uses: aws-actions/[email protected]
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ secrets.CDK_DEPLOY_REGION }}
+          role-to-assume: ${{ secrets.AWS_ROLE }}
+          role-session-name: ${{ secrets.AWS_SESSION_NAME }}
       - name: Run build
         env:
           CDK_DEPLOY_ACCOUNT: ${{ secrets.CDK_DEPLOY_ACCOUNT }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -19,7 +19,6 @@ jobs:
         run: |
           curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
           sudo apt-get install -y nodejs
-
       - name: Install pnpm and dependencies
         run: |
           corepack enable

diff --git a/cdk.context.json b/cdk.context.json
@@ -30,5 +30,9 @@
   "hosted-zone:account=346733622331:domainName=gollucci.com:region=us-east-1": {
     "Id": "/hostedzone/Z0112176FVC0Y83D0WHC",
     "Name": "gollucci.com."
+  },
+  "hosted-zone:account=346733622331:domainName=p6m7g8.com:region=us-east-1": {
+    "Id": "/hostedzone/Z24WQH45EYOKGS",
+    "Name": "p6m7g8.com."
   }
 }
diff --git a/conf/sites.yml b/conf/sites.yml
@@ -7,18 +7,18 @@
   hostedZoneName: continuouslearning.training
   verifyEmail: [email protected]
   cloudfrontRecordName: www.continuouslearning.training
-# - name: p6m7g8.com
-#   hostedZoneName: p6m7g8.com
-#   verifyEmail: [email protected]
-#   cloudfrontRecordName: www.p6m7g8.org
+- name: p6m7g8.com
+  hostedZoneName: p6m7g8.com
+  verifyEmail: [email protected]
+  cloudfrontRecordName: www.p6m7g8.com
 - name: p6m7g8.org
   hostedZoneName: p6m7g8.org
   verifyEmail: [email protected]
   cloudfrontRecordName: www.p6m7g8.org
-# - name: p6m7g8.net
-#   hostedZoneName: p6m7g8.net
-#   verifyEmail: [email protected]
-#   cloudfrontRecordName: www.p6m7g8.net
+- name: p6m7g8.net
+  hostedZoneName: p6m7g8.net
+  verifyEmail: [email protected]
+  cloudfrontRecordName: www.p6m7g8.net
 - name: gollucci.us
   hostedZoneName: gollucci.us
   verifyEmail: [email protected]