From 7f5e6a1fec0aa3129931c6d5e0eb6ece88e3945d Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Wed, 20 May 2020 14:40:55 -0400 Subject: [PATCH 1/3] Switch accounts --- .github/workflows/build_stage.yml | 10 +++++----- .github/workflows/push_dev.yml | 6 +++--- .github/workflows/release.yml | 8 ++++---- infrastructure/cloudformation/dt/top.yaml | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_stage.yml b/.github/workflows/build_stage.yml index dd755e1..650aa0b 100644 --- a/.github/workflows/build_stage.yml +++ b/.github/workflows/build_stage.yml @@ -70,9 +70,9 @@ jobs: args: --follow-symlinks --delete env: SOURCE_DIR: infrastructure/cloudformation - AWS_REGION: "us-east-1" - DEST_DIR: dt/stage/cloudformation - AWS_S3_BUCKET: sumu-stacks + AWS_REGION: "us-east-2" + DEST_DIR: stage/cloudformation + AWS_S3_BUCKET: dt-deployment-bucket AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Configure AWS Credentials @@ -80,11 +80,11 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: us-east-2 - name: Deploy to AWS CloudFormation uses: aws-actions/aws-cloudformation-github-deploy@v1 with: name: dt-infrastructure-stage template: infrastructure/cloudformation/dt/top.yaml capabilities: "CAPABILITY_NAMED_IAM,CAPABILITY_IAM" - parameter-overrides: VpcId=${{ secrets.VPC_ID }},SubDomain=stage.dt,Domain=${{ secrets.DOMAIN }},environment=stage,DockerTag=stage,release=stage,PublicSubnets=${{ secrets.SUBNET_IDS }} \ No newline at end of file + parameter-overrides: VpcId=${{ secrets.VPC_ID }},SubDomain=stage,Domain=${{ secrets.DOMAIN }},environment=stage,DockerTag=stage,release=stage,PublicSubnets=${{ secrets.SUBNET_IDS }} \ No newline at end of file diff --git a/.github/workflows/push_dev.yml b/.github/workflows/push_dev.yml index 50d7c92..c6933de 100644 --- a/.github/workflows/push_dev.yml +++ b/.github/workflows/push_dev.yml @@ -19,8 +19,8 @@ jobs: args: --follow-symlinks --delete env: SOURCE_DIR: infrastructure/cloudformation - AWS_REGION: "us-east-1" - DEST_DIR: dt/develop/cloudformation - AWS_S3_BUCKET: sumu-stacks + AWS_REGION: "us-east-2" + DEST_DIR: develop/cloudformation + AWS_S3_BUCKET: dt-deployment-bucket AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd65ed5..2f4824e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,9 +127,9 @@ jobs: args: --follow-symlinks --delete env: SOURCE_DIR: infrastructure/cloudformation - AWS_REGION: "us-east-1" - DEST_DIR: dt/production/cloudformation - AWS_S3_BUCKET: sumu-stacks + AWS_REGION: "us-east-2" + DEST_DIR: production/cloudformation + AWS_S3_BUCKET: dt-deployment-bucket AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Configure AWS Credentials @@ -137,7 +137,7 @@ jobs: with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-region: us-east-2 - name: Deploy to AWS CloudFormation uses: aws-actions/aws-cloudformation-github-deploy@v1 with: diff --git a/infrastructure/cloudformation/dt/top.yaml b/infrastructure/cloudformation/dt/top.yaml index a3c1044..943412f 100644 --- a/infrastructure/cloudformation/dt/top.yaml +++ b/infrastructure/cloudformation/dt/top.yaml @@ -61,7 +61,7 @@ Resources: Condition: CreateDns Type: AWS::CloudFormation::Stack Properties: - TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/sumu-stacks/dt/${release}/cloudformation/dt/dns.yaml' + TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/dt-deployment-bucket/${release}/cloudformation/dt/dns.yaml' Parameters: environment: !Ref environment Domain: !Ref Domain @@ -74,7 +74,7 @@ Resources: LoadBalancing: Type: AWS::CloudFormation::Stack Properties: - TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/sumu-stacks/dt/${release}/cloudformation/dt/load_balancing.yaml' + TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/dt-deployment-bucket/${release}/cloudformation/dt/load_balancing.yaml' Parameters: environment: !Ref environment release: !Ref release @@ -84,7 +84,7 @@ Resources: EcsCluster: Type: AWS::CloudFormation::Stack Properties: - TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/sumu-stacks/dt/${release}/cloudformation/cluster/top.yaml' + TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/dt-deployment-bucket/${release}/cloudformation/cluster/top.yaml' Parameters: Environment: !Ref environment VpcId: !Ref VpcId @@ -97,7 +97,7 @@ Resources: TaskDefinition: Type: AWS::CloudFormation::Stack Properties: - TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/sumu-stacks/dt/${release}/cloudformation/dt/task.yaml' + TemplateURL: !Sub 'https://s3.${AWS::Region}.amazonaws.com/dt-deployment-bucket/${release}/cloudformation/dt/task.yaml' Parameters: environment: !Ref environment LogGroupName: !Ref LogGroup From db334fc57390f0a99b57a64d3114640b50af70a4 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Wed, 20 May 2020 15:06:58 -0400 Subject: [PATCH 2/3] Update submodules --- infrastructure/cloudformation/cluster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/cloudformation/cluster b/infrastructure/cloudformation/cluster index a7d7961..6d344e8 160000 --- a/infrastructure/cloudformation/cluster +++ b/infrastructure/cloudformation/cluster @@ -1 +1 @@ -Subproject commit a7d7961c271839c625718e42f7ac8d6171456892 +Subproject commit 6d344e80bbb5b947e4daab9b7c050bbe78377f4c From 95f1df755e568d24c2011aadf4317d2b1a5a2dd0 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Wed, 20 May 2020 15:30:45 -0400 Subject: [PATCH 3/3] Update submodule --- infrastructure/cloudformation/cluster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/cloudformation/cluster b/infrastructure/cloudformation/cluster index 6d344e8..2826c2e 160000 --- a/infrastructure/cloudformation/cluster +++ b/infrastructure/cloudformation/cluster @@ -1 +1 @@ -Subproject commit 6d344e80bbb5b947e4daab9b7c050bbe78377f4c +Subproject commit 2826c2eb036860bf7269d34b01aa24a9501752d4