Update github.com/Microsoft/hcsshim to v0.8.15
Fixes #4915 Release info: https://github.com/microsoft/hcsshim/releases/tag/v0.8.15 Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
This commit is contained in:
		
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/attach.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/attach.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/destroy.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/detach.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/detach.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/export.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/export.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/format.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/format.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/import.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/import.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/initialize.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/mount.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/mount.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/Microsoft/hcsshim/computestorage/setup.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user