aws.go az.go gcloud.go

.ci/test

@@ -13,9 +13,37 @@ fi
 
 cd "${SOURCE_PATH}"
 
+
+
+function check() {
+if [ $? -eq 0 ]; then
+  echo "PASS"
+else
+  echo "FAIL"
+fi
+}
+
+if [ $1x == "local"x ]; then
+echo "====aws cli===="
+go run cmd/gardenctl/main.go aws -- --version > /dev/null
+check
+echo "====az cli===="
+go run cmd/gardenctl/main.go az -- -h > /dev/null
+check
+echo "====gcloud cli===="
+go run cmd/gardenctl/main.go gcloud -- -v > /dev/null
+check
+
+else 
 # Build the Ginkgo (test framework) binary to be able to execute the tests.
 go install -mod=vendor ./vendor/github.com/onsi/ginkgo/ginkgo
 
 ###############################################################################
 
 ginkgo -v -progress -cover -r -mod=vendor pkg/...
+fi
+
+
+
+
+

pkg/cmd/aws.go

@@ -37,8 +37,8 @@ func NewAwsCmd(targetReader TargetReader) *cobra.Command {
 				fmt.Println("Please go to https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html for how to install aws cli")
 				os.Exit(2)
 			}
-			arguments := "aws " + strings.Join(args[:], " ")
-			operate("aws", arguments)
+			arguments := strings.Join(args[:], " ")
+			fmt.Println(operate("aws", arguments))
 
 			return nil
 		},

pkg/cmd/az.go

@@ -37,8 +37,8 @@ func NewAzCmd(targetReader TargetReader) *cobra.Command {
 				fmt.Println("Please go to https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest for how to install az cli")
 				os.Exit(2)
 			}
-			arguments := "az " + strings.Join(args[:], " ")
-			operate("az", arguments)
+			arguments := strings.Join(args[:], " ")
+			fmt.Println(operate("az", arguments))
 
 			return nil
 		},

pkg/cmd/gcloud.go

@@ -38,8 +38,8 @@ func NewGcloudCmd(targetReader TargetReader) *cobra.Command {
 				os.Exit(2)
 			}
 
-			arguments := "gcloud " + strings.Join(args[:], " ")
-			operate("gcp", arguments)
+			arguments := strings.Join(args[:], " ")
+			fmt.Println(operate("gcp", arguments))
 
 			return nil
 		},

pkg/cmd/operate.go

@@ -88,15 +88,13 @@ func operate(provider, arguments string) string {
 		accessKeyID := []byte(secret.Data["accessKeyID"])
 		secretAccessKey := []byte(secret.Data["secretAccessKey"])
 		args := strings.Fields(arguments)
-		args = args[1:]
 		cmd := exec.Command("aws", args...)
 		newEnv := append(os.Environ(), "AWS_ACCESS_KEY_ID="+string(accessKeyID[:]), "AWS_SECRET_ACCESS_KEY="+string(secretAccessKey[:]), "AWS_DEFAULT_REGION="+region, "AWS_DEFAULT_OUTPUT=text")
 		cmd.Env = newEnv
 		out, err = cmd.CombinedOutput()
 		if err != nil {
 			log.Fatalf("AWS CLI failed with %s\n%s\n", out, err)
 		}
-		fmt.Println(strings.TrimSpace(string(out[:])))
 
 	case "gcp":
 		serviceaccount := []byte(secret.Data["serviceaccount.json"])
@@ -142,7 +140,6 @@ func operate(provider, arguments string) string {
 
 		arguments := arguments + " --account=" + account + " --project=" + project
 		args := strings.Fields(arguments)
-		args = args[1:]
 		cmd := exec.Command("gcloud", args...)
 		out, err = cmd.CombinedOutput()
 		if err != nil {
@@ -153,7 +150,7 @@ func operate(provider, arguments string) string {
 		if err != nil {
 			os.Exit(2)
 		}
-		fmt.Println(strings.TrimSpace(string(out[:])))
+
 	case "az":
 		clientID := []byte(secret.Data["clientID"])
 		clientSecret := []byte(secret.Data["clientSecret"])
@@ -167,13 +164,11 @@ func operate(provider, arguments string) string {
 
 		arguments := arguments + " --subscription " + string(subscriptionID[:])
 		args := strings.Fields(arguments)
-		args = args[1:]
 		cmd := exec.Command("az", args...)
 		out, err = cmd.CombinedOutput()
 		if err != nil {
 			log.Fatalf("az CLI failed with %s\n%s\n", out, err)
 		}
-		fmt.Println(strings.TrimSpace(string(out[:])))
 
 	case "openstack":
 		authURL := ""