atc: don't use $AWS_REGION var

this effectively made it enable both credential managers, with at least one of them partially instantiated. instead let's just have both use their explicit CONCOURSE_* env var form, so it's clear which one is being configured. fixes #2191
concourse · Nov 7, 2018 · 5d30023 · 5d30023
1 parent 3bc2c8e
commit 5d30023
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/atc/creds/secretsmanager/manager.go b/atc/creds/secretsmanager/manager.go
@@ -22,7 +22,7 @@ type Manager struct {
 	AwsAccessKeyID         string `long:"access-key" description:"AWS Access key ID"`
 	AwsSecretAccessKey     string `long:"secret-key" description:"AWS Secret Access Key"`
 	AwsSessionToken        string `long:"session-token" description:"AWS Session Token"`
-	AwsRegion              string `long:"region" description:"AWS region to send requests to" env:"AWS_REGION"`
+	AwsRegion              string `long:"region" description:"AWS region to send requests to"`
 	PipelineSecretTemplate string `long:"pipeline-secret-template" description:"AWS Secrets Manager secret identifier template used for pipeline specific parameter" default:"/concourse/{{.Team}}/{{.Pipeline}}/{{.Secret}}"`
 	TeamSecretTemplate     string `long:"team-secret-template" description:"AWS Secrets Manager secret identifier  template used for team specific parameter" default:"/concourse/{{.Team}}/{{.Secret}}"`
 	SecretManager          *SecretsManager

diff --git a/atc/creds/ssm/manager.go b/atc/creds/ssm/manager.go
@@ -24,7 +24,7 @@ type SsmManager struct {
 	AwsAccessKeyID         string `long:"access-key" description:"AWS Access key ID"`
 	AwsSecretAccessKey     string `long:"secret-key" description:"AWS Secret Access Key"`
 	AwsSessionToken        string `long:"session-token" description:"AWS Session Token"`
-	AwsRegion              string `long:"region" description:"AWS region to send requests to" env:"AWS_REGION"`
+	AwsRegion              string `long:"region" description:"AWS region to send requests to"`
 	PipelineSecretTemplate string `long:"pipeline-secret-template" description:"AWS SSM parameter name template used for pipeline specific parameter" default:"/concourse/{{.Team}}/{{.Pipeline}}/{{.Secret}}"`
 	TeamSecretTemplate     string `long:"team-secret-template" description:"AWS SSM parameter name template used for team specific parameter" default:"/concourse/{{.Team}}/{{.Secret}}"`
 	Ssm                    *Ssm