Skip to content

Commit d47c829

Browse files
authored
Merge pull request #1608 from GSA/main
03/17/2025 Production Deploy
2 parents 385b342 + f2e5720 commit d47c829

File tree

6 files changed

+370
-331
lines changed

6 files changed

+370
-331
lines changed

.github/workflows/deploy-demo.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,13 @@ jobs:
2424
terraform_version: "^1.7.5"
2525
terraform_wrapper: false
2626

27-
- name: Check for changes to Terraform
28-
id: changed-terraform-files
29-
uses: tj-actions/changed-files@v45
30-
with:
31-
files: |
32-
terraform/demo/**
33-
terraform/shared/**
34-
.github/workflows/deploy-demo.yml
3527
- name: Terraform init
36-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
3728
working-directory: terraform/demo
3829
env:
3930
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
4031
AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
4132
run: terraform init
4233
- name: Terraform apply
43-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4434
working-directory: terraform/demo
4535
env:
4636
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -84,26 +74,11 @@ jobs:
8474
--var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
8575
--strategy rolling
8676
87-
- name: Check for changes to templates.json
88-
id: changed-templates
89-
uses: tj-actions/changed-files@v45
90-
with:
91-
files: |
92-
app/config_files/templates.json
93-
- name: Update templates
94-
if: steps.changed-templates.outputs.any_changed == 'true'
95-
run: cf run-task notify-api-demo --command "flask command update-templates"
77+
# TODO FIX
78+
# - name: Update templates
79+
# run: cf run-task notify-api-demo --command "flask command update-templates"
9680

97-
- name: Check for changes to egress config
98-
id: changed-egress-config
99-
uses: tj-actions/changed-files@v45
100-
with:
101-
files: |
102-
deploy-config/egress_proxy/notify-api-demo.*.acl
103-
.github/actions/deploy-proxy/action.yml
104-
.github/workflows/deploy-demo.yml
10581
- name: Deploy egress proxy
106-
if: steps.changed-egress-config.outputs.any_changed == 'true'
10782
uses: ./.github/actions/deploy-proxy
10883
env:
10984
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

.github/workflows/deploy-prod.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,13 @@ jobs:
2828
terraform_version: "^1.7.5"
2929
terraform_wrapper: false
3030

31-
- name: Check for changes to Terraform
32-
id: changed-terraform-files
33-
uses: tj-actions/changed-files@v45
34-
with:
35-
files: |
36-
terraform/production/**
37-
terraform/shared/**
38-
.github/workflows/deploy-prod.yml
3931
- name: Terraform init
40-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4132
working-directory: terraform/production
4233
env:
4334
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
4435
AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
4536
run: terraform init
4637
- name: Terraform apply
47-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4838
working-directory: terraform/production
4939
env:
5040
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -88,26 +78,11 @@ jobs:
8878
--var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
8979
--strategy rolling
9080
91-
- name: Check for changes to templates.json
92-
id: changed-templates
93-
uses: tj-actions/changed-files@v45
94-
with:
95-
files: |
96-
app/config_files/templates.json
97-
- name: Update templates
98-
if: steps.changed-templates.outputs.any_changed == 'true'
99-
run: cf run-task notify-api-production --command "flask command update-templates"
81+
# TODO FIX
82+
# - name: Update templates
83+
# run: cf run-task notify-api-production --command "flask command update-templates"
10084

101-
- name: Check for changes to egress config
102-
id: changed-egress-config
103-
uses: tj-actions/changed-files@v45
104-
with:
105-
files: |
106-
deploy-config/egress_proxy/notify-api-production.*.acl
107-
.github/actions/deploy-proxy/action.yml
108-
.github/workflows/deploy-prod.yml
10985
- name: Deploy egress proxy
110-
if: steps.changed-egress-config.outputs.any_changed == 'true'
11186
uses: ./.github/actions/deploy-proxy
11287
env:
11388
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

.github/workflows/deploy.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,13 @@ jobs:
3030
terraform_version: "^1.7.5"
3131
terraform_wrapper: false
3232

33-
- name: Check for changes to Terraform
34-
id: changed-terraform-files
35-
uses: tj-actions/changed-files@v45
36-
with:
37-
files: |
38-
terraform/staging/**
39-
terraform/shared/**
40-
.github/workflows/deploy.yml
4133
- name: Terraform init
42-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4334
working-directory: terraform/staging
4435
env:
4536
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
4637
AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
4738
run: terraform init
4839
- name: Terraform apply
49-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
5040
working-directory: terraform/staging
5141
env:
5242
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -90,26 +80,11 @@ jobs:
9080
--var LOGIN_DOT_GOV_REGISTRATION_URL="$LOGIN_DOT_GOV_REGISTRATION_URL"
9181
--strategy rolling
9282
93-
- name: Check for changes to templates.json
94-
id: changed-templates
95-
uses: tj-actions/changed-files@v45
96-
with:
97-
files: |
98-
app/config_files/templates.json
99-
- name: Update templates
100-
if: steps.changed-templates.outputs.any_changed == 'true'
101-
run: cf run-task notify-api-staging --command "flask command update-templates"
83+
# TODO FIX
84+
# - name: Update templates
85+
# run: cf run-task notify-api-staging --command "flask command update-templates"
10286

103-
- name: Check for changes to egress config
104-
id: changed-egress-config
105-
uses: tj-actions/changed-files@v45
106-
with:
107-
files: |
108-
deploy-config/egress_proxy/notify-api-staging.*.acl
109-
.github/actions/deploy-proxy/action.yml
110-
.github/workflows/deploy.yml
11187
- name: Deploy egress proxy
112-
if: steps.changed-egress-config.outputs.any_changed == 'true'
11388
uses: ./.github/actions/deploy-proxy
11489
env:
11590
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

0 commit comments

Comments
 (0)