Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 06:16:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: replace multierr with native errors.Join

Browse source 
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
This commit is contained in:
Paul Meyer 2023-02-07 12:56:25 +01:00
parent 955316c661
commit 12c866bcb9
32 changed files with 173 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/versionsapi/imageinfo.go
View file

@ -13,7 +13,6 @@ import (
"path"
"github.com/edgelesssys/constellation/v2/internal/constants"
"go.uber.org/multierr"
"golang.org/x/mod/semver"
)
@ -62,25 +61,25 @@ func (i ImageInfo) URL() (string, error) {
func (i ImageInfo) ValidateRequest() error {
var retErr error
if err := ValidateRef(i.Ref); err != nil {
retErr = multierr.Append(retErr, err)
retErr = errors.Join(retErr, err)
}
if err := ValidateStream(i.Ref, i.Stream); err != nil {
retErr = multierr.Append(retErr, err)
retErr = errors.Join(retErr, err)
}
if !semver.IsValid(i.Version) {
retErr = multierr.Append(retErr, fmt.Errorf("version %q is not a valid semver", i.Version))
retErr = errors.Join(retErr, fmt.Errorf("version %q is not a valid semver", i.Version))
}
if len(i.AWS) != 0 {
retErr = multierr.Append(retErr, errors.New("AWS map must be empty for request"))
retErr = errors.Join(retErr, errors.New("AWS map must be empty for request"))
}
if len(i.Azure) != 0 {
retErr = multierr.Append(retErr, errors.New("Azure map must be empty for request"))
retErr = errors.Join(retErr, errors.New("Azure map must be empty for request"))
}
if len(i.GCP) != 0 {
retErr = multierr.Append(retErr, errors.New("GCP map must be empty for request"))
retErr = errors.Join(retErr, errors.New("GCP map must be empty for request"))
}
if len(i.QEMU) != 0 {
retErr = multierr.Append(retErr, errors.New("QEMU map must be empty for request"))
retErr = errors.Join(retErr, errors.New("QEMU map must be empty for request"))
}
return retErr
@ -90,25 +89,25 @@ func (i ImageInfo) ValidateRequest() error {
func (i ImageInfo) Validate() error {
var retErr error
if err := ValidateRef(i.Ref); err != nil {
retErr = multierr.Append(retErr, err)
retErr = errors.Join(retErr, err)
}
if err := ValidateStream(i.Ref, i.Stream); err != nil {
retErr = multierr.Append(retErr, err)
retErr = errors.Join(retErr, err)
}
if !semver.IsValid(i.Version) {
retErr = multierr.Append(retErr, fmt.Errorf("version %q is not a valid semver", i.Version))
retErr = errors.Join(retErr, fmt.Errorf("version %q is not a valid semver", i.Version))
}
if len(i.AWS) == 0 {
retErr = multierr.Append(retErr, errors.New("AWS map must not be empty"))
retErr = errors.Join(retErr, errors.New("AWS map must not be empty"))
}
if len(i.Azure) == 0 {
retErr = multierr.Append(retErr, errors.New("Azure map must not be empty"))
retErr = errors.Join(retErr, errors.New("Azure map must not be empty"))
}
if len(i.GCP) == 0 {
retErr = multierr.Append(retErr, errors.New("GCP map must not be empty"))
retErr = errors.Join(retErr, errors.New("GCP map must not be empty"))
}
if len(i.QEMU) == 0 {
retErr = multierr.Append(retErr, errors.New("QEMU map must not be empty"))
retErr = errors.Join(retErr, errors.New("QEMU map must not be empty"))
}
return retErr