adjust default platform for backward-compatibility

thaJeztah · thaJeztah · commit 19a056163cc3 · 2024-06-13T00:58:28.000+02:00
The platforms.DefaultString() function in the new module returns a string
including the os-version. The existing code does not expect that to be
the case, so using the previous format instead.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/client_opts.go b/client_opts.go
@@ -110,7 +110,7 @@ type RemoteOpt func(*Client, *RemoteContext) error
 // content for
 func WithPlatform(platform string) RemoteOpt {
 	if platform == "" {
-		platform = platforms.DefaultString()
+		platform = platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.
 	}
 	return func(_ *Client, c *RemoteContext) error {
 		for _, p := range c.Platforms {
diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go
@@ -132,7 +132,7 @@ func NewFetchConfig(ctx context.Context, clicontext *cli.Context) (*FetchConfig,
 	if !clicontext.Bool("all-platforms") {
 		p := clicontext.StringSlice("platform")
 		if len(p) == 0 {
-			p = append(p, platforms.DefaultString())
+			p = append(p, platforms.Format(platforms.DefaultSpec())) // For 1.7 continue using the old format without os-version included.
 		}
 		config.Platforms = p
 	}
diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go
@@ -46,7 +46,7 @@ When you are done, use the unmount command.
 		cli.StringFlag{
 			Name:  "platform",
 			Usage: "Mount the image for the specified platform",
-			Value: platforms.DefaultString(),
+			Value: platforms.Format(platforms.DefaultSpec()), // For 1.7 continue using the old format without os-version included.
 		},
 	),
 	Action: func(context *cli.Context) (retErr error) {
diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go
@@ -49,7 +49,7 @@ var defaultSpecCommand = cli.Command{
 		ctx, cancel := commands.AppContext(context)
 		defer cancel()
 
-		platform := platforms.DefaultString()
+		platform := platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.
 		if plat := context.String("platform"); plat != "" {
 			platform = plat
 		}
diff --git a/oci/spec.go b/oci/spec.go
@@ -64,7 +64,7 @@ func ReadSpec(path string) (*Spec, error) {
 // GenerateSpec will generate a default spec from the provided image
 // for use as a containerd container
 func GenerateSpec(ctx context.Context, client Client, c *containers.Container, opts ...SpecOpts) (*Spec, error) {
-	return GenerateSpecWithPlatform(ctx, client, platforms.DefaultString(), c, opts...)
+	return GenerateSpecWithPlatform(ctx, client, platforms.Format(platforms.DefaultSpec()), c, opts...) // For 1.7 continue using the old format without os-version included.
 }
 
 // GenerateSpecWithPlatform will generate a default spec from the provided image
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -138,7 +138,7 @@ func ensureAdditionalGids(s *Spec) {
 // Use as the first option to clear the spec, then apply options afterwards.
 func WithDefaultSpec() SpecOpts {
 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
-		return generateDefaultSpecWithPlatform(ctx, platforms.DefaultString(), c.ID, s)
+		return generateDefaultSpecWithPlatform(ctx, platforms.Format(platforms.DefaultSpec()), c.ID, s) // For 1.7 continue using the old format without os-version included.
 	}
 }
 
diff --git a/platforms/platforms_deprecated.go b/platforms/platforms_deprecated.go
@@ -36,7 +36,7 @@ func Default() platforms.MatchComparer {
 
 // DefaultString returns the default string specifier for the platform.
 func DefaultString() string {
-	return platforms.DefaultString()
+	return platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.
 }
 
 // DefaultStrict returns strict form of Default.
diff --git a/runtime/v2/manager_unix.go b/runtime/v2/manager_unix.go
@@ -23,5 +23,5 @@ import (
 )
 
 func defaultPlatforms() []string {
-	return []string{platforms.DefaultString()}
+	return []string{platforms.Format(platforms.DefaultSpec())} // For 1.7 continue using the old format without os-version included.
 }
diff --git a/runtime/v2/manager_windows.go b/runtime/v2/manager_windows.go
@@ -22,7 +22,7 @@ import (
 
 func defaultPlatforms() []string {
 	return []string{
-		platforms.DefaultString(),
+		platforms.Format(platforms.DefaultSpec()), // For 1.7 continue using the old format without os-version included.
 		"linux/amd64",
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ type RemoteOpt func(Client, RemoteContext) error`
`110`	`110`	`// content for`
`111`	`111`	`func WithPlatform(platform string) RemoteOpt {`
`112`	`112`	`if platform == "" {`
`113`		`- platform = platforms.DefaultString()`
	`113`	`+ platform = platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.`
`114`	`114`	`}`
`115`	`115`	`return func(_ Client, c RemoteContext) error {`
`116`	`116`	`for _, p := range c.Platforms {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func NewFetchConfig(ctx context.Context, clicontext cli.Context) (FetchConfig,`
`132`	`132`	`if !clicontext.Bool("all-platforms") {`
`133`	`133`	`p := clicontext.StringSlice("platform")`
`134`	`134`	`if len(p) == 0 {`
`135`		`- p = append(p, platforms.DefaultString())`
	`135`	`+ p = append(p, platforms.Format(platforms.DefaultSpec())) // For 1.7 continue using the old format without os-version included.`
`136`	`136`	`}`
`137`	`137`	`config.Platforms = p`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ var defaultSpecCommand = cli.Command{`
`49`	`49`	`ctx, cancel := commands.AppContext(context)`
`50`	`50`	`defer cancel()`
`51`	`51`
`52`		`- platform := platforms.DefaultString()`
	`52`	`+ platform := platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.`
`53`	`53`	`if plat := context.String("platform"); plat != "" {`
`54`	`54`	`platform = plat`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func ReadSpec(path string) (*Spec, error) {`
`64`	`64`	`// GenerateSpec will generate a default spec from the provided image`
`65`	`65`	`// for use as a containerd container`
`66`	`66`	`func GenerateSpec(ctx context.Context, client Client, c containers.Container, opts ...SpecOpts) (Spec, error) {`
`67`		`- return GenerateSpecWithPlatform(ctx, client, platforms.DefaultString(), c, opts...)`
	`67`	`+ return GenerateSpecWithPlatform(ctx, client, platforms.Format(platforms.DefaultSpec()), c, opts...) // For 1.7 continue using the old format without os-version included.`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// GenerateSpecWithPlatform will generate a default spec from the provided image`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func ensureAdditionalGids(s *Spec) {`
`138`	`138`	`// Use as the first option to clear the spec, then apply options afterwards.`
`139`	`139`	`func WithDefaultSpec() SpecOpts {`
`140`	`140`	`return func(ctx context.Context, _ Client, c containers.Container, s Spec) error {`
`141`		`- return generateDefaultSpecWithPlatform(ctx, platforms.DefaultString(), c.ID, s)`
	`141`	`+ return generateDefaultSpecWithPlatform(ctx, platforms.Format(platforms.DefaultSpec()), c.ID, s) // For 1.7 continue using the old format without os-version included.`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func Default() platforms.MatchComparer {`
`36`	`36`
`37`	`37`	`// DefaultString returns the default string specifier for the platform.`
`38`	`38`	`func DefaultString() string {`
`39`		`- return platforms.DefaultString()`
	`39`	`+ return platforms.Format(platforms.DefaultSpec()) // For 1.7 continue using the old format without os-version included.`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// DefaultStrict returns strict form of Default.`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func defaultPlatforms() []string {`
`26`		`- return []string{platforms.DefaultString()}`
	`26`	`+ return []string{platforms.Format(platforms.DefaultSpec())} // For 1.7 continue using the old format without os-version included.`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`func defaultPlatforms() []string {`
`24`	`24`	`return []string{`
`25`		`- platforms.DefaultString(),`
	`25`	`+ platforms.Format(platforms.DefaultSpec()), // For 1.7 continue using the old format without os-version included.`
`26`	`26`	`"linux/amd64",`
`27`	`27`	`}`
`28`	`28`	`}`