Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 22:34:56 -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

2
hack/go.mod
View file

@ -44,7 +44,6 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
go.uber.org/goleak v1.2.1
go.uber.org/multierr v1.9.0
go.uber.org/zap v1.24.0
golang.org/x/mod v0.8.0
google.golang.org/grpc v1.51.0
@ -268,6 +267,7 @@ require (
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20220223235035-243c74974e97 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/exp v0.0.0-20220823124025-807a23277127 // indirect
golang.org/x/net v0.6.0 // indirect

12
hack/image-measurement/main.go
View file

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
package main
import (
"errors"
"flag"
"fmt"
"io"
@ -18,7 +19,6 @@ import (
"github.com/edgelesssys/constellation/v2/hack/image-measurement/server"
"github.com/edgelesssys/constellation/v2/internal/attestation/measurements"
"github.com/edgelesssys/constellation/v2/internal/logger"
"go.uber.org/multierr"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"gopkg.in/yaml.v3"
@ -46,7 +46,7 @@ func (l *libvirtInstance) uploadBaseImage(baseVolume *libvirt.StorageVol) (err e
return fmt.Errorf("error while opening %s: %s", l.imagePath, err)
}
defer func() {
err = multierr.Append(err, file.Close())
err = errors.Join(err, file.Close())
}()
fi, err := file.Stat()
@ -276,9 +276,9 @@ func (l *libvirtInstance) deletePool() error {
func (l *libvirtInstance) deleteLibvirtInstance() error {
var err error
err = multierr.Append(err, l.deleteNetwork())
err = multierr.Append(err, l.deleteDomain())
err = multierr.Append(err, l.deletePool())
err = errors.Join(err, l.deleteNetwork())
err = errors.Join(err, l.deleteDomain())
err = errors.Join(err, l.deletePool())
return err
}
@ -295,7 +295,7 @@ func (l *libvirtInstance) obtainMeasurements() (measurements measurements.M, err
}
}()
defer func() {
err = multierr.Append(err, l.deleteLibvirtInstance())
err = errors.Join(err, l.deleteLibvirtInstance())
}()
if err := l.createLibvirtInstance(); err != nil {
return nil, err