Skip to content

Commit 194520a

Browse files
carlpartridgecarlpartridge
committed
Cleanup
1 parent b795439 commit 194520a

File tree

10 files changed

+26
-51
lines changed

10 files changed

+26
-51
lines changed

‎bcda/lambda/admin_aco_deny/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
104104
ssmClient := ssm.NewFromConfig(cfg)
105105

106106
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
107-
slackTokenName := "/slack/token/workflow-alerts"
108-
paramNames := []string{slackTokenName, dbURLName}
107+
slackParamName := "/slack/token/workflow-alerts"
108+
paramNames := []string{slackParamName, dbURLName}
109109
params, err := bcdaaws.GetParameters(ctx, ssmClient, paramNames)
110110
if err != nil {
111111
return awsParams{}, err
112112
}
113113

114-
return awsParams{params[dbURLName], params[slackTokenName]}, nil
114+
return awsParams{params[dbURLName], params[slackParamName]}, nil
115115
}

‎bcda/lambda/admin_create_aco/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
150150
ssmClient := ssm.NewFromConfig(cfg)
151151

152152
dbURLName := fmt.Sprintf("/bcda/%s/api/DATABASE_URL", env)
153-
slackTokenName := "/slack/token/workflow-alerts"
154-
paramNames := []string{slackTokenName, dbURLName}
153+
slackParamName := "/slack/token/workflow-alerts"
154+
paramNames := []string{slackParamName, dbURLName}
155155
params, err := bcdaaws.GetParameters(ctx, ssmClient, paramNames)
156156
if err != nil {
157157
return awsParams{}, err
158158
}
159159

160-
return awsParams{params[dbURLName], params[slackTokenName]}, nil
160+
return awsParams{params[dbURLName], params[slackParamName]}, nil
161161
}

‎bcda/lambda/admin_create_aco_creds/aws.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
2525
return awsParams{}, nil
2626
}
2727

28-
slackTokenName := "/slack/token/workflow-alerts"
28+
slackParamName := "/slack/token/workflow-alerts"
2929
ssasURLName := fmt.Sprintf("/bcda/%s/api/SSAS_URL", env)
3030
clientIDName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_CLIENT_ID", env)
3131
clientSecretName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_SECRET", env)
3232
ssasPEMName := fmt.Sprintf("/bcda/%s/api/BCDA_CA_FILE.pem", env)
3333
credsBucketName := fmt.Sprintf("/bcda/%s/aco_creds_bucket", env)
3434

3535
paramNames := []string{
36-
slackTokenName,
36+
slackParamName,
3737
ssasURLName,
3838
clientIDName,
3939
clientSecretName,
@@ -53,7 +53,7 @@ func getAWSParams(ctx context.Context) (awsParams, error) {
5353
}
5454

5555
return awsParams{
56-
params[slackTokenName],
56+
params[slackParamName],
5757
params[ssasURLName],
5858
params[clientIDName],
5959
params[clientSecretName],

‎bcda/lambda/admin_create_group/main.go‎

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

151-
slackTokenName := "/slack/token/workflow-alerts"
151+
slackParamName := "/slack/token/workflow-alerts"
152152
ssasURLName := fmt.Sprintf("/bcda/%s/api/SSAS_URL", env)
153153
ssasClientName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_CLIENT_ID", env)
154154
ssasSecretName := fmt.Sprintf("/bcda/%s/api/BCDA_SSAS_SECRET", env)
155155
caFileName := fmt.Sprintf("/bcda/%s/api/BCDA_CA_FILE.pem", env)
156156
paramNames := []string{
157-
slackTokenName,
157+
slackParamName,
158158
ssasURLName,
159159
ssasClientName,
160160
ssasSecretName,
@@ -165,9 +165,9 @@ func setupEnv(ctx context.Context) (string, error) {
165165
return "", err
166166
}
167167

168-
err = os.Setenv(slackTokenName, params[slackTokenName])
168+
err = os.Setenv(slackParamName, params[slackParamName])
169169
if err != nil {
170-
log.Errorf("Error setting slackTokenName env var: %+v", err)
170+
log.Errorf("Error setting slackParamName env var: %+v", err)
171171
return "", err
172172
}
173173
err = os.Setenv(ssasURLName, params[ssasURLName])
@@ -209,5 +209,5 @@ func setupEnv(ctx context.Context) (string, error) {
209209
return "", err
210210
}
211211

212-
return params[slackTokenName], nil
212+
return params[slackParamName], nil
213213
}

‎bcda/suppression/suppression_s3_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,9 @@ func (s *SuppressionS3TestSuite) TestCleanupSuppression() {
294294
assert.Nil(err)
295295

296296
client := testUtils.TestS3Client(s.T(), testUtils.TestAWSConfig(s.T()))
297-
output, err := client.ListObjectsV2(s.T().Context(), &s3.ListObjectsV2Input{
297+
output, _ := client.ListObjectsV2(s.T().Context(), &s3.ListObjectsV2Input{
298298
Bucket: aws.String(bucketName),
299299
})
300-
assert.Nil(s.T(), err)
301300
assert.True(len(output.Contents) == 0)
302301
}
303302

‎go.mod‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/BurntSushi/toml v0.4.1
77
github.com/DATA-DOG/go-sqlmock v1.5.0
88
github.com/aws/aws-lambda-go v1.49.0
9-
github.com/aws/aws-sdk-go v1.55.8
109
github.com/cenkalti/backoff/v4 v4.2.1
1110
github.com/go-chi/chi/v5 v5.2.3
1211
github.com/go-chi/render v1.0.1
@@ -147,7 +146,6 @@ require (
147146
github.com/hashicorp/hcl v1.0.0 // indirect
148147
github.com/huandu/xstrings v1.3.2 // indirect
149148
github.com/influxdata/tdigest v0.0.1 // indirect
150-
github.com/jmespath/go-jmespath v0.4.0 // indirect
151149
github.com/jonboulle/clockwork v0.1.0 // indirect
152150
github.com/josharian/intern v1.0.0 // indirect
153151
github.com/json-iterator/go v1.1.12 // indirect

‎go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l
114114
github.com/aws/aws-lambda-go v1.49.0 h1:z4VhTqkFZPM3xpEtTqWqRqsRH4TZBMJqTkRiBPYLqIQ=
115115
github.com/aws/aws-lambda-go v1.49.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
116116
github.com/aws/aws-sdk-go v1.28.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
117-
github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
118-
github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
119117
github.com/aws/aws-sdk-go-v2 v1.39.4 h1:qTsQKcdQPHnfGYBBs+Btl8QwxJeoWcOcPcixK90mRhg=
120118
github.com/aws/aws-sdk-go-v2 v1.39.4/go.mod h1:yWSxrnioGUZ4WVv9TgMrNUeLV3PFESn/v+6T/Su8gnM=
121119
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
@@ -592,10 +590,6 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
592590
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
593591
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
594592
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
595-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
596-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
597-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
598-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
599593
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
600594
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
601595
github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=

‎go.work.sum‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -472,32 +472,14 @@ github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 h1:EFSB7Zo9Eg91v7
472472
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
473473
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
474474
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
475+
github.com/aws/aws-sdk-go v1.49.6 h1:yNldzF5kzLBRvKlKz1S0bkvc2+04R1kt13KfBWQBfFA=
476+
github.com/aws/aws-sdk-go v1.49.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
475477
github.com/aws/aws-sdk-go-v2 v1.16.16 h1:M1fj4FE2lB4NzRb9Y0xdWsn2P0+2UHVxwKyOa4YJNjk=
476-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
477-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=
478-
github.com/aws/aws-sdk-go-v2/config v1.31.14 h1:kj/KpDqvt0UqcEL3WOvCykE9QUpBb6b23hQdnXe+elo=
479-
github.com/aws/aws-sdk-go-v2/config v1.31.14/go.mod h1:X5PaY6QCzViihn/ru7VxnIamcJQrG9NSeTxuSKm2YtU=
480478
github.com/aws/aws-sdk-go-v2/credentials v1.12.20 h1:9+ZhlDY7N9dPnUmf7CDfW9In4sW5Ff3bh7oy4DzS1IE=
481-
github.com/aws/aws-sdk-go-v2/credentials v1.18.18 h1:5AfxTvDN0AJoA7rg/yEc0sHhl6/B9fZ+NtiQuOjWGQM=
482-
github.com/aws/aws-sdk-go-v2/credentials v1.18.18/go.mod h1:m9mE1mJ1s7zI6rrt7V3RQU2SCgUbNaphlfqEksLp+Fs=
483-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.13 h1:9XV2TkOvCs6Fis10b4scQbv/eDPhklhU/65GikPxXAA=
484-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.13/go.mod h1:X5gq64GsjuOIJRIUzR3x3Du96zUF+U1if3Qw/qNx1k8=
485479
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 h1:s4g/wnzMf+qepSNgTvaQQHNxyMLKSawNhKCPNy++2xY=
486480
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 h1:/K482T5A3623WJgWT8w1yRAFK4RzGzEl7y39yhtn9eA=
487-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10 h1:FHw90xCTsofzk6vjU808TSuDtDfOOKPNdz5Weyc3tUI=
488-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.10/go.mod h1:n8jdIE/8F3UYkg8O4IGkQpn2qUmapg/1K1yl29/uf/c=
489481
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9 h1:Lh1AShsuIJTwMkoxVCAYPJgNG5H+eN6SmoUn8nOZ5wE=
490-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1 h1:ne+eepnDB2Wh5lHKzELgEncIqeVlQ1rSF9fEa4r5I+A=
491-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.1/go.mod h1:u0Jkg0L+dcG1ozUq21uFElmpbmjBnhHR5DELHIme4wg=
492482
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 h1:Jrd/oMh0PKQc6+BowB+pLEwLIgaQF29eYbe7E1Av9Ug=
493-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10 h1:DA+Hl5adieRyFvE7pCvBWm3VOZTRexGVkXw33SUqNoY=
494-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.10/go.mod h1:L+A89dH3/gr8L4ecrdzuXUYd1znoko6myzndVGZx/DA=
495-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.6 h1:Hcb4yllr4GTOHC/BKjEklxWhciWMHIqzeCI9oYf1OIk=
496-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.6/go.mod h1:N/iojY+8bW3MYol9NUMuKimpSbPEur75cuI1SmtonFM=
497-
github.com/aws/aws-sdk-go-v2/service/ssm v1.66.1 h1:snE061FIWFZv4v8c9iJZ3Cvyu21wYDWy9oNmNHCd+Fc=
498-
github.com/aws/aws-sdk-go-v2/service/ssm v1.66.1/go.mod h1:L5XWT5tckol5yKkYc8O2+jZBZgF/tFzVQ5QE00PJUjU=
499-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.8 h1:xSL4IV19pKDASL2fjWXRfTGmZddPiPPZNPpbv6uZQZY=
500-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.8/go.mod h1:L1xxV3zAdB+qVrVW/pBIrIAnHFWHo6FBbFe4xOGsG/o=
501483
github.com/aws/smithy-go v1.13.3 h1:l7LYxGuzK6/K+NzJ2mC+VvLUbae0sL3bXU//04MkmnA=
502484
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
503485
github.com/bgentry/que-go v1.0.1 h1:M/cEPOU66X/YewE1rD1IdHjfM79jClXl0BHNWiF+l44=
@@ -766,6 +748,8 @@ github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU=
766748
github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
767749
github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
768750
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
751+
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
752+
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
769753
github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
770754
github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
771755
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=

‎optout/s3_file_handler.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (handler *S3FileHandler) LoadOptOutFiles(ctx context.Context, path string)
5555

5656
if err != nil {
5757
// Skip files with a bad name. An unknown file in this dir isn't a blocker
58-
handler.Warningf("Unknown file found: %s. Skipping.\n", metadata)
58+
handler.Warningf("Unknown file found: %s. Skipping", metadata)
5959
skipped = skipped + 1
6060
continue
6161
}
@@ -75,7 +75,7 @@ func (handler *S3FileHandler) ListFiles(ctx context.Context, bucket, prefix stri
7575
})
7676

7777
if err != nil {
78-
handler.Errorf("Failed to list objects in S3 bucket %s, prefix %s: %s\n", bucket, prefix, err)
78+
handler.Errorf("Failed to list objects in S3 bucket %s, prefix %s: %s", bucket, prefix, err)
7979
return nil, err
8080
}
8181

@@ -119,7 +119,7 @@ func (handler *S3FileHandler) OpenFileBytes(ctx context.Context, filePath string
119119
return nil, err
120120
}
121121

122-
handler.Logger.WithField("file_size_bytes", numBytes).Infof("file downloaded: size=%d\n", numBytes)
122+
handler.Logger.WithField("file_size_bytes", numBytes).Infof("file downloaded: size=%d", numBytes)
123123

124124
return buff, err
125125
}
@@ -131,7 +131,7 @@ func (handler *S3FileHandler) CleanupOptOutFiles(ctx context.Context, suppressli
131131
if !suppressionFile.Imported {
132132
// Don't do anything. The S3 bucket should have a retention policy that
133133
// automatically cleans up files after a specified period of time,
134-
handler.Warningf("File %s was not imported successfully. Skipping cleanup.\n", suppressionFile)
134+
handler.Warningf("File %s was not imported successfully. Skipping cleanup", suppressionFile)
135135
continue
136136
}
137137

@@ -143,11 +143,11 @@ func (handler *S3FileHandler) CleanupOptOutFiles(ctx context.Context, suppressli
143143
continue
144144
}
145145

146-
handler.Infof("File %s successfully ingested and deleted from S3.\n", suppressionFile)
146+
handler.Infof("File %s successfully ingested and deleted from S3", suppressionFile)
147147
}
148148

149149
if errCount > 0 {
150-
return fmt.Errorf("%d files could not be cleaned up\n", errCount)
150+
return fmt.Errorf("%d files could not be cleaned up", errCount)
151151
}
152152

153153
return nil

‎optout/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func ParseMetadata(filename string) (OptOutFilenameMetadata, error) {
3333

3434
// ignore files for different environments
3535
if !IsForCurrentEnv(filename) {
36-
return metadata, fmt.Errorf("Skipping file for different environment: %s", filename)
36+
return metadata, fmt.Errorf("skipping file for different environment: %s", filename)
3737
}
3838

3939
filenameDate := matches[3]

0 commit comments

Comments
 (0)