remotes/docker: Fix MountedFrom prefixed with target repository

vvoland · vvoland · commit 2fffc344ad66 · 2023-10-04T10:07:45.000+02:00
`MountedFrom` was prefixed with the whole target repository instead of just the registry hostname. Also adjust the test cases to use the registry hostname. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 859c265) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -192,7 +192,7 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str
 				resp.Body.Close()
 				resp = nil
 			case http.StatusCreated:
-				mountedFrom = path.Join(p.refspec.Locator, fromRepo)
+				mountedFrom = path.Join(p.refspec.Hostname(), fromRepo)
 			}
 		}
 
diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go
@@ -163,9 +163,9 @@ func samplePusher(t *testing.T) (dockerPusher, *uploadableMockRegistry, StatusTr
 	return dockerPusher{
 		dockerBase: &dockerBase{
 			refspec: reference.Spec{
-				Locator: "sample",
+				Locator: "example.com/samplerepository:latest",
 			},
-			repository: "sample",
+			repository: "samplerepository",
 			hosts: []RegistryHost{
 				{
 					Client:       s.Client(),
@@ -176,7 +176,7 @@ func samplePusher(t *testing.T) (dockerPusher, *uploadableMockRegistry, StatusTr
 				},
 			},
 		},
-		object:  "sample",
+		object:  "latest",
 		tracker: tracker,
 	}, reg, tracker, s.Close
 }
@@ -354,7 +354,7 @@ func Test_dockerPusher_push(t *testing.T) {
 				ref:               fmt.Sprintf("layer2-%s", layerContentDigest.String()),
 				unavailableOnFail: false,
 				annotations: map[string]string{
-					distributionSourceLabelKey("sample"): "always-mount",
+					distributionSourceLabelKey("example.com"): "always-mount",
 				},
 			},
 			checkerFunc: func(writer *pushWriter) bool {
@@ -368,7 +368,7 @@ func Test_dockerPusher_push(t *testing.T) {
 			},
 			wantErr: fmt.Errorf("content %v on remote: %w", digest.FromBytes(layerContent), errdefs.ErrAlreadyExists),
 			wantStatus: &PushStatus{
-				MountedFrom: "sample/always-mount",
+				MountedFrom: "example.com/always-mount",
 				Exists:      false,
 			},
 		},
@@ -383,7 +383,7 @@ func Test_dockerPusher_push(t *testing.T) {
 				ref:               fmt.Sprintf("layer3-%s", layerContentDigest.String()),
 				unavailableOnFail: false,
 				annotations: map[string]string{
-					distributionSourceLabelKey("sample"): "never-mount",
+					distributionSourceLabelKey("example.com"): "never-mount",
 				},
 			},
 			checkerFunc: func(writer *pushWriter) bool {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str`
`192`	`192`	`resp.Body.Close()`
`193`	`193`	`resp = nil`
`194`	`194`	`case http.StatusCreated:`
`195`		`- mountedFrom = path.Join(p.refspec.Locator, fromRepo)`
	`195`	`+ mountedFrom = path.Join(p.refspec.Hostname(), fromRepo)`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`