Merge pull request moby#5095 from thaJeztah/no_splitobject

tonistiigi · web-flow · commit d2b39e4de4c5 · 2024-06-27T11:16:45.000-07:00
ociLayoutResolver.info: remove use of reference.SplitObject
diff --git a/source/containerimage/ocilayout.go b/source/containerimage/ocilayout.go
@@ -105,7 +105,7 @@ func (r *ociLayoutResolver) info(ctx context.Context, ref reference.Spec) (conte
 	err := r.withCaller(ctx, func(ctx context.Context, caller session.Caller) error {
 		store := sessioncontent.NewCallerStore(caller, "oci:"+r.store.StoreID)
 
-		_, dgst := reference.SplitObject(ref.Object)
+		dgst := ref.Digest()
 		if dgst == "" {
 			return errors.Errorf("reference %q does not contain a digest", ref.String())
 		}

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func (r *ociLayoutResolver) info(ctx context.Context, ref reference.Spec) (conte`
`105`	`105`	`err := r.withCaller(ctx, func(ctx context.Context, caller session.Caller) error {`
`106`	`106`	`store := sessioncontent.NewCallerStore(caller, "oci:"+r.store.StoreID)`
`107`	`107`
`108`		`- _, dgst := reference.SplitObject(ref.Object)`
	`108`	`+ dgst := ref.Digest()`
`109`	`109`	`if dgst == "" {`
`110`	`110`	`return errors.Errorf("reference %q does not contain a digest", ref.String())`
`111`	`111`	`}`