Remove unnecessary Unwrap implementations

cloudspannerecosystem · Apr 27, 2022 · 464537e · 464537e
1 parent 9e54ebd
commit 464537e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/jinzhu/inflection v1.0.0
 	github.com/kenshaw/snaker v0.1.6
 	github.com/spf13/cobra v1.2.1
-	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
+	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
 	golang.org/x/tools v0.1.8
 	google.golang.org/api v0.61.0
 	google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12

diff --git a/go.sum b/go.sum
@@ -474,6 +474,8 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7q
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw=
 golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
+golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/templates/yo_db.go.tpl b/templates/yo_db.go.tpl
@@ -53,7 +53,7 @@ func (e yoError) DBTableName() string {
 func (e yoError) GRPCStatus() *status.Status {
 	var ae *apierror.APIError
 	if errors.As(e.err, &ae) {
-		return status.Convert(ae.Unwrap())
+		return status.Convert(ae)
 	}
 
 	return status.New(e.code, e.Error())

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -703,7 +703,7 @@ func TestSessionNotFound(t *testing.T) {
 			t.Fatalf("the error returned by yo can be apierror.APIError: %T", err)
 		}
 
-		st := status.Convert(ae.Unwrap())
+		st := status.Convert(ae)
 		ri := extractResourceInfo(st)
 
 		expectedResourceInfo := &errdetails.ResourceInfo{

diff --git a/test/testmodels/customtypes/yo_db.yo.go b/test/testmodels/customtypes/yo_db.yo.go
diff --git a/test/testmodels/default/yo_db.yo.go b/test/testmodels/default/yo_db.yo.go
diff --git a/test/testmodels/single/single_file.go b/test/testmodels/single/single_file.go
diff --git a/tplbin/templates.go b/tplbin/templates.go
diff --git a/v2/module/builtin/templates/yo_db.go.tpl b/v2/module/builtin/templates/yo_db.go.tpl
@@ -48,7 +48,7 @@ func (e yoError) DBTableName() string {
 func (e yoError) GRPCStatus() *status.Status {
 	var ae *apierror.APIError
 	if errors.As(e.err, &ae) {
-		return status.Convert(ae.Unwrap())
+		return status.Convert(ae)
 	}
 
 	return status.New(e.code, e.Error())

diff --git a/v2/test/integration_test.go b/v2/test/integration_test.go
@@ -1153,7 +1153,7 @@ func TestSessionNotFound(t *testing.T) {
 			t.Fatalf("the error returned by yo can be apierror.APIError: %T", err)
 		}
 
-		st := status.Convert(ae.Unwrap())
+		st := status.Convert(ae)
 		ri := extractResourceInfo(st)
 
 		expectedResourceInfo := &errdetails.ResourceInfo{

diff --git a/v2/test/testmodels/default/yo_db.yo.go b/v2/test/testmodels/default/yo_db.yo.go
diff --git a/v2/test/testmodels/legacy_default/yo_db.yo.go b/v2/test/testmodels/legacy_default/yo_db.yo.go