knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correct error in OpenShift reg.cred.provider (#1104) 

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2022-07-11 17:04:12 +02:00 committed by GitHub
parent e1d5229900
commit a197f8b330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/creds/credentials.go
View File

@ -30,6 +30,8 @@ type CredentialsCallback func(registry string) (docker.Credentials, error)
var ErrUnauthorized = errors.New("bad credentials") var ErrUnauthorized = errors.New("bad credentials")
var ErrCredentialsNotFound = errors.New("credentials not found")
// VerifyCredentialsCallback checks if credentials are accepted by the registry. // VerifyCredentialsCallback checks if credentials are accepted by the registry.
// If credentials are incorrect this callback shall return ErrUnauthorized. // If credentials are incorrect this callback shall return ErrUnauthorized.
type VerifyCredentialsCallback func(ctx context.Context, registry string, credentials docker.Credentials) error type VerifyCredentialsCallback func(ctx context.Context, registry string, credentials docker.Credentials) error
@ -130,6 +132,7 @@ func WithTransport(transport http.RoundTripper) Opt {
} }
// WithAdditionalCredentialLoaders adds custom callbacks for credential retrieval. // WithAdditionalCredentialLoaders adds custom callbacks for credential retrieval.
// The callbacks shall return ErrCredentialsNotFound if the credentials are not found.
// The callbacks are supposed to be non-interactive as opposed to WithPromptForCredentials. // The callbacks are supposed to be non-interactive as opposed to WithPromptForCredentials.
// //
// This might be useful when credentials are shared with some other service. // This might be useful when credentials are shared with some other service.
@ -224,7 +227,7 @@ func (c *credentialsProvider) getCredentials(ctx context.Context, registry strin
result, err = load(registry) result, err = load(registry)
if err != nil { if err != nil {
if errors.Is(err, errCredentialsNotFound) { if errors.Is(err, ErrCredentialsNotFound) {
continue continue
} }
return docker.Credentials{}, err return docker.Credentials{}, err
@ -242,7 +245,7 @@ func (c *credentialsProvider) getCredentials(ctx context.Context, registry strin
} }
if c.promptForCredentials == nil { if c.promptForCredentials == nil {
return docker.Credentials{}, errCredentialsNotFound return docker.Credentials{}, ErrCredentialsNotFound
} }
for { for {
@ -299,7 +302,6 @@ func (c *credentialsProvider) getCredentials(ctx context.Context, registry strin
} }
} }
var errCredentialsNotFound = errors.New("credentials not found")
var errNoCredentialHelperConfigured = errors.New("no credential helper configure") var errNoCredentialHelperConfigured = errors.New("no credential helper configure")
func getCredentialHelperFromConfig(confFilePath string) (string, error) { func getCredentialHelperFromConfig(confFilePath string) (string, error) {
@ -355,7 +357,7 @@ func getCredentialsByCredentialHelper(confFilePath, registry string) (docker.Cre
return result, fmt.Errorf("failed to get helper from config: %w", err) return result, fmt.Errorf("failed to get helper from config: %w", err)
} }
if helper == "" { if helper == "" {
return result, errCredentialsNotFound return result, ErrCredentialsNotFound
} }
helperName := fmt.Sprintf("docker-credential-%s", helper) helperName := fmt.Sprintf("docker-credential-%s", helper)
@ -378,7 +380,7 @@ func getCredentialsByCredentialHelper(confFilePath, registry string) (docker.Cre
} }
} }
return result, fmt.Errorf("failed to get credentials from helper specified in ~/.docker/config.json: %w", errCredentialsNotFound) return result, fmt.Errorf("failed to get credentials from helper specified in ~/.docker/config.json: %w", ErrCredentialsNotFound)
} }
func setCredentialsByCredentialHelper(confFilePath, registry, username, secret string) error { func setCredentialsByCredentialHelper(confFilePath, registry, username, secret string) error {

2
openshift/openshift.go
View File

@ -135,7 +135,7 @@ func GetDockerCredentialLoaders() []creds.CredentialsCallback {
if registry == registryHostPort { if registry == registryHostPort {
return credentials, nil return credentials, nil
} }
return docker.Credentials{}, nil return docker.Credentials{}, creds.ErrCredentialsNotFound
}, },
} }