Merge pull request #161 from ovotech/fix-ssm

Export cobra vars and add switch for key vs keyId names
ovotech · Oct 15, 2019 · e0c668f · e0c668f
2 parents 977d913 + ceaf71f
commit e0c668f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/pkg/location/circleci.go b/pkg/location/circleci.go
@@ -41,12 +41,14 @@ func (circle CircleCI) Write(serviceAccountName string, keyWrapper KeyWrapper, c
 	provider := keyWrapper.KeyProvider
 
 	var keyEnvVar string
-	if keyEnvVar, err = getVarNameFromProvider(provider, circle.KeyEnvVar); err != nil {
+	var idValue bool
+	if keyEnvVar, err = getVarNameFromProvider(provider, circle.KeyEnvVar, idValue); err != nil {
 		return
 	}
 
 	var keyIDEnvVar string
-	if keyIDEnvVar, err = getVarNameFromProvider(provider, circle.KeyIDEnvVar); err != nil {
+	idValue = true
+	if keyIDEnvVar, err = getVarNameFromProvider(provider, circle.KeyIDEnvVar, idValue); err != nil {
 		return
 	}
 

diff --git a/pkg/location/locations.go b/pkg/location/locations.go
@@ -68,15 +68,19 @@ func envVarDefaultsFromProvider(provider string) (envVarDefaults envVarDefaults,
 	return
 }
 
-func getVarNameFromProvider(provider, suppliedVarName string) (envName string, err error) {
+func getVarNameFromProvider(provider, suppliedVarName string, idValue bool) (envName string, err error) {
 	if len(suppliedVarName) > 0 {
 		envName = suppliedVarName
 	} else {
 		var defaultEnvVar envVarDefaults
 		if defaultEnvVar, err = envVarDefaultsFromProvider(provider); err != nil {
 			return
 		}
-		envName = defaultEnvVar.keyEnvVar
+		if idValue {
+			envName = defaultEnvVar.keyIDEnvVar
+		} else {
+			envName = defaultEnvVar.keyEnvVar
+		}
 	}
 	return
 }
diff --git a/pkg/location/ssm.go b/pkg/location/ssm.go
@@ -42,12 +42,14 @@ func (ssm Ssm) Write(serviceAccountName string, keyWrapper KeyWrapper, creds cre
 	}
 
 	var keyEnvVar string
-	if keyEnvVar, err = getVarNameFromProvider(provider, ssm.keyParamName); err != nil {
+	var idValue bool
+	if keyEnvVar, err = getVarNameFromProvider(provider, ssm.keyParamName, idValue); err != nil {
 		return
 	}
 
 	var keyIDEnvVar string
-	if keyIDEnvVar, err = getVarNameFromProvider(provider, ssm.keyIDParamName); err != nil {
+	idValue = true
+	if keyIDEnvVar, err = getVarNameFromProvider(provider, ssm.keyIDParamName, idValue); err != nil {
 		return
 	}