refactor: as-error-http (idiomatic)

alex-aizman · alex-aizman · commit 92dbe79ff899 · 2025-11-03T10:45:00.000-05:00
Signed-off-by: Alex Aizman &lt;alex.aizman@gmail.com&gt;
diff --git a/ais/backend/ais.go b/ais/backend/ais.go
@@ -98,7 +98,7 @@ func extractErrCode(e error, uuid string) (int, error) {
 	if cos.IsClientTimeout(e) {
 		return http.StatusRequestTimeout, e
 	}
-	herr := cmn.UnwrapErrHTTP(e)
+	herr := cmn.AsErrHTTP(e)
 	if herr == nil {
 		return http.StatusInternalServerError, e
 	}
diff --git a/ais/htcommon.go b/ais/htcommon.go
@@ -427,7 +427,7 @@ func (res *callResult) toErr() error {
 		return nil
 	}
 	// is cmn.ErrHTTP
-	if herr := cmn.UnwrapErrHTTP(res.err); herr != nil {
+	if herr := cmn.AsErrHTTP(res.err); herr != nil {
 		// add status, details
 		if res.status >= http.StatusBadRequest {
 			herr.Status = res.status
@@ -467,7 +467,7 @@ func (res *callResult) errorf(format string, a ...any) error {
 	debug.Assert(res.err != nil)
 	// add formatted
 	msg := fmt.Sprintf(format, a...)
-	if herr := cmn.UnwrapErrHTTP(res.err); herr != nil {
+	if herr := cmn.AsErrHTTP(res.err); herr != nil {
 		herr.Message = msg + ": " + herr.Message
 		res.err = herr
 	} else {
diff --git a/ais/test/bucket_test.go b/ais/test/bucket_test.go
@@ -342,7 +342,7 @@ func TestCreateRemoteBucket(t *testing.T) {
 		if err == nil {
 			continue
 		}
-		herr := cmn.UnwrapErrHTTP(err)
+		herr := cmn.AsErrHTTP(err)
 		tassert.Fatalf(t, herr != nil, "expected ErrHTTP, got %v (bucket %q)", err, test.bck.String())
 		if test.exists {
 			tassert.Fatalf(t, strings.Contains(herr.Message, "already exists"),
@@ -894,7 +894,7 @@ func TestListObjectsStartAfter(t *testing.T) {
 				len(lst.Entries), m.num/2,
 			)
 		case err != nil:
-			herr := cmn.UnwrapErrHTTP(err)
+			herr := cmn.AsErrHTTP(err)
 			tlog.Logfln("Error is expected here, got %q", herr)
 		default:
 			tassert.Errorf(t, false, "expected an error, got nil")
diff --git a/ais/test/maintain_test.go b/ais/test/maintain_test.go
@@ -577,7 +577,7 @@ func testNodeShutdown(t *testing.T, nodeType string) {
 				tlog.Logfln("%v", status)
 				break
 			}
-			if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+			if herr := cmn.AsErrHTTP(err); herr != nil {
 				tassert.Errorf(t, herr.Status == http.StatusNotFound, "expecting not found, got %+v", herr)
 			}
 			time.Sleep(time.Second)
@@ -690,7 +690,7 @@ func TestShutdownListObjects(t *testing.T) {
 				tlog.Logfln("%v", status)
 				break
 			}
-			herr := cmn.UnwrapErrHTTP(err)
+			herr := cmn.AsErrHTTP(err)
 			tassert.Errorf(t, herr.Status == http.StatusNotFound, "expecting not found, got %+v", herr)
 			time.Sleep(time.Second)
 		}
diff --git a/ais/test/object_test.go b/ais/test/object_test.go
@@ -1621,7 +1621,7 @@ func TestChecksumValidateOnWarmGetForBucket(t *testing.T) {
 func executeTwoGETsForChecksumValidation(proxyURL string, bck cmn.Bck, objName string, isChunked bool, t *testing.T) {
 	baseParams := tools.BaseAPIParams(proxyURL)
 	_, err := api.GetObjectWithValidation(baseParams, bck, objName, nil)
-	herr := cmn.UnwrapErrHTTP(err)
+	herr := cmn.AsErrHTTP(err)
 	switch {
 	case herr == nil:
 		t.Error("Error is nil, expected internal server error on a GET for an object")
@@ -1633,7 +1633,7 @@ func executeTwoGETsForChecksumValidation(proxyURL string, bck cmn.Bck, objName s
 
 	// Execute another GET to make sure that the object is deleted
 	_, err = api.GetObjectWithValidation(baseParams, bck, objName, nil)
-	herr = cmn.UnwrapErrHTTP(err)
+	herr = cmn.AsErrHTTP(err)
 	switch {
 	case herr == nil:
 		t.Error("Error is nil, expected not found on a second GET for a corrupted object")
@@ -2202,7 +2202,7 @@ func TestMultipartMaxChunks(t *testing.T) {
 
 		// We expect an error because we're exceeding MaxChunkCount
 		tassert.Fatalf(t, err != nil, "expected error when exceeding MaxChunkCount, but upload succeeded")
-		herr := cmn.UnwrapErrHTTP(err)
+		herr := cmn.AsErrHTTP(err)
 		tassert.Fatalf(t, herr != nil, "expected ErrHTTP, got %v", err)
 		tassert.Fatalf(t, strings.Contains(herr.Message, "exceeds the maximum allowed"),
 			"expected error message to contain 'exceeds the maximum allowed', got: %v", err)
diff --git a/api/client.go b/api/client.go
@@ -77,7 +77,7 @@ func HTTPStatus(err error) int {
 	if err == nil {
 		return http.StatusOK
 	}
-	if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+	if herr := cmn.AsErrHTTP(err); herr != nil {
 		return herr.Status
 	}
 	return -1 // invalid
diff --git a/cmd/cli/cli/bucket.go b/cmd/cli/cli/bucket.go
@@ -24,7 +24,7 @@ import (
 // Creates new ais bucket
 func createBucket(c *cli.Context, bck cmn.Bck, props *cmn.BpropsToSet, dontHeadRemote bool) (err error) {
 	if err = api.CreateBucket(apiBP, bck, props, dontHeadRemote); err != nil {
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			if herr.Status == http.StatusConflict {
 				desc := fmt.Sprintf("Bucket %q already exists", bck.String())
 				if flagIsSet(c, ignoreErrorFlag) {
diff --git a/cmd/cli/cli/bucket_hdlr.go b/cmd/cli/cli/bucket_hdlr.go
@@ -566,7 +566,7 @@ func removeSpecificBuckets(c *cli.Context) error {
 		return nil
 	}
 
-	if herr := cmn.UnwrapErrHTTP(err); herr != nil && herr.TypeCode == "ErrUnsupp" {
+	if herr := cmn.AsErrHTTP(err); herr != nil && herr.TypeCode == "ErrUnsupp" {
 		return fmt.Errorf("%v\n(Tip: did you want to evict '%s' from aistore?)", err, bck.Cname(""))
 	}
 	return err
diff --git a/cmd/cli/cli/cpr.go b/cmd/cli/cli/cpr.go
@@ -157,7 +157,7 @@ func (cpr *cprCtx) do(c *cli.Context) {
 		)
 		xs, cms, err := queryXactions(&xargs, true /*summarize*/)
 		if err != nil {
-			if herr := cmn.UnwrapErrHTTP(err); herr != nil && herr.Status == http.StatusNotFound {
+			if herr := cmn.AsErrHTTP(err); herr != nil && herr.Status == http.StatusNotFound {
 				briefPause(refreshRateMinDur / time.Second)
 				continue
 			}
diff --git a/cmd/cli/cli/err.go b/cmd/cli/cli/err.go
@@ -126,7 +126,7 @@ func isUnreachableError(err error) (msg string, unreachable bool) {
 		return "", false
 	default:
 		msg = err.Error()
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			unreachable = cos.IsUnreachable(herr, herr.Status)
 		} else {
 			regx := regexp.MustCompile("dial.*(timeout|refused)")
@@ -358,7 +358,7 @@ func completionErr(c *cli.Context, err error) {
 
 func notV(err error) error {
 	if err != nil && !cliConfVerbose() {
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			return errors.New(herr.Message)
 		}
 	}
@@ -367,7 +367,7 @@ func notV(err error) error {
 
 func V(err error) error {
 	if err != nil && cliConfVerbose() {
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			herr.Message = herr.StringEx()
 			return herr
 		}
diff --git a/cmd/cli/cli/etl.go b/cmd/cli/cli/etl.go
@@ -939,7 +939,7 @@ func handleETLHTTPError(err error, etlName string) error {
 	if err == nil {
 		return nil
 	}
-	if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+	if herr := cmn.AsErrHTTP(err); herr != nil {
 		// TODO: How to find out if it's transformation not found, and not object not found?
 		if herr.Status == http.StatusNotFound && strings.Contains(herr.Error(), etlName) {
 			return fmt.Errorf("ETL[%s] not found; try starting new ETL with:\nais %s %s <spec>",
diff --git a/cmd/cli/cli/ls.go b/cmd/cli/cli/ls.go
@@ -535,7 +535,7 @@ func listObjects(c *cli.Context, bck cmn.Bck, prefix string, listArch, printEmpt
 }
 
 func lsoErr(msg *apc.LsoMsg, err error) error {
-	if herr := cmn.UnwrapErrHTTP(err); herr != nil && msg.IsFlagSet(apc.LsBckPresent) {
+	if herr := cmn.AsErrHTTP(err); herr != nil && msg.IsFlagSet(apc.LsBckPresent) {
 		if herr.TypeCode == "ErrRemoteBckNotFound" {
 			err = V(err)
 			return fmt.Errorf("%v\nTip: use %s to list all objects including remote", V(err), qflprn(allObjsOrBcksFlag))
diff --git a/cmd/cli/cli/stats.go b/cmd/cli/cli/stats.go
@@ -116,7 +116,7 @@ func _addStatus(node *meta.Snode, mu *sync.Mutex, out teb.StstMap) {
 	if err != nil {
 		ds = &stats.NodeStatus{}
 		ds.Snode = node
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			ds.Status = herr.TypeCode
 		} else if strings.HasPrefix(err.Error(), "errNodeNotFound") {
 			ds.Status = "[errNodeNotFound]"
diff --git a/cmd/cli/cli/storage_hdlr.go b/cmd/cli/cli/storage_hdlr.go
@@ -440,7 +440,7 @@ func summaryStorageHandler(c *cli.Context) error {
 
 	var status int
 	if err != nil {
-		if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		if herr := cmn.AsErrHTTP(err); herr != nil {
 			status = herr.Status
 		}
 		if dontWait && status == http.StatusAccepted {
diff --git a/cmd/cli/go.mod b/cmd/cli/go.mod
@@ -3,7 +3,7 @@ module github.com/NVIDIA/aistore/cmd/cli
 go 1.25
 
 require (
-	github.com/NVIDIA/aistore v1.4.1-0.20251024202506-aaa8f8953f96
+	github.com/NVIDIA/aistore v1.4.1-0.20251103150813-c24776bd0c0f
 	github.com/fatih/color v1.18.0
 	github.com/json-iterator/go v1.1.12
 	github.com/onsi/ginkgo/v2 v2.26.0
diff --git a/cmd/cli/go.sum b/cmd/cli/go.sum
@@ -1,8 +1,8 @@
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/NVIDIA/aistore v1.4.1-0.20251024202506-aaa8f8953f96 h1:glOli5bvdW2DUYQw85o+Vzm15pS5CbkzRjNFS2ZW8bA=
-github.com/NVIDIA/aistore v1.4.1-0.20251024202506-aaa8f8953f96/go.mod h1:+lmRm0p5uEVUZ5KCGwneVKIEu3LiBV7hzId6Rmc0F+M=
+github.com/NVIDIA/aistore v1.4.1-0.20251103150813-c24776bd0c0f h1:iOIIlciARfjdnKZ9izmRIGwEoE9oOIYX0ixs7IPeBjk=
+github.com/NVIDIA/aistore v1.4.1-0.20251103150813-c24776bd0c0f/go.mod h1:+lmRm0p5uEVUZ5KCGwneVKIEu3LiBV7hzId6Rmc0F+M=
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
diff --git a/cmn/cos/err.go b/cmn/cos/err.go
@@ -184,19 +184,7 @@ func (e *Errs) Unwrap() []error {
 // IS-syscall helpers
 //
 
-func UnwrapSyscallErr(err error) error {
-	if syscallErr, ok := err.(*os.SyscallError); ok {
-		return syscallErr.Unwrap()
-	}
-	return nil
-}
-
-func IsErrSyscallTimeout(err error) bool {
-	syscallErr, ok := err.(*os.SyscallError)
-	return ok && syscallErr.Timeout()
-}
-
-func IsPathErr(err error) (ok bool) {
+func IsPathErr(err error) bool {
 	var pathErr *iofs.PathError
 	return errors.As(err, &pathErr)
 }
@@ -326,7 +314,7 @@ func IsErrMv(err error) bool {
 
 // to satisfy errors.Is()
 func (e *ErrMv) Is(target error) bool {
-	return e.ty == 2 && target == syscall.ENOTDIR
+	return e.ty == 2 && errors.Is(target, syscall.ENOTDIR)
 }
 
 func (e *ErrMv) Error() string {
diff --git a/cmn/err.go b/cmn/err.go
@@ -1037,15 +1037,15 @@ func Str2HTTPErr(msg string) *ErrHTTP {
 	return nil
 }
 
-func UnwrapErrHTTP(err error) *ErrHTTP {
-	e, ok := err.(*ErrHTTP)
-	if !ok {
-		var e *ErrHTTP
-		if !errors.As(err, &e) {
-			return nil
-		}
+func AsErrHTTP(err error) *ErrHTTP {
+	if e, ok := err.(*ErrHTTP); ok {
+		return e
 	}
-	return e
+	var e *ErrHTTP
+	if errors.As(err, &e) {
+		return e
+	}
+	return nil
 }
 
 const maxTypeCodeLen = 30
diff --git a/ext/dload/task.go b/ext/dload/task.go
@@ -191,7 +191,7 @@ func (task *singleTask) downloadLocal(lom *core.LOM) (err error) {
 		if errors.Is(err, context.DeadlineExceeded) {
 			nlog.Warningf("%s [retries: %d/%d]: timeout (%v) - increasing and retrying", task, i, retryCnt, timeout)
 			timeout = time.Duration(float64(timeout) * reqTimeoutFactor)
-		} else if herr := cmn.UnwrapErrHTTP(err); herr != nil {
+		} else if herr := cmn.AsErrHTTP(err); herr != nil {
 			nlog.Warningf("%s [retries: %d/%d]: failed to perform request: %v (code: %d)", task, i, retryCnt, err, herr.Status)
 			if _, exists := terminalStatuses[herr.Status]; exists {
 				return err // nothing we can do
diff --git a/tools/client.go b/tools/client.go
@@ -240,7 +240,7 @@ func DestroyBucket(tb testing.TB, proxyURL string, bck cmn.Bck) {
 		if err == nil {
 			return
 		}
-		herr := cmn.UnwrapErrHTTP(err)
+		herr := cmn.AsErrHTTP(err)
 		if herr == nil || herr.Status != http.StatusNotFound {
 			tassert.CheckFatal(tb, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func extractErrCode(e error, uuid string) (int, error) {`
`98`	`98`	`if cos.IsClientTimeout(e) {`
`99`	`99`	`return http.StatusRequestTimeout, e`
`100`	`100`	`}`
`101`		`- herr := cmn.UnwrapErrHTTP(e)`
	`101`	`+ herr := cmn.AsErrHTTP(e)`
`102`	`102`	`if herr == nil {`
`103`	`103`	`return http.StatusInternalServerError, e`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ func testNodeShutdown(t *testing.T, nodeType string) {`
`577`	`577`	`tlog.Logfln("%v", status)`
`578`	`578`	`break`
`579`	`579`	`}`
`580`		`- if herr := cmn.UnwrapErrHTTP(err); herr != nil {`
	`580`	`+ if herr := cmn.AsErrHTTP(err); herr != nil {`
`581`	`581`	`tassert.Errorf(t, herr.Status == http.StatusNotFound, "expecting not found, got %+v", herr)`
`582`	`582`	`}`
`583`	`583`	`time.Sleep(time.Second)`
`@@ -690,7 +690,7 @@ func TestShutdownListObjects(t *testing.T) {`
`690`	`690`	`tlog.Logfln("%v", status)`
`691`	`691`	`break`
`692`	`692`	`}`
`693`		`- herr := cmn.UnwrapErrHTTP(err)`
	`693`	`+ herr := cmn.AsErrHTTP(err)`
`694`	`694`	`tassert.Errorf(t, herr.Status == http.StatusNotFound, "expecting not found, got %+v", herr)`
`695`	`695`	`time.Sleep(time.Second)`
`696`	`696`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func HTTPStatus(err error) int {`
`77`	`77`	`if err == nil {`
`78`	`78`	`return http.StatusOK`
`79`	`79`	`}`
`80`		`- if herr := cmn.UnwrapErrHTTP(err); herr != nil {`
	`80`	`+ if herr := cmn.AsErrHTTP(err); herr != nil {`
`81`	`81`	`return herr.Status`
`82`	`82`	`}`
`83`	`83`	`return -1 // invalid`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ func removeSpecificBuckets(c *cli.Context) error {`
`566`	`566`	`return nil`
`567`	`567`	`}`
`568`	`568`
`569`		`- if herr := cmn.UnwrapErrHTTP(err); herr != nil && herr.TypeCode == "ErrUnsupp" {`
	`569`	`+ if herr := cmn.AsErrHTTP(err); herr != nil && herr.TypeCode == "ErrUnsupp" {`
`570`	`570`	`return fmt.Errorf("%v\n(Tip: did you want to evict '%s' from aistore?)", err, bck.Cname(""))`
`571`	`571`	`}`
`572`	`572`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func (cpr cprCtx) do(c cli.Context) {`
`157`	`157`	`)`
`158`	`158`	`xs, cms, err := queryXactions(&xargs, true /summarize/)`
`159`	`159`	`if err != nil {`
`160`		`- if herr := cmn.UnwrapErrHTTP(err); herr != nil && herr.Status == http.StatusNotFound {`
	`160`	`+ if herr := cmn.AsErrHTTP(err); herr != nil && herr.Status == http.StatusNotFound {`
`161`	`161`	`briefPause(refreshRateMinDur / time.Second)`
`162`	`162`	`continue`
`163`	`163`	`}`