refactor(alpine): remove manual [ERROR]/[WARN]/[HINT] prefixes, use log library levels

naveenku-jfrog · cursoragent · naveenku-jfrog · commit b09d39cef5f9 · 2026-06-21T20:01:31.000+05:30
Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/artifactory/commands/alpine/apkcommand.go b/artifactory/commands/alpine/apkcommand.go
@@ -11,6 +11,7 @@ import (
 	buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/gofrog/io"
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
@@ -98,7 +99,7 @@ func (apkCmd *ApkCommand) ServerDetails() (*config.ServerDetails, error) {
 func (apkCmd *ApkCommand) Run() error {
 	apkPath, err := exec.LookPath("apk")
 	if err != nil {
-		return fmt.Errorf("[ERROR] 'apk' binary not found. Is this an Alpine Linux environment?")
+		return errorutils.CheckErrorf("'apk' binary not found. Is this an Alpine Linux environment?")
 	}
 
 	needsAuth := buildInfoSubcmds[apkCmd.commandName] || authOnlySubcmds[apkCmd.commandName]
@@ -113,7 +114,7 @@ func (apkCmd *ApkCommand) Run() error {
 	if needsBuildInfo {
 		preSnapshot, err = biUtils.ListInstalledPackages()
 		if err != nil {
-			log.Warn("[WARN] Cannot list installed packages — Build Info not captured:", err)
+			log.Warn("Cannot list installed packages — Build Info not captured:", err)
 			needsBuildInfo = false
 		}
 	}
@@ -127,7 +128,7 @@ func (apkCmd *ApkCommand) Run() error {
 	if needsBuildInfo {
 		cacheDir, err = io.CreateTempDir()
 		if err != nil {
-			log.Warn("[WARN] Could not create temp cache dir — checksums may be incomplete:", err)
+			log.Warn("Could not create temp cache dir — checksums may be incomplete:", err)
 		} else {
 			defer func() { _ = os.RemoveAll(cacheDir) }()
 		}
@@ -161,16 +162,15 @@ func (apkCmd *ApkCommand) buildSubprocessEnv(injectAuth bool) ([]string, error)
 
 	if apkCmd.serverDetails == nil {
 		if apkCmd.username != "" || apkCmd.password != "" {
-			log.Warn("[WARN] --user/--password provided but no server URL is known. " +
-				"Use --server-id to select a configured server so HTTP_AUTH can be injected.")
+			log.Warn("--user/--password provided but no server URL is known. Use --server-id to select a configured server so HTTP_AUTH can be injected.")
 		} else {
-			log.Warn("[WARN] No JFrog server configured — skipping HTTP_AUTH injection. Run: jf c add")
+			log.Warn("No JFrog server configured — skipping HTTP_AUTH injection. Run: jf c add")
 		}
 		return env, nil
 	}
 
-	creds := resolveHTTPAuthCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
-	httpAuth, err := buildHTTPAuth(apkCmd.serverDetails.GetArtifactoryUrl(), creds)
+	username, password := resolveHTTPAuthCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
+	httpAuth, err := buildHTTPAuth(apkCmd.serverDetails.GetArtifactoryUrl(), username, password)
 	if err != nil {
 		return nil, err
 	}
@@ -181,13 +181,13 @@ func (apkCmd *ApkCommand) buildSubprocessEnv(injectAuth bool) ([]string, error)
 }
 
 // buildHTTPAuth constructs the HTTP_AUTH=basic:<host>:<user>:<password> string for apk-tools.
-func buildHTTPAuth(rtURL string, creds resolvedCredentials) (string, error) {
+func buildHTTPAuth(rtURL, username, password string) (string, error) {
 	parsed, err := url.Parse(rtURL)
 	if err != nil {
-		return "", fmt.Errorf("invalid Artifactory URL %q: %w", rtURL, err)
+		return "", errorutils.CheckErrorf("invalid Artifactory URL %q: %w", rtURL, err)
 	}
 	host := parsed.Hostname()
-	return fmt.Sprintf("basic:%s:%s:%s", host, creds.Username, creds.Password), nil
+	return fmt.Sprintf("basic:%s:%s:%s", host, username, password), nil
 }
 
 // runNativeApk spawns the native apk binary, streaming stdout/stderr in real time.
@@ -218,7 +218,7 @@ func emitSignatureHint(exitErr *exec.ExitError) {
 	}
 	for _, pattern := range sigPatterns {
 		if strings.Contains(stderr, pattern) {
-			log.Warn("[HINT] Signature verification failed. Fix: jf apk config --server-id <id> --repo <repo> --apply")
+			log.Warn("Signature verification failed. Fix: jf apk config --server-id <id> --repo <repo> --apply")
 			return
 		}
 	}
@@ -239,7 +239,7 @@ func (apkCmd *ApkCommand) collectBuildInfo(preSnapshot []biUtils.AlpinePackage,
 
 	buildObj, err := buildUtils.PrepareBuildPrerequisites(apkCmd.buildConfiguration)
 	if err != nil {
-		log.Warn("[WARN] Build Info publish failed:", err)
+		log.Warn("Build Info publish failed:", err)
 		return nil
 	}
 
@@ -252,7 +252,7 @@ func (apkCmd *ApkCommand) collectBuildInfo(preSnapshot []biUtils.AlpinePackage,
 	alpineModule.SetCacheDir(cacheDir)
 
 	if err := alpineModule.CollectBuildInfo(); err != nil {
-		log.Warn("[WARN] Build Info publish failed:", err)
+		log.Warn("Build Info collection failed:", err)
 	}
 	return nil
 }
diff --git a/artifactory/commands/alpine/apkconfig.go b/artifactory/commands/alpine/apkconfig.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
@@ -92,12 +93,12 @@ func (apkCmd *ApkConfigCommand) Run() error {
 		apkCmd.branch = "main"
 	}
 
-	creds := resolveCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
+	username, password := resolveCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
 
 	rtURL := strings.TrimRight(apkCmd.serverDetails.GetArtifactoryUrl(), "/")
 	keyEndpoint := fmt.Sprintf("%s/api/security/keypair/public/repositories/%s", rtURL, apkCmd.repoKey)
 
-	pemKey, err := downloadRSAKey(keyEndpoint, creds)
+	pemKey, err := downloadRSAKey(keyEndpoint, username, password)
 	if err != nil {
 		return err
 	}
@@ -113,43 +114,43 @@ func (apkCmd *ApkConfigCommand) Run() error {
 }
 
 // downloadRSAKey fetches the RSA public key from the Artifactory keypair API.
-func downloadRSAKey(endpoint string, creds resolvedCredentials) (string, error) {
-	if creds.Username == "" && creds.Password == "" {
-		return "", fmt.Errorf("[ERROR] No credentials found for this server. Run: jf c add")
+func downloadRSAKey(endpoint, username, password string) (string, error) {
+	if username == "" && password == "" {
+		return "", errorutils.CheckErrorf("no credentials found for this server. Run: jf c add")
 	}
 
 	req, err := http.NewRequest(http.MethodGet, endpoint, nil)
 	if err != nil {
-		return "", fmt.Errorf("failed to build RSA key request: %w", err)
+		return "", errorutils.CheckErrorf("failed to build RSA key request: %w", err)
 	}
-	req.SetBasicAuth(creds.Username, creds.Password)
+	req.SetBasicAuth(username, password)
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return "", fmt.Errorf("failed to download RSA key from Artifactory: %w", err)
+		return "", errorutils.CheckErrorf("failed to download RSA key from Artifactory: %w", err)
 	}
 	defer resp.Body.Close()
 
 	switch resp.StatusCode {
 	case http.StatusOK:
 	case http.StatusNotFound:
-		return "", fmt.Errorf("[WARN] No RSA key configured for %q. Use --allow-untrusted or configure a signing key in Artifactory", endpoint)
+		return "", errorutils.CheckErrorf("no RSA key configured for %q. Use --allow-untrusted or configure a signing key in Artifactory", endpoint)
 	case http.StatusUnauthorized:
-		return "", fmt.Errorf("[ERROR] Access token expired or invalid. Run: jf c add")
+		return "", errorutils.CheckErrorf("access token expired or invalid. Run: jf c add")
 	case http.StatusForbidden:
-		return "", fmt.Errorf("[ERROR] Access token lacks read permission on the repository")
+		return "", errorutils.CheckErrorf("access token lacks read permission on the repository")
 	default:
-		return "", fmt.Errorf("unexpected HTTP %d from Artifactory RSA key endpoint", resp.StatusCode)
+		return "", errorutils.CheckErrorf("unexpected HTTP %d from Artifactory RSA key endpoint", resp.StatusCode)
 	}
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return "", fmt.Errorf("failed to read RSA key response body: %w", err)
+		return "", errorutils.CheckErrorf("failed to read RSA key response body: %w", err)
 	}
 
 	pem := string(body)
 	if !strings.Contains(pem, "BEGIN PUBLIC KEY") {
-		return "", fmt.Errorf("Artifactory returned an unexpected response for the RSA key endpoint (does the repo have a signing keypair configured?)")
+		return "", errorutils.CheckErrorf("Artifactory returned an unexpected response for the RSA key endpoint (does the repo have a signing keypair configured?)")
 	}
 	return pem, nil
 }
@@ -171,16 +172,16 @@ func (apkCmd *ApkConfigCommand) printSetupScript(pemKey, keyFilePath, repoURL st
 // applyConfig writes the RSA key to disk and appends the repo URL to /etc/apk/repositories.
 func (apkCmd *ApkConfigCommand) applyConfig(pemKey, keyFilePath, repoURL string) error {
 	if err := os.MkdirAll(apkKeysDir, 0755); err != nil {
-		return fmt.Errorf("failed to create %s: %w", apkKeysDir, err)
+		return errorutils.CheckErrorf("failed to create %s: %w", apkKeysDir, err)
 	}
 	if err := os.WriteFile(keyFilePath, []byte(pemKey), 0644); err != nil {
-		return fmt.Errorf("failed to write RSA key to %s: %w", keyFilePath, err)
+		return errorutils.CheckErrorf("failed to write RSA key to %s: %w", keyFilePath, err)
 	}
 	log.Info("RSA key written to", keyFilePath)
 
 	existing, err := os.ReadFile(apkRepositoriesFile)
 	if err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("failed to read %s: %w", apkRepositoriesFile, err)
+		return errorutils.CheckErrorf("failed to read %s: %w", apkRepositoriesFile, err)
 	}
 	for _, line := range strings.Split(string(existing), "\n") {
 		if strings.TrimSpace(line) == repoURL {
@@ -191,12 +192,12 @@ func (apkCmd *ApkConfigCommand) applyConfig(pemKey, keyFilePath, repoURL string)
 
 	f, err := os.OpenFile(apkRepositoriesFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
-		return fmt.Errorf("failed to open %s for writing: %w", apkRepositoriesFile, err)
+		return errorutils.CheckErrorf("failed to open %s for writing: %w", apkRepositoriesFile, err)
 	}
 	defer f.Close()
 
 	if _, err := fmt.Fprintln(f, repoURL); err != nil {
-		return fmt.Errorf("failed to write repo URL to %s: %w", apkRepositoriesFile, err)
+		return errorutils.CheckErrorf("failed to write repo URL to %s: %w", apkRepositoriesFile, err)
 	}
 	log.Info("Repository URL added to", apkRepositoriesFile)
 	return nil
diff --git a/artifactory/commands/alpine/apkupload.go b/artifactory/commands/alpine/apkupload.go
@@ -15,6 +15,7 @@ import (
 	"github.com/jfrog/gofrog/crypto"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	specutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
@@ -112,24 +113,24 @@ func (apkCmd *ApkUploadCommand) Run() error {
 
 	fileDetails, err := crypto.GetFileDetails(apkCmd.filePath, true)
 	if err != nil {
-		return fmt.Errorf("failed to compute checksums for %s: %w", apkCmd.filePath, err)
+		return errorutils.CheckErrorf("failed to compute checksums for %s: %w", apkCmd.filePath, err)
 	}
 
-	creds := resolveCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
+	username, password := resolveCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)
 
 	rtURL := apkCmd.serverDetails.GetArtifactoryUrl()
 	target := fmt.Sprintf("%s/%s/%s/%s/%s", apkCmd.repoKey, apkCmd.alpineVersion, apkCmd.branch, arch, filename)
 	uploadURL := rtURL + target
 
 	log.Info(fmt.Sprintf("Uploading %s → %s", filename, target))
 
-	if err := apkCmd.uploadFile(uploadURL, creds, fileDetails); err != nil {
+	if err := apkCmd.uploadFile(uploadURL, username, password, fileDetails); err != nil {
 		return err
 	}
 	log.Info("Upload successful.")
 
 	if err := apkCmd.setProperties(target, pkgName, pkgVersion, arch); err != nil {
-		log.Warn("[WARN] Failed to set artifact properties:", err)
+		log.Warn("Failed to set artifact properties:", err)
 	}
 
 	collectBuildInfo, err := apkCmd.buildConfiguration.IsCollectBuildInfo()
@@ -138,57 +139,57 @@ func (apkCmd *ApkUploadCommand) Run() error {
 	}
 	if collectBuildInfo {
 		if err := apkCmd.recordBuildInfoArtifact(filename, pkgName, pkgVersion, arch, fileDetails.Checksum); err != nil {
-			log.Warn("[WARN] Build Info artifact recording failed:", err)
+			log.Warn("Build Info artifact recording failed:", err)
 		}
 	}
 	return nil
 }
 
 // uploadFile PUTs the .apk file to Artifactory with checksum headers.
-func (apkCmd *ApkUploadCommand) uploadFile(uploadURL string, creds resolvedCredentials, fileDetails *crypto.FileDetails) error {
+func (apkCmd *ApkUploadCommand) uploadFile(uploadURL, username, password string, fileDetails *crypto.FileDetails) error {
 	f, err := os.Open(apkCmd.filePath)
 	if err != nil {
-		return fmt.Errorf("failed to open %s: %w", apkCmd.filePath, err)
+		return errorutils.CheckErrorf("failed to open %s: %w", apkCmd.filePath, err)
 	}
 	defer f.Close()
 
 	req, err := http.NewRequest(http.MethodPut, uploadURL, f)
 	if err != nil {
-		return fmt.Errorf("failed to build upload request: %w", err)
+		return errorutils.CheckErrorf("failed to build upload request: %w", err)
 	}
 	req.ContentLength = fileDetails.Size
-	req.SetBasicAuth(creds.Username, creds.Password)
+	req.SetBasicAuth(username, password)
 	req.Header.Set("X-Checksum-Sha1", fileDetails.Checksum.Sha1)
 	req.Header.Set("X-Checksum-Md5", fileDetails.Checksum.Md5)
 	req.Header.Set("X-Checksum", fileDetails.Checksum.Sha256)
 	req.Header.Set("Content-Type", "application/octet-stream")
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("upload request failed: %w", err)
+		return errorutils.CheckErrorf("upload request failed: %w", err)
 	}
 	defer func() { _ = resp.Body.Close() }()
 
 	switch resp.StatusCode {
 	case http.StatusCreated, http.StatusOK:
 		return nil
 	case http.StatusUnauthorized:
-		return fmt.Errorf("[ERROR] Access token expired or invalid. Run: jf c add")
+		return errorutils.CheckErrorf("access token expired or invalid. Run: jf c add")
 	case http.StatusForbidden:
-		return fmt.Errorf("[ERROR] Insufficient permissions to deploy to repository %q", apkCmd.repoKey)
+		return errorutils.CheckErrorf("insufficient permissions to deploy to repository %q", apkCmd.repoKey)
 	case http.StatusConflict:
-		return fmt.Errorf("[ERROR] Artifact already exists at the target path (repo policy blocks overwrite)")
+		return errorutils.CheckErrorf("artifact already exists at the target path (repo policy blocks overwrite)")
 	default:
 		body, _ := io.ReadAll(resp.Body)
-		return fmt.Errorf("upload failed with HTTP %d: %s", resp.StatusCode, string(body))
+		return errorutils.CheckErrorf("upload failed with HTTP %d: %s", resp.StatusCode, string(body))
 	}
 }
 
 // setProperties sets Alpine package properties on the uploaded artifact via a single SetProps call.
 func (apkCmd *ApkUploadCommand) setProperties(target, pkgName, pkgVersion, arch string) error {
 	servicesManager, err := artutils.CreateServiceManager(apkCmd.serverDetails, -1, 0, false)
 	if err != nil {
-		return fmt.Errorf("failed to create Artifactory service manager: %w", err)
+		return errorutils.CheckErrorf("failed to create Artifactory service manager: %w", err)
 	}
 
 	propsStr := fmt.Sprintf("os.name=alpine;os.version=%s;os.arch=%s;apk.name=%s;apk.version=%s",
@@ -202,7 +203,7 @@ func (apkCmd *ApkUploadCommand) setProperties(target, pkgName, pkgVersion, arch
 		CommonParams: &specutils.CommonParams{Pattern: target},
 	})
 	if err != nil {
-		return fmt.Errorf("failed to search for uploaded artifact: %w", err)
+		return errorutils.CheckErrorf("failed to search for uploaded artifact: %w", err)
 	}
 
 	_, err = servicesManager.SetProps(services.PropsParams{
@@ -261,7 +262,7 @@ func (apkCmd *ApkUploadCommand) recordBuildInfoArtifact(filename, pkgName, pkgVe
 func parseApkFilename(filename string) (name, version, arch string, err error) {
 	m := apkFilenamePattern.FindStringSubmatch(filename)
 	if m == nil {
-		return "", "", "", fmt.Errorf("cannot parse Alpine package filename %q — expected <name>-<ver>-<rel>.<arch>.apk", filename)
+		return "", "", "", errorutils.CheckErrorf("cannot parse Alpine package filename %q — expected <name>-<ver>-<rel>.<arch>.apk", filename)
 	}
 	return m[1], m[2], m[3], nil
 }
diff --git a/artifactory/commands/alpine/credentials.go b/artifactory/commands/alpine/credentials.go

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build"`
`12`	`12`	`"github.com/jfrog/jfrog-cli-core/v2/utils/config"`
`13`	`13`	`"github.com/jfrog/gofrog/io"`
	`14`	`+ "github.com/jfrog/jfrog-client-go/utils/errorutils"`
`14`	`15`	`"github.com/jfrog/jfrog-client-go/utils/log"`
`15`	`16`	`)`
`16`	`17`
`@@ -98,7 +99,7 @@ func (apkCmd ApkCommand) ServerDetails() (config.ServerDetails, error) {`
`98`	`99`	`func (apkCmd *ApkCommand) Run() error {`
`99`	`100`	`apkPath, err := exec.LookPath("apk")`
`100`	`101`	`if err != nil {`
`101`		`- return fmt.Errorf("[ERROR] 'apk' binary not found. Is this an Alpine Linux environment?")`
	`102`	`+ return errorutils.CheckErrorf("'apk' binary not found. Is this an Alpine Linux environment?")`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`needsAuth := buildInfoSubcmds[apkCmd.commandName] \|\| authOnlySubcmds[apkCmd.commandName]`
`@@ -113,7 +114,7 @@ func (apkCmd *ApkCommand) Run() error {`
`113`	`114`	`if needsBuildInfo {`
`114`	`115`	`preSnapshot, err = biUtils.ListInstalledPackages()`
`115`	`116`	`if err != nil {`
`116`		`- log.Warn("[WARN] Cannot list installed packages — Build Info not captured:", err)`
	`117`	`+ log.Warn("Cannot list installed packages — Build Info not captured:", err)`
`117`	`118`	`needsBuildInfo = false`
`118`	`119`	`}`
`119`	`120`	`}`
`@@ -127,7 +128,7 @@ func (apkCmd *ApkCommand) Run() error {`
`127`	`128`	`if needsBuildInfo {`
`128`	`129`	`cacheDir, err = io.CreateTempDir()`
`129`	`130`	`if err != nil {`
`130`		`- log.Warn("[WARN] Could not create temp cache dir — checksums may be incomplete:", err)`
	`131`	`+ log.Warn("Could not create temp cache dir — checksums may be incomplete:", err)`
`131`	`132`	`} else {`
`132`	`133`	`defer func() { _ = os.RemoveAll(cacheDir) }()`
`133`	`134`	`}`
`@@ -161,16 +162,15 @@ func (apkCmd *ApkCommand) buildSubprocessEnv(injectAuth bool) ([]string, error)`
`161`	`162`
`162`	`163`	`if apkCmd.serverDetails == nil {`
`163`	`164`	`if apkCmd.username != "" \|\| apkCmd.password != "" {`
`164`		`- log.Warn("[WARN] --user/--password provided but no server URL is known. " +`
`165`		`- "Use --server-id to select a configured server so HTTP_AUTH can be injected.")`
	`165`	`+ log.Warn("--user/--password provided but no server URL is known. Use --server-id to select a configured server so HTTP_AUTH can be injected.")`
`166`	`166`	`} else {`
`167`		`- log.Warn("[WARN] No JFrog server configured — skipping HTTP_AUTH injection. Run: jf c add")`
	`167`	`+ log.Warn("No JFrog server configured — skipping HTTP_AUTH injection. Run: jf c add")`
`168`	`168`	`}`
`169`	`169`	`return env, nil`
`170`	`170`	`}`
`171`	`171`
`172`		`- creds := resolveHTTPAuthCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)`
`173`		`- httpAuth, err := buildHTTPAuth(apkCmd.serverDetails.GetArtifactoryUrl(), creds)`
	`172`	`+ username, password := resolveHTTPAuthCredentials(apkCmd.serverDetails, apkCmd.username, apkCmd.password)`
	`173`	`+ httpAuth, err := buildHTTPAuth(apkCmd.serverDetails.GetArtifactoryUrl(), username, password)`
`174`	`174`	`if err != nil {`
`175`	`175`	`return nil, err`
`176`	`176`	`}`
`@@ -181,13 +181,13 @@ func (apkCmd *ApkCommand) buildSubprocessEnv(injectAuth bool) ([]string, error)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`// buildHTTPAuth constructs the HTTP_AUTH=basic:<host>:<user>:<password> string for apk-tools.`
`184`		`-func buildHTTPAuth(rtURL string, creds resolvedCredentials) (string, error) {`
	`184`	`+func buildHTTPAuth(rtURL, username, password string) (string, error) {`
`185`	`185`	`parsed, err := url.Parse(rtURL)`
`186`	`186`	`if err != nil {`
`187`		`- return "", fmt.Errorf("invalid Artifactory URL %q: %w", rtURL, err)`
	`187`	`+ return "", errorutils.CheckErrorf("invalid Artifactory URL %q: %w", rtURL, err)`
`188`	`188`	`}`
`189`	`189`	`host := parsed.Hostname()`
`190`		`- return fmt.Sprintf("basic:%s:%s:%s", host, creds.Username, creds.Password), nil`
	`190`	`+ return fmt.Sprintf("basic:%s:%s:%s", host, username, password), nil`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`// runNativeApk spawns the native apk binary, streaming stdout/stderr in real time.`
`@@ -218,7 +218,7 @@ func emitSignatureHint(exitErr *exec.ExitError) {`
`218`	`218`	`}`
`219`	`219`	`for _, pattern := range sigPatterns {`
`220`	`220`	`if strings.Contains(stderr, pattern) {`
`221`		`- log.Warn("[HINT] Signature verification failed. Fix: jf apk config --server-id <id> --repo <repo> --apply")`
	`221`	`+ log.Warn("Signature verification failed. Fix: jf apk config --server-id <id> --repo <repo> --apply")`
`222`	`222`	`return`
`223`	`223`	`}`
`224`	`224`	`}`
`@@ -239,7 +239,7 @@ func (apkCmd *ApkCommand) collectBuildInfo(preSnapshot []biUtils.AlpinePackage,`
`239`	`239`
`240`	`240`	`buildObj, err := buildUtils.PrepareBuildPrerequisites(apkCmd.buildConfiguration)`
`241`	`241`	`if err != nil {`
`242`		`- log.Warn("[WARN] Build Info publish failed:", err)`
	`242`	`+ log.Warn("Build Info publish failed:", err)`
`243`	`243`	`return nil`
`244`	`244`	`}`
`245`	`245`
`@@ -252,7 +252,7 @@ func (apkCmd *ApkCommand) collectBuildInfo(preSnapshot []biUtils.AlpinePackage,`
`252`	`252`	`alpineModule.SetCacheDir(cacheDir)`
`253`	`253`
`254`	`254`	`if err := alpineModule.CollectBuildInfo(); err != nil {`
`255`		`- log.Warn("[WARN] Build Info publish failed:", err)`
	`255`	`+ log.Warn("Build Info collection failed:", err)`
`256`	`256`	`}`
`257`	`257`	`return nil`
`258`	`258`	`}`