Skip to content

Commit 5d47921

Browse files
bhagatparwinderbhagatparwinder
committed
update paths to sops compatible
1 parent c321738 commit 5d47921

File tree

11 files changed

+26
-25
lines changed

11 files changed

+26
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
with:
164164
params: |
165165
GITHUB_TOKEN=/ci/github/token
166-
DATABASE_URL=/bcda/${{ env.RELEASE_ENV }}/api/DATABASE_URL
166+
DATABASE_URL=/bcda/${{ env.RELEASE_ENV }}/sensitive/api/DATABASE_URL
167167
- name: Checkout bcda-ops
168168
uses: actions/checkout@v4
169169
with:
@@ -324,7 +324,7 @@ jobs:
324324
with:
325325
params: |
326326
NEWRELIC_API_KEY=/bcda/all/new-relic/api-key
327-
NEWRELIC_APP_ID=/bcda/${{ env.ENV_MODIFIER }}/new-relic/app-id
327+
NEWRELIC_APP_ID=/bcda/${{ env.ENV_MODIFIER }}/sensitive/new-relic/app-id
328328
- name: Download notify scripts
329329
uses: actions/download-artifact@v4
330330
with:

‎.github/workflows/migrate-db.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
AWS_REGION: ${{ vars.AWS_REGION }}
5454
with:
5555
params: |
56-
DB_URL=/bcda/${{ inputs.env }}/api/DATABASE_URL
56+
DB_URL=/bcda/${{ inputs.env }}/sensitive/api/DATABASE_URL
5757
- name: Get Go
5858
uses: actions/setup-go@v5
5959
with:

‎bcda/lambda/admin_aco_deny/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
9999
}
100100
ssmClient := ssm.NewFromConfig(cfg)
101101

102-
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
102+
dbURLName := fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
103103
slackParamName := "/slack/token/workflow-alerts"
104104
paramNames := []string{slackParamName, dbURLName}
105105
params, err := bcdaaws.GetParameters(ctx, ssmClient, paramNames)

‎bcda/lambda/admin_create_aco/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
143143
}
144144
ssmClient := ssm.NewFromConfig(cfg)
145145

146-
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
146+
dbURLName := fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
147147
slackParamName := "/slack/token/workflow-alerts"
148148
paramNames := []string{slackParamName, dbURLName}
149149
params, err := bcdaaws.GetParameters(ctx, ssmClient, paramNames)

‎bcda/lambda/admin_create_aco/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (c *HandleCreateACOTestSuite) TestHandleCreateACOMissingCMSID() {
144144
func TestGetAWSParams(t *testing.T) {
145145
env := conf.GetEnv("ENV")
146146

147-
cleanupParam1 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env), "test-db-url")
147+
cleanupParam1 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env), "test-db-url")
148148
t.Cleanup(func() { cleanupParam1() })
149149
cleanupParam2 := testUtils.SetParameter(t, "/slack/token/workflow-alerts", "test-slack-token")
150150
t.Cleanup(func() { cleanupParam2() })

‎bcda/lambda/admin_create_aco_creds/aws.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
2323
env := adjustedEnv()
2424

2525
slackParamName := "/slack/token/workflow-alerts"
26-
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
27-
ssasURLName := fmt.Sprintf("/bcda/%s/api/SSAS_URL", env)
28-
clientIDName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_CLIENT_ID", env)
29-
clientSecretName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_SECRET", env)
30-
ssasPEMName := fmt.Sprintf("/bcda/%s/api/BCDA_CA_FILE.pem", env)
31-
credsBucketName := fmt.Sprintf("/bcda/%s/aco_creds_bucket", env)
26+
dbURLName := fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
27+
ssasURLName := fmt.Sprintf("/bcda/%s/sensitive/api/SSAS_URL", env)
28+
clientIDName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_CLIENT_ID", env)
29+
clientSecretName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_SECRET", env)
30+
ssasPEMName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_CA_FILE.pem", env)
31+
credsBucketName := fmt.Sprintf("/bcda/%s/sensitive/aco_creds_bucket", env)
3232

3333
paramNames := []string{
3434
slackParamName,

‎bcda/lambda/admin_create_group/main.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,14 @@ func setupEnv(ctx context.Context) (string, error) {
149149
ssmClient := ssm.NewFromConfig(cfg)
150150

151151
slackParamName := "/slack/token/workflow-alerts"
152-
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
153-
ssasURLName := fmt.Sprintf("/bcda/%s/api/SSAS_URL", env)
154-
ssasClientName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_CLIENT_ID", env)
155-
ssasSecretName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_SECRET", env)
156-
caFileName := fmt.Sprintf("/bcda/%s/api/BCDA_CA_FILE.pem", env)
152+
dbURLName := fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
153+
ssasURLName := fmt.Sprintf("/bcda/%s/sensitive/api/SSAS_URL", env)
154+
ssasClientName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_CLIENT_ID", env)
155+
ssasSecretName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_SECRET", env)
156+
caFileName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_CA_FILE.pem", env)
157157
paramNames := []string{
158158
slackParamName,
159+
dbURLName,
159160
ssasURLName,
160161
ssasClientName,
161162
ssasSecretName,

‎bcda/lambda/admin_create_group/main_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ func TestSetupEnvironment(t *testing.T) {
9292

9393
cleanupParam1 := testUtils.SetParameter(t, "/slack/token/workflow-alerts", "slack-val")
9494
t.Cleanup(func() { cleanupParam1() })
95-
cleanupParam2 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env), "test-DB_URL")
95+
cleanupParam2 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env), "test-DB_URL")
9696
t.Cleanup(func() { cleanupParam2() })
97-
cleanupParam3 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/SSAS_URL", env), "test-SSAS_URL")
97+
cleanupParam3 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/SSAS_URL", env), "test-SSAS_URL")
9898
t.Cleanup(func() { cleanupParam3() })
99-
cleanupParam4 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_CLIENT_ID", env), "test-BCDA_SSAS_CLIENT_ID")
99+
cleanupParam4 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_CLIENT_ID", env), "test-BCDA_SSAS_CLIENT_ID")
100100
t.Cleanup(func() { cleanupParam4() })
101-
cleanupParam5 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_SECRET", env), "test-BCDA_SSAS_SECRET")
101+
cleanupParam5 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_SECRET", env), "test-BCDA_SSAS_SECRET")
102102
t.Cleanup(func() { cleanupParam5() })
103-
cleanupParam6 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/api/BCDA_CA_FILE.pem", env), "test-BCDA_CA_FILE")
103+
cleanupParam6 := testUtils.SetParameter(t, fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_CA_FILE.pem", env), "test-BCDA_CA_FILE")
104104
t.Cleanup(func() { cleanupParam6() })
105105

106106
slackName, err := setupEnv(context.Background())

‎bcda/lambda/cclf/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func attributionImportHandler(ctx context.Context, sqsEvent events.SQSEvent) (st
6464
o.Credentials = appCreds
6565
})
6666

67-
dbURL, err := bcdaaws.GetParameter(ctx, ssmClient, fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env))
67+
dbURL, err := bcdaaws.GetParameter(ctx, ssmClient, fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env))
6868
if err != nil {
6969
logger.Error("failed to load DB URL")
7070
return "", err

‎bcda/lambda/cclf/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (s *AttributionImportMainSuite) TestImportCCLFDirectory() {
4848
})
4949
defer cleanupEnv()
5050

51-
cleanupParam := testUtils.SetParameter(s.T(), fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env), "postgresql://postgres:toor@db-unit-test:5432/bcda_test?sslmode=disable")
51+
cleanupParam := testUtils.SetParameter(s.T(), fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env), "postgresql://postgres:toor@db-unit-test:5432/bcda_test?sslmode=disable")
5252
defer cleanupParam()
5353

5454
type test struct {

0 commit comments

Comments
 (0)