Skip to content

Commit c19ef02

Browse files
ccostinoccostino
authored
Merge pull request #2417 from GSA/main
03/17/2025 Production Deploy
2 parents dac819e + 0df8b37 commit c19ef02

File tree

5 files changed

+65
-130
lines changed

5 files changed

+65
-130
lines changed

‎.ds.baseline‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,6 @@
127127
}
128128
],
129129
"results": {
130-
".github/workflows/checks.yml": [
131-
{
132-
"type": "Secret Keyword",
133-
"filename": ".github/workflows/checks.yml",
134-
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
135-
"is_verified": false,
136-
"line_number": 68,
137-
"is_secret": false
138-
}
139-
],
140130
"app/assets/js/uswds.min.js": [
141131
{
142132
"type": "Secret Keyword",
@@ -684,5 +674,5 @@
684674
}
685675
]
686676
},
687-
"generated_at": "2025-02-26T18:19:37Z"
677+
"generated_at": "2025-03-17T23:26:44Z"
688678
}

‎.github/workflows/checks.yml‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -51,73 +51,75 @@ jobs:
5151
- name: Check coverage threshold
5252
run: poetry run coverage report --fail-under=90
5353

54-
end-to-end-tests:
55-
if: ${{ github.actor != 'dependabot[bot]' }}
54+
# TODO FIX
55+
# end-to-end-tests:
56+
# if: ${{ github.actor != 'dependabot[bot]' }}
5657

57-
permissions:
58-
checks: write
59-
pull-requests: write
60-
contents: write
61-
runs-on: ubuntu-latest
62-
environment: staging
63-
services:
64-
postgres:
65-
image: postgres
66-
env:
67-
POSTGRES_USER: user
68-
POSTGRES_PASSWORD: password
69-
POSTGRES_DB: test_notification_api
70-
options: >-
71-
--health-cmd pg_isready
72-
--health-interval 10s
73-
--health-timeout 5s
74-
--health-retries 5
75-
ports:
76-
# Maps tcp port 5432 on service container to the host
77-
- 5432:5432
78-
redis:
79-
image: redis
80-
options: >-
81-
--health-cmd "redis-cli ping"
82-
--health-interval 10s
83-
--health-timeout 5s
84-
--health-retries 5
85-
ports:
86-
# Maps tcp port 6379 on service container to the host
87-
- 6379:6379
58+
# permissions:
59+
# checks: write
60+
# pull-requests: write
61+
# contents: write
62+
# runs-on: ubuntu-latest
63+
# environment: staging
64+
# services:
65+
# postgres:
66+
# image: postgres
67+
# env:
68+
# POSTGRES_USER: user
69+
# POSTGRES_PASSWORD: password
70+
# POSTGRES_DB: test_notification_api
71+
# options: >-
72+
# --health-cmd pg_isready
73+
# --health-interval 10s
74+
# --health-timeout 5s
75+
# --health-retries 5
76+
# ports:
77+
# # Maps tcp port 5432 on service container to the host
78+
# - 5432:5432
79+
# redis:
80+
# image: redis
81+
# options: >-
82+
# --health-cmd "redis-cli ping"
83+
# --health-interval 10s
84+
# --health-timeout 5s
85+
# --health-retries 5
86+
# ports:
87+
# # Maps tcp port 6379 on service container to the host
88+
# - 6379:6379
8889

89-
steps:
90-
- uses: actions/checkout@v4
91-
- uses: ./.github/actions/setup-project
92-
- uses: jwalton/gh-find-current-pr@v1
93-
id: findPr
94-
- name: Check API Server availability
95-
run: |
96-
curl --fail -v https://notify-api-staging.app.cloud.gov || exit 1
97-
- name: Run Admin server
98-
# If we want to log stuff and see what's broken,
99-
# insert this line:
100-
# tail -f admin-server.log &
101-
# above make e2e-test
90+
# steps:
91+
# - uses: actions/checkout@v4
92+
# - uses: ./.github/actions/setup-project
93+
# - uses: jwalton/gh-find-current-pr@v1
94+
# id: findPr
95+
# - name: Check API Server availability
96+
# run: |
97+
# curl --fail -v https://notify-api-staging.app.cloud.gov || exit 1
98+
# - name: Run Admin server
99+
# # If we want to log stuff and see what's broken,
100+
# # insert this line:
101+
# # tail -f admin-server.log &
102+
# # above make e2e-test
102103

103104

104-
run: |
105-
make run-flask > admin-server.log 2>&1 &
106-
tail -f admin-server.log &
107-
make e2e-test
105+
# run: |
106+
# make run-flask > admin-server.log 2>&1 &
107+
# tail -f admin-server.log &
108+
# make e2e-test
109+
110+
# env:
111+
# API_HOST_NAME: https://notify-api-staging.app.cloud.gov/
112+
# SECRET_KEY: ${{ secrets.SECRET_KEY }}
113+
# DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
114+
# ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
115+
# ADMIN_CLIENT_USERNAME: notify-admin
116+
# NOTIFY_ENVIRONMENT: e2etest
117+
# NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
118+
# NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
119+
# NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
120+
# NOTIFY_E2E_TEST_URI: http://localhost:6012/
121+
# VCAP_SERVICES: ${{ secrets.VCAP_SERVICES }}
108122

109-
env:
110-
API_HOST_NAME: https://notify-api-staging.app.cloud.gov/
111-
SECRET_KEY: ${{ secrets.SECRET_KEY }}
112-
DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }}
113-
ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }}
114-
ADMIN_CLIENT_USERNAME: notify-admin
115-
NOTIFY_ENVIRONMENT: e2etest
116-
NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
117-
NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
118-
NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
119-
NOTIFY_E2E_TEST_URI: http://localhost:6012/
120-
VCAP_SERVICES: ${{ secrets.VCAP_SERVICES }}
121123
validate-new-relic-config:
122124
runs-on: ubuntu-latest
123125
environment: staging

‎.github/workflows/deploy-demo.yml‎

Lines changed: 0 additions & 19 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 }}
@@ -99,16 +89,7 @@ jobs:
9989
--var LOGIN_PEM="$LOGIN_PEM"
10090
--strategy rolling
10191
102-
- name: Check for changes to egress config
103-
id: changed-egress-config
104-
uses: tj-actions/changed-files@v45
105-
with:
106-
files: |
107-
deploy-config/egress_proxy/notify-admin-demo.*.acl
108-
.github/actions/deploy-proxy/action.yml
109-
.github/workflows/deploy-demo.yml
11092
- name: Deploy egress proxy
111-
if: steps.changed-egress-config.outputs.any_changed == 'true'
11293
uses: ./.github/actions/deploy-proxy
11394
env:
11495
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

‎.github/workflows/deploy-prod.yml‎

Lines changed: 0 additions & 19 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/production/**
33-
terraform/shared/**
34-
.github/workflows/deploy-prod.yml
3527
- name: Terraform init
36-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
3728
working-directory: terraform/production
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/production
4535
env:
4636
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -99,16 +89,7 @@ jobs:
9989
--var LOGIN_PEM="$LOGIN_PEM"
10090
--strategy rolling
10191
102-
- name: Check for changes to egress config
103-
id: changed-egress-config
104-
uses: tj-actions/changed-files@v45
105-
with:
106-
files: |
107-
deploy-config/egress_proxy/notify-admin-production.*.acl
108-
.github/actions/deploy-proxy/action.yml
109-
.github/workflows/deploy-prod.yml
11092
- name: Deploy egress proxy
111-
if: steps.changed-egress-config.outputs.any_changed == 'true'
11293
uses: ./.github/actions/deploy-proxy
11394
env:
11495
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

‎.github/workflows/deploy.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,13 @@ jobs:
2929
terraform_version: "^1.7.5"
3030
terraform_wrapper: false
3131

32-
- name: Check for changes to Terraform
33-
id: changed-terraform-files
34-
uses: tj-actions/changed-files@v45
35-
with:
36-
files: |
37-
terraform/staging/**
38-
terraform/shared/**
39-
.github/workflows/deploy.yml
4032
- name: Terraform init
41-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4233
working-directory: terraform/staging
4334
env:
4435
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
4536
AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
4637
run: terraform init
4738
- name: Terraform apply
48-
if: steps.changed-terraform-files.outputs.any_changed == 'true'
4939
working-directory: terraform/staging
5040
env:
5141
AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
@@ -106,16 +96,7 @@ jobs:
10696
--strategy rolling
10797
10898
109-
- name: Check for changes to egress config
110-
id: changed-egress-config
111-
uses: tj-actions/changed-files@v45
112-
with:
113-
files: |
114-
deploy-config/egress_proxy/notify-admin-staging.*.acl
115-
.github/actions/deploy-proxy/action.yml
116-
.github/workflows/deploy.yml
11799
- name: Deploy egress proxy
118-
if: steps.changed-egress-config.outputs.any_changed == 'true'
119100
uses: ./.github/actions/deploy-proxy
120101
env:
121102
CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}

0 commit comments

Comments
 (0)