Minor fixes: More in description (#1968)

* Echo auto-login failure if any

* Update help for sync command to use trailing slash on directories

Author: nakulkar-msft

cmd/credentialUtil.go

@@ -80,11 +80,17 @@ func GetOAuthTokenManagerInstance() (*common.UserOAuthTokenManager, error) {
 	var err error
 	autoOAuth.Do(func() {
 		var lca loginCmdArgs
-		if glcm.GetEnvironmentVariable(common.EEnvironmentVariable.AutoLoginType()) == "" {
-			err = errors.New("no login type specified")
+		autoLoginType := strings.ToUpper(glcm.GetEnvironmentVariable(common.EEnvironmentVariable.AutoLoginType()))
+		if autoLoginType == "" {
+			glcm.Info("Autologin not specified.")
 			return
 		}
 
+		if autoLoginType != "SPN" && autoLoginType != "MSI" && autoLoginType != "DEVICE" {
+			glcm.Error("Invalid Auto-login type specified.")
+			return
+		}
+		
 		if tenantID := glcm.GetEnvironmentVariable(common.EEnvironmentVariable.TenantID()); tenantID != "" {
 			lca.tenantID = tenantID
 		}
@@ -113,7 +119,9 @@ func GetOAuthTokenManagerInstance() (*common.UserOAuthTokenManager, error) {
 		}
 
 		lca.persistToken = false
-		err = lca.process()
+		if err = lca.process(); err != nil {
+			glcm.Error(fmt.Sprintf("Failed to perform Auto-login: %v.", err.Error()))
+		}
 	})
 
 	if err != nil {
@@ -550,13 +558,6 @@ func doGetCredentialTypeForLocation(ctx context.Context, location common.Locatio
 			credType = common.ECredentialType.Anonymous()
 		case common.ELocation.Blob():
 			credType, isPublic, err = getBlobCredentialType(ctx, resource, isSource, resourceSAS, cpkOptions)
-			if azErr, ok := err.(common.AzError); ok && azErr.Equals(common.EAzError.LoginCredMissing()) {
-				_, autoLoginErr := GetOAuthTokenManagerInstance()
-				if autoLoginErr == nil {
-					err = nil // Autologin succeeded, reset original error
-					credType, isPublic = common.ECredentialType.OAuthToken(), false
-				}
-			}
 			if err != nil {
 				return common.ECredentialType.Unknown(), false, err
 			}
@@ -566,13 +567,6 @@ func doGetCredentialTypeForLocation(ctx context.Context, location common.Locatio
 			}
 		case common.ELocation.BlobFS():
 			credType, err = getBlobFSCredentialType(ctx, resource, resourceSAS != "")
-			if azErr, ok := err.(common.AzError); ok && azErr.Equals(common.EAzError.LoginCredMissing()) {
-				_, autoLoginErr := GetOAuthTokenManagerInstance()
-				if autoLoginErr == nil {
-					err = nil // Autologin succeeded, reset original error
-					credType, isPublic = common.ECredentialType.OAuthToken(), false
-				}
-			}
 			if err != nil {
 				return common.ECredentialType.Unknown(), false, err
 			}

cmd/syncEnumerator.go

@@ -94,7 +94,8 @@ func (cca *cookedSyncCmdArgs) initEnumerator(ctx context.Context) (enumerator *s
 	// verify that the traversers are targeting the same type of resources
 	if sourceTraverser.IsDirectory(true) != destinationTraverser.IsDirectory(true) {
 		return nil, errors.New("trying to sync between different resource types (either file <-> directory or directory <-> file) which is not allowed." +
-			"sync must happen between source and destination of the same type, e.g. either file <-> file or directory <-> directory")
+			"sync must happen between source and destination of the same type, e.g. either file <-> file or directory <-> directory." +
+			"To make sure target is handled as a directory, add a trailing '/' to the target.")
 	}
 
 	// set up the filters in the right order