Merge pull request #26 from duplocloud/DUPLO-13650-remove-nil-from-va…

…lid-error-message

DUPLO-13650 Elide err when nil from fatal messages

CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2024-01-24
+
+### Fixed
+- Improved error message format when a tenant is missing or not allowed.
+- Prevented appending a nil error object to fatal error messages.

cmd/duplo-jit/main.go

@@ -224,7 +224,7 @@ func GetTenantIdAndName(tenantIDorName string, client *duplocloud.Client) (strin
 		tenantName = tenantIDorName
 		tenant, err := client.GetTenantByNameForUser(tenantName)
 		if tenant == nil || err != nil {
-			internal.Fatal(fmt.Sprintf("%s: tenant missing or not allowed", tenantName), err)
+			internal.Fatal(fmt.Sprintf("tenant '%s' missing or not allowed", tenantName), err)
 		} else {
 			tenantID = tenant.TenantID
 		}
@@ -234,7 +234,7 @@ func GetTenantIdAndName(tenantIDorName string, client *duplocloud.Client) (strin
 		tenantID = tenantIDorName
 		tenant, err := client.GetTenantForUser(tenantIDorName)
 		if tenant == nil || err != nil {
-			internal.Fatal(fmt.Sprintf("%s: tenant missing or not allowed", tenantID), err)
+			internal.Fatal(fmt.Sprintf("tenant '%s' missing or not allowed", tenantID), err)
 		} else {
 			tenantName = tenant.AccountName
 		}

internal/util.go

@@ -12,5 +12,8 @@ func DieIf(err error, msg string) {
 }
 
 func Fatal(msg string, err error) {
-	log.Fatalf("%s: %s: %s", os.Args[0], msg, err)
+	if err != nil {
+		log.Fatalf("%s: %s: %s", os.Args[0], msg, err)
+	}
+	log.Fatalf("%s: %s", os.Args[0], msg)
 }