summaryrefslogtreecommitdiff
path: root/registry/service.go
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2022-03-18 13:57:31 +0100
committerSebastiaan van Stijn <github@gone.nl>2022-03-18 15:09:16 +0100
commit5e9829b75d4d57a49d1cbe17ccc6bf73b4a18fed (patch)
treec59b8bf75d4c5dd1d0a1a7d886d8670284cacf20 /registry/service.go
parent894773012427edd14502bbf166f10d70488117d6 (diff)
downloaddocker-5e9829b75d4d57a49d1cbe17ccc6bf73b4a18fed.tar.gz
registry: remove unused fallbackError
Nothing was emitting this error. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'registry/service.go')
-rw-r--r--registry/service.go25
1 files changed, 9 insertions, 16 deletions
diff --git a/registry/service.go b/registry/service.go
index eb9c5c0a29..403d81ee9b 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -175,23 +175,16 @@ func (s *defaultService) Search(ctx context.Context, term string, limit int, aut
modifiers := Headers(userAgent, nil)
v2Client, err := v2AuthHTTPClient(endpoint.URL, endpoint.client.Transport, modifiers, creds, scopes)
if err != nil {
- if fErr, ok := err.(fallbackError); ok {
- logrus.WithError(fErr.err).Error("cannot use identity token for search, v2 auth not supported")
- } else {
- return nil, err
- }
- } else {
- // Copy non transport http client features
- v2Client.Timeout = endpoint.client.Timeout
- v2Client.CheckRedirect = endpoint.client.CheckRedirect
- v2Client.Jar = endpoint.client.Jar
-
- logrus.Debugf("using v2 client for search to %s", endpoint.URL)
- client = v2Client
+ return nil, err
}
- }
-
- if client == nil {
+ // Copy non transport http client features
+ v2Client.Timeout = endpoint.client.Timeout
+ v2Client.CheckRedirect = endpoint.client.CheckRedirect
+ v2Client.Jar = endpoint.client.Jar
+
+ logrus.Debugf("using v2 client for search to %s", endpoint.URL)
+ client = v2Client
+ } else {
client = endpoint.client
if err := authorizeClient(client, authConfig, endpoint); err != nil {
return nil, err