Merge pull request #49 from wunderio/feature/aws-compatibility

Feature/aws compatibility

Author: Rade333

cmd/ciImageLogin.go

@@ -32,6 +32,7 @@ Available flags and environment variables:
 
   * Amazon Web Services:
     - "--aws-secret-access-key" flag or "AWS_SECRET_ACCESS_KEY" environment variable: Amazon Web Services IAM account key (string value)
+		- "--aws-region" flag or "AWS_REGION" environment variable: Region of the container repository
 
   * Azure Services:
     - "--aks-tenant-id" flag or "AKS_TENANT_ID" environment variable: Azure Services tenant id
@@ -47,6 +48,7 @@ Available flags and environment variables:
 		imageRepoPass, _ := cmd.Flags().GetString("image-repo-pass")
 		gcpKeyJson, _ := cmd.Flags().GetString("gcp-key-json")
 		awsSecretAccessKey, _ := cmd.Flags().GetString("aws-secret-access-key")
+		awsRegion, _ := cmd.Flags().GetString("aws-region")
 		aksTenantID, _ := cmd.Flags().GetString("aks-tenant-id")
 		aksSPAppID, _ := cmd.Flags().GetString("aks-sp-app-id")
 		aksSPPass, _ := cmd.Flags().GetString("aks-sp-password")
@@ -62,6 +64,9 @@ Available flags and environment variables:
 			if len(awsSecretAccessKey) == 0 {
 				awsSecretAccessKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
 			}
+			if len(awsRegion) == 0 {
+				awsRegion = os.Getenv("AWS_REGION")
+			}
 			if len(imageRepoHost) == 0 {
 				imageRepoHost = os.Getenv("IMAGE_REPO_HOST")
 			}
@@ -93,6 +98,7 @@ Available flags and environment variables:
 			fmt.Println("IMAGE_REPO_PASS:", imageRepoPass)
 			fmt.Println("GCLOUD_KEY_JSON:", gcpKeyJson)
 			fmt.Println("AWS_SECRET_ACCESS_KEY:", awsSecretAccessKey)
+			fmt.Println("AWS_REGION:", awsRegion)
 			fmt.Println("AKS_TENANT_ID:", aksTenantID)
 			fmt.Println("AKS_SP_APP_ID:", aksSPAppID)
 			fmt.Println("AKS_SP_PASSWORD:", aksSPPass)
@@ -121,8 +127,15 @@ Available flags and environment variables:
 				command = fmt.Sprintf("echo %q | docker login --username %q --password-stdin %s", gcpKeyJson, "_json_key", imageRepoHost)
 
 			} else if awsSecretAccessKey != "" {
+				//Get AWS Account ID
+				awsAccountId, err := exec.Command("bash", "-c", "aws sts get-caller-identity --query \"Account\" --output text --no-cli-pager").CombinedOutput()
+				if err != nil {
+					log.Fatal("Error:", err)
+				}
+				//Remove newline
+				awsAccountId = []byte(strings.TrimSuffix(string(awsAccountId), "\n"))
 				// ECR login
-				command = fmt.Sprintf("aws ecr get-login --no-include-email | bash")
+				command = fmt.Sprintf("aws ecr get-login-password --region %s | docker login --username AWS --password-stdin %s.dkr.ecr.%s.amazonaws.com", awsRegion, awsAccountId, awsRegion)
 				// TODO: use aws cli v2
 				// command = fmt.Sprintf("echo %q | docker login --username AWS --password-stdin %s", awsSecretAccessKey, imageRepoHost)
 
@@ -155,6 +168,7 @@ func init() {
 	ciImageLoginCmd.Flags().String("image-repo-pass", "", "(Docker) container image repository password")
 	ciImageLoginCmd.Flags().String("gcp-key-json", "", "Google Cloud service account key (plaintext, json)")
 	ciImageLoginCmd.Flags().String("aws-secret-access-key", "", "Amazon Web Services IAM account key (string value)")
+	ciImageLoginCmd.Flags().String("aws-region", "", "Elastic Container Registry region (string value)")
 	ciImageLoginCmd.Flags().String("aks-tenant-id", "", "Azure Services tenant id")
 	ciImageLoginCmd.Flags().String("aks-sp-app-id", "", "Azure Services servicePrincipal app id")
 	ciImageLoginCmd.Flags().String("aks-sp-password", "", "Azure Services servicePrincipal password")

tests/image_test.go

@@ -28,19 +28,21 @@ func TestImageLoginCmd(t *testing.T) {
 		"IMAGE_REPO_PASS=222",
 		"GCLOUD_KEY_JSON=333",
 		"AWS_SECRET_ACCESS_KEY=444",
-		"AKS_TENANT_ID=555",
-		"AKS_SP_APP_ID=666",
-		"AKS_SP_PASSWORD=777",
+		"AWS_REGION=555",
+		"AKS_TENANT_ID=666",
+		"AKS_SP_APP_ID=777",
+		"AKS_SP_PASSWORD=888",
 	}
 	testString = `IMAGE_REPO_HOST: foo.bar
 IMAGE_REPO_TLS: true
 IMAGE_REPO_USER: 111
 IMAGE_REPO_PASS: 222
 GCLOUD_KEY_JSON: 333
 AWS_SECRET_ACCESS_KEY: 444
-AKS_TENANT_ID: 555
-AKS_SP_APP_ID: 666
-AKS_SP_PASSWORD: 777
+AWS_REGION: 555
+AKS_TENANT_ID: 666
+AKS_SP_APP_ID: 777
+AKS_SP_PASSWORD: 888
 Command (not executed): echo "222" | docker login --username "111" --password-stdin https://foo.bar`
 
 	CliExecTest(t, command, environment, testString, false)
@@ -64,9 +66,10 @@ Command (not executed): echo "222" | docker login --username "111" --password-st
 			--image-repo-pass 222 \
 			--gcp-key-json 333 \
 			--aws-secret-access-key 444 \
-			--aks-tenant-id 555 \
-			--aks-sp-app-id 666 \
-			--aks-sp-password 777 \
+			--aws-region 555 \
+			--aks-tenant-id 666 \
+			--aks-sp-app-id 777 \
+			--aks-sp-password 888 \
 			--debug`
 
 	environment = []string{}
@@ -76,9 +79,10 @@ IMAGE_REPO_USER: 111
 IMAGE_REPO_PASS: 222
 GCLOUD_KEY_JSON: 333
 AWS_SECRET_ACCESS_KEY: 444
-AKS_TENANT_ID: 555
-AKS_SP_APP_ID: 666
-AKS_SP_PASSWORD: 777
+AWS_REGION: 555
+AKS_TENANT_ID: 666
+AKS_SP_APP_ID: 777
+AKS_SP_PASSWORD: 888
 Command (not executed): echo "222" | docker login --username "111" --password-stdin https://foo.bar`
 	CliExecTest(t, command, environment, testString, false)