summaryrefslogtreecommitdiff
path: root/vendor/github.com/Microsoft/hcsshim/computestorage
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-03-17 14:43:10 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2021-03-18 20:27:25 +0100
commitec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2 (patch)
tree61606abbce5e8efbf0c1f0c0ff6fe1c785c8a203 /vendor/github.com/Microsoft/hcsshim/computestorage
parent77b3a2df645f2548f7bd2da85bbdb17e4de98310 (diff)
downloadpodman-ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2.tar.gz
podman-ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2.tar.bz2
podman-ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2.zip
Bump github.com/containers/storage from 1.25.0 to 1.28.0
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.25.0 to 1.28.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.25.0...v1.28.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/computestorage')
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/attach.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/detach.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/export.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/format.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/import.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/mount.go4
-rw-r--r--vendor/github.com/Microsoft/hcsshim/computestorage/setup.go7
9 files changed, 19 insertions, 20 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/attach.go b/vendor/github.com/Microsoft/hcsshim/computestorage/attach.go
index 56901d926..dcc61347c 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/attach.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/attach.go
@@ -3,9 +3,9 @@ package computestorage
import (
"context"
"encoding/json"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -32,7 +32,7 @@ func AttachLayerStorageFilter(ctx context.Context, layerPath string, layerData L
err = hcsAttachLayerStorageFilter(layerPath, string(bytes))
if err != nil {
- return fmt.Errorf("failed to attach layer storage filter: %s", err)
+ return errors.Wrap(err, "failed to attach layer storage filter")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go b/vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go
index ecf3b550d..39a9ba381 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go
@@ -2,9 +2,9 @@ package computestorage
import (
"context"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -20,7 +20,7 @@ func DestroyLayer(ctx context.Context, layerPath string) (err error) {
err = hcsDestroyLayer(layerPath)
if err != nil {
- return fmt.Errorf("failed to destroy layer: %s", err)
+ return errors.Wrap(err, "failed to destroy layer")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/detach.go b/vendor/github.com/Microsoft/hcsshim/computestorage/detach.go
index 2a4df4213..9c144c066 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/detach.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/detach.go
@@ -2,9 +2,9 @@ package computestorage
import (
"context"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -20,7 +20,7 @@ func DetachLayerStorageFilter(ctx context.Context, layerPath string) (err error)
err = hcsDetachLayerStorageFilter(layerPath)
if err != nil {
- return fmt.Errorf("failed to detach layer storage filter: %s", err)
+ return errors.Wrap(err, "failed to detach layer storage filter")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/export.go b/vendor/github.com/Microsoft/hcsshim/computestorage/export.go
index b1721ef25..649b2602a 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/export.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/export.go
@@ -3,9 +3,9 @@ package computestorage
import (
"context"
"encoding/json"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -40,7 +40,7 @@ func ExportLayer(ctx context.Context, layerPath, exportFolderPath string, layerD
err = hcsExportLayer(layerPath, exportFolderPath, string(ldbytes), string(obytes))
if err != nil {
- return fmt.Errorf("failed to export layer: %s", err)
+ return errors.Wrap(err, "failed to export layer")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/format.go b/vendor/github.com/Microsoft/hcsshim/computestorage/format.go
index 2952c8a66..fe0861d2a 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/format.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/format.go
@@ -2,9 +2,9 @@ package computestorage
import (
"context"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
"golang.org/x/sys/windows"
)
@@ -20,7 +20,7 @@ func FormatWritableLayerVhd(ctx context.Context, vhdHandle windows.Handle) (err
err = hcsFormatWritableLayerVhd(vhdHandle)
if err != nil {
- return fmt.Errorf("failed to format writable layer vhd: %s", err)
+ return errors.Wrap(err, "failed to format writable layer vhd")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/import.go b/vendor/github.com/Microsoft/hcsshim/computestorage/import.go
index 06e329794..8ad2b085c 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/import.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/import.go
@@ -3,9 +3,9 @@ package computestorage
import (
"context"
"encoding/json"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -35,7 +35,7 @@ func ImportLayer(ctx context.Context, layerPath, sourceFolderPath string, layerD
err = hcsImportLayer(layerPath, sourceFolderPath, string(bytes))
if err != nil {
- return fmt.Errorf("failed to import layer: %s", err)
+ return errors.Wrap(err, "failed to import layer")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go b/vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go
index 2e4810c45..a50afd821 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go
@@ -3,9 +3,9 @@ package computestorage
import (
"context"
"encoding/json"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
)
@@ -32,7 +32,7 @@ func InitializeWritableLayer(ctx context.Context, layerPath string, layerData La
// Options are not used in the platform as of RS5
err = hcsInitializeWritableLayer(layerPath, string(bytes), "")
if err != nil {
- return fmt.Errorf("failed to intitialize container layer: %s", err)
+ return errors.Wrap(err, "failed to intitialize container layer")
}
return nil
}
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/mount.go b/vendor/github.com/Microsoft/hcsshim/computestorage/mount.go
index 40652b99e..1c16ff409 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/mount.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/mount.go
@@ -2,10 +2,10 @@ package computestorage
import (
"context"
- "fmt"
"github.com/Microsoft/hcsshim/internal/interop"
"github.com/Microsoft/hcsshim/internal/oc"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
"golang.org/x/sys/windows"
)
@@ -20,7 +20,7 @@ func GetLayerVhdMountPath(ctx context.Context, vhdHandle windows.Handle) (path s
var mountPath *uint16
err = hcsGetLayerVhdMountPath(vhdHandle, &mountPath)
if err != nil {
- return "", fmt.Errorf("failed to get vhd mount path: %s", err)
+ return "", errors.Wrap(err, "failed to get vhd mount path")
}
path = interop.ConvertAndFreeCoTaskMemString(mountPath)
return path, nil
diff --git a/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go b/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
index 13ce0cd60..7506709ca 100644
--- a/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
+++ b/vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
@@ -3,11 +3,10 @@ package computestorage
import (
"context"
"encoding/json"
- "errors"
- "fmt"
"github.com/Microsoft/hcsshim/internal/oc"
"github.com/Microsoft/hcsshim/osversion"
+ "github.com/pkg/errors"
"go.opencensus.io/trace"
"golang.org/x/sys/windows"
)
@@ -37,7 +36,7 @@ func SetupBaseOSLayer(ctx context.Context, layerPath string, vhdHandle windows.H
err = hcsSetupBaseOSLayer(layerPath, vhdHandle, string(bytes))
if err != nil {
- return fmt.Errorf("failed to setup base OS layer: %s", err)
+ return errors.Wrap(err, "failed to setup base OS layer")
}
return nil
}
@@ -69,7 +68,7 @@ func SetupBaseOSVolume(ctx context.Context, layerPath, volumePath string, option
err = hcsSetupBaseOSVolume(layerPath, volumePath, string(bytes))
if err != nil {
- return fmt.Errorf("failed to setup base OS layer: %s", err)
+ return errors.Wrap(err, "failed to setup base OS layer")
}
return nil
}