Skip to content

fix: preserve nested repository paths in proxy prefetch #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
immanuwell wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −1
Open

fix: preserve nested repository paths in proxy prefetch #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proxy/proxyserver/prefetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ type DefaultTagParser struct{}
// ParseTag implements the TagParser interface.
// Expects tag strings in the format <hostname>/<namespace>/<imagename:tag>.
func (p *DefaultTagParser) ParseTag(tag string) (namespace, name string, err error) {
parts := strings.Split(tag, "/")
parts := strings.SplitN(tag, "/", 3)
if len(parts) < 3 {
return "", "", fmt.Errorf("invalid tag format: %s", tag)
}
Expand Down
33 changes: 33 additions & 0 deletions proxy/proxyserver/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,39 @@ func TestPrefetchV1(t *testing.T) {
require.NoError(err)
}

func TestPrefetchV1NestedRepositoryPath(t *testing.T) {
require := require.New(t)

mocks, cleanup := newServerMocks(t)
defer cleanup()

addr := mocks.startServer()

repo := "kraken-test"
namespace := "preheat"
tag := "team/service/abcdef:v1.0.0"

layers := core.DigestListFixture(3)
manifest, bs := dockerutil.ManifestFixture(layers[0], layers[1], layers[2])

b, err := json.Marshal(prefetchBody{
Tag: fmt.Sprintf("%s/%s/%s", repo, namespace, tag),
TraceId: "abc",
})
require.NoError(err)

tagRequest := url.QueryEscape(fmt.Sprintf("%s/%s", namespace, tag))
mocks.tagClient.EXPECT().Get(tagRequest).Return(manifest, nil)
mocks.originClient.EXPECT().DownloadBlob(gomock.Any(), namespace, manifest, mockutil.MatchWriter(bs)).Return(nil)
mocks.originClient.EXPECT().DownloadBlob(gomock.Any(), namespace, layers[1], io.Discard).Return(nil)
mocks.originClient.EXPECT().DownloadBlob(gomock.Any(), namespace, layers[2], io.Discard).Return(nil)

_, err = httputil.Post(
fmt.Sprintf("http://%s/proxy/v1/registry/prefetch", addr),
httputil.SendBody(bytes.NewReader(b)))
require.NoError(err)
}

func TestPrefetchV2(t *testing.T) {
require := require.New(t)

Expand Down
Loading