Skip to content

Commit 4729659

Browse files
add DatabaseURLParamPath to reduce duplicated code and make SQ happy
1 parent 78b7f5f commit 4729659

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

bcda/aws/parameters.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import (
77
"github.com/aws/aws-sdk-go-v2/service/ssm"
88
)
99

10+
// DatabaseURLParamPath returns the SSM parameter path for the API DATABASE_URL (sensitive).
11+
func DatabaseURLParamPath(env string) string {
12+
return fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
13+
}
14+
1015
// Returns the value of a single parameter from the SSM Parameter Store
1116
func GetParameter(ctx context.Context, client *ssm.Client, keyname string) (string, error) {
1217
withDecryption := true

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/sensitive/api/DATABASE_URL", env)
102+
dbURLName := bcdaaws.DatabaseURLParamPath(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/sensitive/api/DATABASE_URL", env)
146+
dbURLName := bcdaaws.DatabaseURLParamPath(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_creds/aws.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
2323
env := adjustedEnv()
2424

2525
slackParamName := "/slack/token/workflow-alerts"
26-
dbURLName := fmt.Sprintf("/bcda/%s/sensitive/api/DATABASE_URL", env)
26+
dbURLName := bcdaaws.DatabaseURLParamPath(env)
2727
ssasURLName := fmt.Sprintf("/bcda/%s/sensitive/api/SSAS_URL", env)
2828
clientIDName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_CLIENT_ID", env)
2929
clientSecretName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_SECRET", env)

bcda/lambda/admin_create_group/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ 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/sensitive/api/DATABASE_URL", env)
152+
dbURLName := bcdaaws.DatabaseURLParamPath(env)
153153
ssasURLName := fmt.Sprintf("/bcda/%s/sensitive/api/SSAS_URL", env)
154154
ssasClientName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_CLIENT_ID", env)
155155
ssasSecretName := fmt.Sprintf("/bcda/%s/sensitive/api/BCDA_SSAS_SECRET", env)

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/sensitive/api/DATABASE_URL", env))
67+
dbURL, err := bcdaaws.GetParameter(ctx, ssmClient, bcdaaws.DatabaseURLParamPath(env))
6868
if err != nil {
6969
logger.Error("failed to load DB URL")
7070
return "", err

bcda/lambda/optout/main.go

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

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

0 commit comments

Comments
 (0)