Browse Source

Revert "Debug for CI failing tests (green locally)"

This reverts commit 1d875674357c7c5a5c26349f62c6f2ef71f74e38.

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 years ago
parent
commit
dc1e313858
1 changed files with 2 additions and 15 deletions
  1. 2 15
      aci/convert/registry_credentials.go

+ 2 - 15
aci/convert/registry_credentials.go

@@ -70,8 +70,7 @@ func getRegistryCredentials(project compose.Project, helper registryHelper) ([]c
 	for _, registry := range acrRegistries {
 		err := helper.autoLoginAcr(registry)
 		if err != nil {
-			return nil, err
-			//fmt.Printf("Could not automatically login to %s from your Azure login. Assuming you already logged in to the ACR registry\n", registry)
+			fmt.Printf("Could not automatically login to %s from your Azure login. Assuming you already logged in to the ACR registry\n", registry)
 		}
 	}
 
@@ -80,13 +79,6 @@ func getRegistryCredentials(project compose.Project, helper registryHelper) ([]c
 		return nil, err
 	}
 	var registryCreds []containerinstance.ImageRegistryCredential
-	b, err := json.MarshalIndent(allCreds, "", "  ")
-	if err != nil {
-		fmt.Println("ERROR WHILE GETTING ALL CREDS")
-		fmt.Println(err)
-	}
-	fmt.Println("** ALL CREDS " + string(b))
-
 	for name, oneCred := range allCreds {
 		parsedURL, err := url.Parse(name)
 		// Credentials can contain some garbage, we don't return the error here
@@ -144,7 +136,6 @@ func getUsedRegistries(project compose.Project) (map[string]bool, []string) {
 }
 
 func (c cliRegistryHelper) autoLoginAcr(registry string) error {
-	fmt.Println("Fetching ACR login for " + registry)
 	loginService, err := login.NewAzureLoginService()
 	if err != nil {
 		return err
@@ -181,10 +172,6 @@ func (c cliRegistryHelper) autoLoginAcr(registry string) error {
 	if err := json.Unmarshal(bits, &newToken); err != nil {
 		return err
 	}
-	fmt.Println("docker login for " + registry)
-	fmt.Println(newToken.RefreshToken)
 	cmd := exec.Command("docker", "login", "-p", newToken.RefreshToken, "-u", tokenUsername, registry)
-	loginResult, err := cmd.CombinedOutput()
-	fmt.Println("docker login : " + string(loginResult))
-	return err
+	return cmd.Run()
 }