go.mod: github.com/opencontainers/image-spec v1.1.0-rc3

AkihiroSuda · dmcgowan · commit 189b69e247f0 · 2024-05-06T17:12:52.000-07:00
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 4347fc8) Signed-off-by: Derek McGowan <derek@mcg.dev>
diff --git a/go.mod b/go.mod
@@ -46,7 +46,7 @@ require (
 	github.com/moby/sys/symlink v0.2.0
 	github.com/moby/sys/user v0.1.0
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
+	github.com/opencontainers/image-spec v1.1.0-rc3
 	github.com/opencontainers/runtime-spec v1.1.0
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626
 	github.com/opencontainers/selinux v1.11.0
diff --git a/go.sum b/go.sum
@@ -794,8 +794,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
diff --git a/images/converter/default.go b/images/converter/default.go
@@ -432,11 +432,11 @@ func ConvertDockerMediaTypeToOCI(mt string) string {
 	case images.MediaTypeDockerSchema2LayerGzip:
 		return ocispec.MediaTypeImageLayerGzip
 	case images.MediaTypeDockerSchema2LayerForeignGzip:
-		return ocispec.MediaTypeImageLayerNonDistributableGzip
+		return ocispec.MediaTypeImageLayerNonDistributableGzip //nolint:staticcheck // deprecated
 	case images.MediaTypeDockerSchema2Layer:
 		return ocispec.MediaTypeImageLayer
 	case images.MediaTypeDockerSchema2LayerForeign:
-		return ocispec.MediaTypeImageLayerNonDistributable
+		return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated
 	case images.MediaTypeDockerSchema2Config:
 		return ocispec.MediaTypeImageConfig
 	default:
diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go
@@ -99,7 +99,7 @@ func IsUncompressedType(mt string) bool {
 		images.MediaTypeDockerSchema2Layer,
 		images.MediaTypeDockerSchema2LayerForeign,
 		ocispec.MediaTypeImageLayer,
-		ocispec.MediaTypeImageLayerNonDistributable:
+		ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated
 		return true
 	default:
 		return false
@@ -114,8 +114,8 @@ func convertMediaType(mt string) string {
 		return images.MediaTypeDockerSchema2LayerForeign
 	case ocispec.MediaTypeImageLayerGzip, ocispec.MediaTypeImageLayerZstd:
 		return ocispec.MediaTypeImageLayer
-	case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd:
-		return ocispec.MediaTypeImageLayerNonDistributable
+	case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd: //nolint:staticcheck // deprecated
+		return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated
 	default:
 		return mt
 	}
diff --git a/images/diffid.go b/images/diffid.go
@@ -36,7 +36,7 @@ func GetDiffID(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (
 		MediaTypeDockerSchema2Layer,
 		ocispec.MediaTypeImageLayer,
 		MediaTypeDockerSchema2LayerForeign,
-		ocispec.MediaTypeImageLayerNonDistributable:
+		ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated
 		return desc.Digest, nil
 	}
 	info, err := cs.Info(ctx, desc.Digest)
diff --git a/images/mediatypes.go b/images/mediatypes.go
@@ -81,7 +81,7 @@ func DiffCompression(ctx context.Context, mediaType string) (string, error) {
 			return "", nil
 		}
 		return "gzip", nil
-	case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable:
+	case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // Non-distributable layers are deprecated
 		if len(ext) > 0 {
 			switch ext[len(ext)-1] {
 			case "gzip":
diff --git a/integration/client/go.mod b/integration/client/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/containerd/ttrpc v1.2.3
 	github.com/containerd/typeurl/v2 v2.1.1
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
+	github.com/opencontainers/image-spec v1.1.0-rc3
 	github.com/opencontainers/runtime-spec v1.1.0
 	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/otel v1.19.0
diff --git a/integration/client/go.sum b/integration/client/go.sum
@@ -1459,8 +1459,9 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=
 github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
 github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
 github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
diff --git a/integration/client/import_test.go b/integration/client/import_test.go
@@ -491,9 +491,11 @@ func createContent(size int64, seed int64) ([]byte, digest.Digest) {
 
 func createConfig(osName, archName, author string) ([]byte, digest.Digest) {
 	image := ocispec.Image{
-		OS:           osName,
-		Architecture: archName,
-		Author:       author,
+		Platform: ocispec.Platform{
+			OS:           osName,
+			Architecture: archName,
+		},
+		Author: author,
 	}
 	b, _ := json.Marshal(image)
 
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -457,6 +457,7 @@ func WithImageConfigArgs(image Image, args []string) SpecOpts {
 				return errors.New("no arguments specified")
 			}
 
+			//nolint:staticcheck // ArgsEscaped is deprecated
 			if config.ArgsEscaped && (len(config.Entrypoint) > 0 || cmdFromImage) {
 				s.Process.Args = nil
 				s.Process.CommandLine = cmd[0]
diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go
@@ -44,7 +44,7 @@ func escapeAndCombineArgsWindows(args []string) string {
 // If image.ArgsEscaped field is set, this function sets the process command line and if not, it sets the
 // process args field
 func WithProcessCommandLineOrArgsForWindows(config *runtime.ContainerConfig, image *imagespec.ImageConfig) oci.SpecOpts {
-	if image.ArgsEscaped {
+	if image.ArgsEscaped { //nolint:staticcheck // ArgsEscaped is deprecated
 		return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) (err error) {
 			// firstArgFromImg is a flag that is returned to indicate that the first arg in the slice comes from either the
 			// image Entrypoint or Cmd. If the first arg instead comes from the container config (e.g. overriding the image values),
@@ -57,7 +57,7 @@ func WithProcessCommandLineOrArgsForWindows(config *runtime.ContainerConfig, ima
 			}
 
 			var cmdLine string
-			if image.ArgsEscaped && firstArgFromImg {
+			if image.ArgsEscaped && firstArgFromImg { //nolint:staticcheck // ArgsEscaped is deprecated
 				cmdLine = args[0]
 				if len(args) > 1 {
 					cmdLine += " " + escapeAndCombineArgsWindows(args[1:])
diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go
@@ -78,6 +78,7 @@ func TestContextCustomKeyPrefix(t *testing.T) {
 	})
 }
 
+//nolint:staticcheck // Non-distributable layers are deprecated
 func TestSkipNonDistributableBlobs(t *testing.T) {
 	ctx := context.Background()
 
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/artifact.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/artifact.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go b/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/github.com/opencontainers/image-spec/specs-go/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -341,8 +341,8 @@ github.com/modern-go/reflect2
 ## explicit; go 1.13
 github.com/opencontainers/go-digest
 github.com/opencontainers/go-digest/digestset
-# github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
-## explicit; go 1.17
+# github.com/opencontainers/image-spec v1.1.0-rc3
+## explicit; go 1.18
 github.com/opencontainers/image-spec/identity
 github.com/opencontainers/image-spec/specs-go
 github.com/opencontainers/image-spec/specs-go/v1

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func GetDiffID(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (`
`36`	`36`	`MediaTypeDockerSchema2Layer,`
`37`	`37`	`ocispec.MediaTypeImageLayer,`
`38`	`38`	`MediaTypeDockerSchema2LayerForeign,`
`39`		`- ocispec.MediaTypeImageLayerNonDistributable:`
	`39`	`+ ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated`
`40`	`40`	`return desc.Digest, nil`
`41`	`41`	`}`
`42`	`42`	`info, err := cs.Info(ctx, desc.Digest)`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func DiffCompression(ctx context.Context, mediaType string) (string, error) {`
`81`	`81`	`return "", nil`
`82`	`82`	`}`
`83`	`83`	`return "gzip", nil`
`84`		`- case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable:`
	`84`	`+ case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // Non-distributable layers are deprecated`
`85`	`85`	`if len(ext) > 0 {`
`86`	`86`	`switch ext[len(ext)-1] {`
`87`	`87`	`case "gzip":`
Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,7 @@ func WithImageConfigArgs(image Image, args []string) SpecOpts {`
`457`	`457`	`return errors.New("no arguments specified")`
`458`	`458`	`}`
`459`	`459`
	`460`	`+ //nolint:staticcheck // ArgsEscaped is deprecated`
`460`	`461`	`if config.ArgsEscaped && (len(config.Entrypoint) > 0 \|\| cmdFromImage) {`
`461`	`462`	`s.Process.Args = nil`
`462`	`463`	`s.Process.CommandLine = cmd[0]`