beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

registry: improve error for invalid search endpoints

Browse source 
Explain that search is not supported on v2 endpoints, and include the
offending endpoint in the error-message.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-29 10:47:29 +02:00
parent 14b53c6318
commit aa59b0f5a2
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
registry/endpoint_test.go
View file

@ -42,7 +42,7 @@ func TestV1EndpointParse(t *testing.T) {
},
{
address: "https://0.0.0.0:5000/v2/",
expectedErr: "unsupported V1 version path v2",
expectedErr: "search is not supported on v2 endpoints: https://0.0.0.0:5000/v2/",
},
}
for _, tc := range tests {

2
registry/endpoint_v1.go
View file

@ -87,7 +87,7 @@ func validateEndpoint(endpoint *v1Endpoint) error {
func trimV1Address(address string) (string, error) {
trimmed := strings.TrimSuffix(address, "/")
if strings.HasSuffix(trimmed, "/v2") {
return "", invalidParamf("unsupported V1 version path v2")
return "", invalidParamf("search is not supported on v2 endpoints: %s", address)
}
return strings.TrimSuffix(trimmed, "/v1"), nil
}