fix: ocean account

tiki-deprecated · Feb 25, 2024 · 6a43e62 · 6a43e62
1 parent d6962ff
commit 6a43e62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,9 +32,9 @@ jobs:
       - name: SAM Deploy Role
         run: |
           cd infra/deploy
-          sam build
+          sam build --parameter-overrides OceanAccount=${{ secrets.OCEAN_ACCOUNT  }}
           sam package
-          sam deploy --no-fail-on-empty-changeset
+          sam deploy --no-fail-on-empty-changeset --parameter-overrides OceanAccount=${{ secrets.OCEAN_ACCOUNT  }}
 
       - name: AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -46,9 +46,9 @@ jobs:
       - name: SAM Deploy Step Function
         run: |
           make compile
-          make build flags="--parameter-overrides ApiAuthorization=${{ secrets.API_AUTHORIZATION }} OceanAccount=${{ secrets.AWS_ACCOUNT_ID  }}"
+          make build flags="--parameter-overrides ApiAuthorization=${{ secrets.API_AUTHORIZATION }} OceanAccount=${{ secrets.OCEAN_ACCOUNT  }}"
           make package
-          make deploy flags="--parameter-overrides ApiAuthorization=${{ secrets.API_AUTHORIZATION }} OceanAccount=${{ secrets.AWS_ACCOUNT_ID  }} --no-fail-on-empty-changeset"
+          make deploy flags="--parameter-overrides ApiAuthorization=${{ secrets.API_AUTHORIZATION }} OceanAccount=${{ secrets.OCEAN_ACCOUNT  }} --no-fail-on-empty-changeset"
 
       - name: Get Version
         id: semver

diff --git a/infra/deploy/template.yml b/infra/deploy/template.yml
@@ -15,6 +15,9 @@ Parameters:
     Description: Name of the S3 bucket for the deployment
     Type: String
     Default: mytiki-core-ocean-cf-deploy
+  OceanAccount:
+    Description: Account ID for the ocean catalog
+    Type: String
 
 Resources:
   Role:
@@ -105,3 +108,7 @@ Resources:
               - !Sub arn:aws:glue:${AWS::Region}:${AWS::AccountId}:database/*
               - !Sub arn:aws:glue:${AWS::Region}:${AWS::AccountId}:table/*
               - !Sub arn:aws:glue:${AWS::Region}:${AWS::AccountId}:userDefinedFunction/*
+              - !Sub arn:aws:glue:${AWS::Region}:${OceanAccount}:catalog
+              - !Sub arn:aws:glue:${AWS::Region}:${OceanAccount}:database/*
+              - !Sub arn:aws:glue:${AWS::Region}:${OceanAccount}:table/*
+              - !Sub arn:aws:glue:${AWS::Region}:${OceanAccount}:userDefinedFunction/*