chore: stop using goerrors as alias or std errors

Signed-off-by: STRRL <[email protected]>

Author: STRRL

pkg/webhook/admission/validator.go

@@ -18,7 +18,7 @@ package admission
 
 import (
 	"context"
-	goerrors "errors"
+	"errors"
 	"net/http"
 
 	v1 "k8s.io/api/admission/v1"
@@ -66,7 +66,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
 		err = obj.ValidateCreate()
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error())
@@ -88,7 +88,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
 		err = obj.ValidateUpdate(oldObj)
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error())
@@ -106,7 +106,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
 		err = obj.ValidateDelete()
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error())

pkg/webhook/admission/validator_test.go

@@ -18,7 +18,7 @@ package admission
 
 import (
 	"context"
-	goerrors "errors"
+	"errors"
 	"net/http"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -168,7 +168,7 @@ var _ = Describe("validatingHandler", func() {
 	})
 	Context("when dealing with non-status errors", func() {
 
-		expectedError := goerrors.New("some error")
+		expectedError := errors.New("some error")
 		f := &admissiontest.FakeValidator{ErrorToReturn: expectedError, GVKToReturn: fakeValidatorVK}
 		handler := validatingHandler{validator: f, decoder: decoder}
 

pkg/webhook/admission/validator_warn.go

@@ -18,7 +18,7 @@ package admission
 
 import (
 	"context"
-	goerrors "errors"
+	"errors"
 	"net/http"
 
 	v1 "k8s.io/api/admission/v1"
@@ -75,7 +75,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
 		allWarnings = append(allWarnings, warnings...)
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error()).WithWarnings(allWarnings...)
@@ -97,7 +97,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
 		allWarnings = append(allWarnings, warnings...)
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error()).WithWarnings(allWarnings...)
@@ -116,7 +116,7 @@ func (h *validatingWarnHandler) Handle(ctx context.Context, req Request) Respons
 		allWarnings = append(allWarnings, warnings...)
 		if err != nil {
 			var apiStatus apierrors.APIStatus
-			if goerrors.As(err, &apiStatus) {
+			if errors.As(err, &apiStatus) {
 				return validationResponseFromStatus(false, apiStatus.Status())
 			}
 			return Denied(err.Error()).WithWarnings(allWarnings...)

pkg/webhook/admission/validator_warn_test.go

@@ -2,7 +2,7 @@ package admission
 
 import (
 	"context"
-	goerrors "errors"
+	"errors"
 	"net/http"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -215,7 +215,7 @@ var _ = Describe("validatingWarnHandler", func() {
 
 	Context("when dealing with non-status errors, without warning messages", func() {
 
-		expectedError := goerrors.New("some error")
+		expectedError := errors.New("some error")
 		f := &admissiontest.FakeValidatorWarn{ErrorToReturn: expectedError, GVKToReturn: fakeValidatorVK}
 		handler := validatingWarnHandler{validatorWarn: f, decoder: decoder}
 
@@ -275,7 +275,7 @@ var _ = Describe("validatingWarnHandler", func() {
 
 	Context("when dealing with non-status errors, with warning messages", func() {
 
-		expectedError := goerrors.New("some error")
+		expectedError := errors.New("some error")
 		f := &admissiontest.FakeValidatorWarn{ErrorToReturn: expectedError, GVKToReturn: fakeValidatorVK, WarningsToReturn: []string{warningMessage, anotherWarningMessage}}
 		handler := validatingWarnHandler{validatorWarn: f, decoder: decoder}