diff --git a/go.mod b/go.mod index c7ba787a..00479f2a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.6 require ( github.com/BurntSushi/toml v1.5.0 github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 - github.com/cloudbase/garm-provider-common v0.1.6 + github.com/cloudbase/garm-provider-common v0.1.7 github.com/felixge/httpsnoop v1.0.4 github.com/go-openapi/errors v0.22.1 github.com/go-openapi/runtime v0.28.0 diff --git a/go.sum b/go.sum index 863e7b1a..5d9411e9 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= -github.com/cloudbase/garm-provider-common v0.1.6 h1:wLqolRkUD2Z4rzuBLDs2exL1Aq+eJ5RBVnRvk5JP6fs= -github.com/cloudbase/garm-provider-common v0.1.6/go.mod h1:2O51WbcfqRx5fDHyyJgIFq7KdTZZnefsM+aoOchyleU= +github.com/cloudbase/garm-provider-common v0.1.7 h1:V0upTejFRDiyFBO4hhkMWmPtmRTguyOt/4i1u9/rfbg= +github.com/cloudbase/garm-provider-common v0.1.7/go.mod h1:2O51WbcfqRx5fDHyyJgIFq7KdTZZnefsM+aoOchyleU= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/cloudbase/garm-provider-common/errors/errors.go b/vendor/github.com/cloudbase/garm-provider-common/errors/errors.go index 9f98c33a..76e85d9c 100644 --- a/vendor/github.com/cloudbase/garm-provider-common/errors/errors.go +++ b/vendor/github.com/cloudbase/garm-provider-common/errors/errors.go @@ -29,9 +29,9 @@ var ( // ErrBadRequest is returned is a malformed request is sent ErrBadRequest = NewBadRequestError("invalid request") // ErrTimeout is returned when a timeout occurs. - ErrTimeout = fmt.Errorf("timed out") - ErrUnprocessable = fmt.Errorf("cannot process request") - ErrNoPoolsAvailable = fmt.Errorf("no pools available") + ErrTimeout = NewTimeoutError("timed out") + ErrUnprocessable = NewUnprocessableError("cannot process request") + ErrNoPoolsAvailable = NewNoPoolsAvailableError("no pools available") ) type baseError struct { @@ -56,6 +56,15 @@ type ProviderError struct { baseError } +func (p *ProviderError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*ProviderError) + return ok +} + // NewMissingSecretError returns a new MissingSecretError func NewMissingSecretError(msg string, a ...interface{}) error { return &MissingSecretError{ @@ -70,6 +79,15 @@ type MissingSecretError struct { baseError } +func (p *MissingSecretError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*MissingSecretError) + return ok +} + // NewUnauthorizedError returns a new UnauthorizedError func NewUnauthorizedError(msg string) error { return &UnauthorizedError{ @@ -84,6 +102,15 @@ type UnauthorizedError struct { baseError } +func (p *UnauthorizedError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*UnauthorizedError) + return ok +} + // NewNotFoundError returns a new NotFoundError func NewNotFoundError(msg string, a ...interface{}) error { return &NotFoundError{ @@ -98,6 +125,15 @@ type NotFoundError struct { baseError } +func (p *NotFoundError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*NotFoundError) + return ok +} + // NewDuplicateUserError returns a new DuplicateUserError func NewDuplicateUserError(msg string) error { return &DuplicateUserError{ @@ -112,6 +148,15 @@ type DuplicateUserError struct { baseError } +func (p *DuplicateUserError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*DuplicateUserError) + return ok +} + // NewBadRequestError returns a new BadRequestError func NewBadRequestError(msg string, a ...interface{}) error { return &BadRequestError{ @@ -126,6 +171,15 @@ type BadRequestError struct { baseError } +func (p *BadRequestError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*BadRequestError) + return ok +} + // NewConflictError returns a new ConflictError func NewConflictError(msg string, a ...interface{}) error { return &ConflictError{ @@ -139,3 +193,81 @@ func NewConflictError(msg string, a ...interface{}) error { type ConflictError struct { baseError } + +func (p *ConflictError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*ConflictError) + return ok +} + +// NewTimeoutError returns a new TimoutError +func NewTimeoutError(msg string, a ...interface{}) error { + return &TimoutError{ + baseError{ + msg: fmt.Sprintf(msg, a...), + }, + } +} + +// TimoutError is returned when an operation times out. +type TimoutError struct { + baseError +} + +func (p *TimoutError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*TimoutError) + return ok +} + +// NewUnprocessableError returns a new UnprocessableError +func NewUnprocessableError(msg string, a ...interface{}) error { + return &TimoutError{ + baseError{ + msg: fmt.Sprintf(msg, a...), + }, + } +} + +// TimoutError is returned when an operation times out. +type UnprocessableError struct { + baseError +} + +func (p *UnprocessableError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*UnprocessableError) + return ok +} + +// NewNoPoolsAvailableError returns a new UnprocessableError +func NewNoPoolsAvailableError(msg string, a ...interface{}) error { + return &TimoutError{ + baseError{ + msg: fmt.Sprintf(msg, a...), + }, + } +} + +// NoPoolsAvailableError is returned when anthere are not pools available. +type NoPoolsAvailableError struct { + baseError +} + +func (p *NoPoolsAvailableError) Is(target error) bool { + if target == nil { + return false + } + + _, ok := target.(*NoPoolsAvailableError) + return ok +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a9818b9c..ba3c7488 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -21,7 +21,7 @@ github.com/cespare/xxhash/v2 # github.com/chzyer/readline v1.5.1 ## explicit; go 1.15 github.com/chzyer/readline -# github.com/cloudbase/garm-provider-common v0.1.6 +# github.com/cloudbase/garm-provider-common v0.1.7 ## explicit; go 1.23.0 github.com/cloudbase/garm-provider-common/defaults github.com/cloudbase/garm-provider-common/errors