Skip to content

Commit

Permalink
Fix bug in workers using wrong env var
Browse files Browse the repository at this point in the history
  • Loading branch information
jastBytes committed Sep 30, 2020
1 parent 57a5b25 commit d3889da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/worker/consul.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var consulCmd = &cobra.Command{
s3c := plan.Spec.Destination.S3
conf := &s3.S3DestinationConf{
Endpoint: s3c.Endpoint,
AccessKey: util.FallbackToEnv(s3c.AccessKeyID, "S3_SECRET_ACCESS_KEY"),
AccessKey: util.FallbackToEnv(s3c.AccessKeyID, "S3_ACCESS_KEY_ID"),
SecretKey: util.FallbackToEnv(s3c.SecretAccessKey, "S3_SECRET_ACCESS_KEY"),
EncryptionKey: util.NilIfEmpty(util.FallbackToEnv(s3c.EncryptionKey, "S3_ENCRYPTION_KEY")),
EncryptionAlgorithm: util.FallbackToEnv(s3c.EncryptionAlgorithm, "S3_ENCRYPTION_ALGORITHM"),
Expand Down
2 changes: 1 addition & 1 deletion cmd/worker/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var mongodbCmd = &cobra.Command{
s3c := plan.Spec.Destination.S3
conf := &s3.S3DestinationConf{
Endpoint: s3c.Endpoint,
AccessKey: util.FallbackToEnv(s3c.AccessKeyID, "S3_SECRET_ACCESS_KEY"),
AccessKey: util.FallbackToEnv(s3c.AccessKeyID, "S3_ACCESS_KEY_ID"),
SecretKey: util.FallbackToEnv(s3c.SecretAccessKey, "S3_SECRET_ACCESS_KEY"),
EncryptionKey: util.NilIfEmpty(util.FallbackToEnv(s3c.EncryptionKey, "S3_ENCRYPTION_KEY")),
EncryptionAlgorithm: util.FallbackToEnv(s3c.EncryptionAlgorithm, "S3_ENCRYPTION_ALGORITHM"),
Expand Down

0 comments on commit d3889da

Please sign in to comment.