Upgrade golang.org/x/xerrors

abicky · Oct 28, 2024 · 9a92aaf · 9a92aaf
1 parent 94ed157
commit 9a92aaf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -41,7 +42,7 @@ func newRuntimeError(format string, a ...any) error {
 func Execute() int {
 	if cmd, err := rootCmd.ExecuteC(); err != nil {
 		var rerr *runtimeError
-		if xerrors.As(err, &rerr) {
+		if errors.As(err, &rerr) {
 			rootCmd.Println("Error:", err)
 			return 1
 		}

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2
 	github.com/spf13/cobra v1.8.1
 	go.uber.org/mock v0.5.0
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -58,8 +58,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
 go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

diff --git a/internal/service/service.go b/internal/service/service.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"errors"
 	"log"
 	"slices"
 	"time"
@@ -180,7 +181,7 @@ func retryOnServiceCreationTempErr(fn func() error, tries int) error {
 		}
 
 		var e *ecstypes.InvalidParameterException
-		if !xerrors.As(err, &e) || e.ErrorMessage() != "Unable to Start a service that is still Draining." {
+		if !errors.As(err, &e) || e.ErrorMessage() != "Unable to Start a service that is still Draining." {
 			break
 		}