Replace platforms.Format with platforms.FormatAll in functional code.

ctalledo · ctalledo · commit 7a57e73f9de2 · 2025-05-14T10:22:36.000-07:00
Signed-off-by: Cesar Talledo &lt;cesar.talledo@docker.com&gt;
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
@@ -182,7 +182,7 @@ func (is *Source) resolveRemote(ctx context.Context, ref string, platform *ocisp
 		p = *platform
 	}
 	// key is used to synchronize resolutions that can happen in parallel when doing multi-stage.
-	key := "getconfig::" + ref + "::" + platforms.Format(p)
+	key := "getconfig::" + ref + "::" + platforms.FormatAll(p)
 	res, err := is.g.Do(ctx, key, func(ctx context.Context) (*resolveRemoteResult, error) {
 		res := resolver.DefaultPool.GetResolver(is.RegistryHosts, ref, "pull", sm, g)
 		dgst, dt, err := imageutil.Config(ctx, ref, res, is.ContentStore, is.LeaseManager, platform)
diff --git a/builder/builder-next/worker/worker.go b/builder/builder-next/worker/worker.go
@@ -160,10 +160,10 @@ func (w *Worker) Platforms(noCache bool) []ocispec.Platform {
 	if noCache {
 		pm := make(map[string]struct{}, len(w.Opt.Platforms))
 		for _, p := range w.Opt.Platforms {
-			pm[platforms.Format(p)] = struct{}{}
+			pm[platforms.FormatAll(p)] = struct{}{}
 		}
 		for _, p := range archutil.SupportedPlatforms(noCache) {
-			if _, ok := pm[platforms.Format(p)]; !ok {
+			if _, ok := pm[platforms.FormatAll(p)]; !ok {
 				w.Opt.Platforms = append(w.Opt.Platforms, p)
 			}
 		}
diff --git a/daemon/containerd/image_pull.go b/daemon/containerd/image_pull.go
@@ -79,7 +79,7 @@ func (i *ImageService) PullImage(ctx context.Context, baseRef reference.Named, p
 func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platform *ocispec.Platform, metaHeaders map[string][]string, authConfig *registrytypes.AuthConfig, out progress.Output) error {
 	var opts []containerd.RemoteOpt
 	if platform != nil {
-		opts = append(opts, containerd.WithPlatform(platforms.Format(*platform)))
+		opts = append(opts, containerd.WithPlatform(platforms.FormatAll(*platform)))
 	}
 
 	resolver, _ := i.newResolverFromAuthConfig(ctx, authConfig, ref)
diff --git a/internal/testutils/specialimage/multiplatform.go b/internal/testutils/specialimage/multiplatform.go
@@ -16,7 +16,7 @@ func MultiPlatform(dir string, imageRef string, imagePlatforms []ocispec.Platfor
 	var descs []ocispec.Descriptor
 
 	for _, platform := range imagePlatforms {
-		ps := platforms.Format(platform)
+		ps := platforms.FormatAll(platform)
 		manifestDesc, _, err := oneLayerPlatformManifest(dir, platform, FileInLayer{Path: "bash", Content: []byte("layer-" + ps)})
 		if err != nil {
 			return nil, nil, err
diff --git a/internal/testutils/specialimage/partial.go b/internal/testutils/specialimage/partial.go
@@ -26,7 +26,7 @@ func PartialMultiPlatform(dir string, imageRef string, opts PartialOpts) (*ocisp
 	var descs []ocispec.Descriptor
 
 	for _, platform := range opts.Stored {
-		ps := platforms.Format(platform)
+		ps := platforms.FormatAll(platform)
 		manifestDesc, _, err := oneLayerPlatformManifest(dir, platform, FileInLayer{Path: "bash", Content: []byte("layer-" + ps)})
 		if err != nil {
 			return nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func (is Source) resolveRemote(ctx context.Context, ref string, platform ocisp`
`182`	`182`	`p = *platform`
`183`	`183`	`}`
`184`	`184`	`// key is used to synchronize resolutions that can happen in parallel when doing multi-stage.`
`185`		`- key := "getconfig::" + ref + "::" + platforms.Format(p)`
	`185`	`+ key := "getconfig::" + ref + "::" + platforms.FormatAll(p)`
`186`	`186`	`res, err := is.g.Do(ctx, key, func(ctx context.Context) (*resolveRemoteResult, error) {`
`187`	`187`	`res := resolver.DefaultPool.GetResolver(is.RegistryHosts, ref, "pull", sm, g)`
`188`	`188`	`dgst, dt, err := imageutil.Config(ctx, ref, res, is.ContentStore, is.LeaseManager, platform)`
Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,10 @@ func (w *Worker) Platforms(noCache bool) []ocispec.Platform {`
`160`	`160`	`if noCache {`
`161`	`161`	`pm := make(map[string]struct{}, len(w.Opt.Platforms))`
`162`	`162`	`for _, p := range w.Opt.Platforms {`
`163`		`- pm[platforms.Format(p)] = struct{}{}`
	`163`	`+ pm[platforms.FormatAll(p)] = struct{}{}`
`164`	`164`	`}`
`165`	`165`	`for _, p := range archutil.SupportedPlatforms(noCache) {`
`166`		`- if _, ok := pm[platforms.Format(p)]; !ok {`
	`166`	`+ if _, ok := pm[platforms.FormatAll(p)]; !ok {`
`167`	`167`	`w.Opt.Platforms = append(w.Opt.Platforms, p)`
`168`	`168`	`}`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func (i *ImageService) PullImage(ctx context.Context, baseRef reference.Named, p`
`79`	`79`	`func (i ImageService) pullTag(ctx context.Context, ref reference.Named, platform ocispec.Platform, metaHeaders map[string][]string, authConfig *registrytypes.AuthConfig, out progress.Output) error {`
`80`	`80`	`var opts []containerd.RemoteOpt`
`81`	`81`	`if platform != nil {`
`82`		`- opts = append(opts, containerd.WithPlatform(platforms.Format(*platform)))`
	`82`	`+ opts = append(opts, containerd.WithPlatform(platforms.FormatAll(*platform)))`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`resolver, _ := i.newResolverFromAuthConfig(ctx, authConfig, ref)`