Clean up deploy autoauth. (#916)

trimble-oss · Jan 28, 2024 · d447304 · d447304
1 parent e9e0167
commit d447304
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/utils/autoUtil.go b/pkg/utils/autoUtil.go
@@ -85,7 +85,7 @@ func AutoAuth(config *DriverConfig,
 	}
 
 	// New values available for the cert file
-	if secretIDPtr != nil && *secretIDPtr != "" && appRoleIDPtr != nil && *appRoleIDPtr != "" {
+	if secretIDPtr != nil && len(*secretIDPtr) > 0 && appRoleIDPtr != nil && len(*appRoleIDPtr) > 0 {
 		override = true
 	}
 
@@ -148,7 +148,8 @@ func AutoAuth(config *DriverConfig,
 		var approleID string
 		var dump []byte
 
-		if override {
+		if override || appRoleConfig == "deployauth" {
+			// Nothing...
 		} else {
 			scanner := bufio.NewScanner(os.Stdin)
 			// Enter ID tokens
@@ -221,7 +222,7 @@ func AutoAuth(config *DriverConfig,
 			}
 
 			dump = []byte(certConfigData)
-		} else if override && !exists {
+		} else if (override && !exists) || appRoleConfig == "deployauth" {
 			if !config.IsShell {
 				LogInfo(config, "No approle file exists, continuing without saving config IDs")
 			}
@@ -239,7 +240,7 @@ func AutoAuth(config *DriverConfig,
 		}
 
 		// Do not save IDs if overriding and no approle file exists
-		if !override || exists {
+		if (!override || exists) && appRoleConfig != "deployauth" {
 
 			// Create hidden folder
 			if _, err := os.Stat(userHome + "/.tierceron"); os.IsNotExist(err) {