Skip to content

chore(oci registry): show validation error during save #106

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

Merged
merged 1 commit into from
May 5, 2023
Merged

chore(oci registry): show validation error during save #106

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
4 changes: 2 additions & 2 deletions app/controlplane/internal/service/ocirepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ func (s *OCIRepositoryService) Save(ctx context.Context, req *pb.OCIRepositorySe
username := req.GetKeyPair().Username
password := req.GetKeyPair().Password

// Create credentials
// Create and validate credentials
k, err := ociauth.NewCredentials(req.Repository, username, password)
if err != nil {
return nil, sl.LogAndMaskErr(err, s.log)
return nil, errors.BadRequest("wrong credentials", err.Error())
}

// Check credentials
Expand Down
3 changes: 2 additions & 1 deletion internal/ociauth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package ociauth

import (
"errors"
"fmt"

"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
Expand All @@ -31,7 +32,7 @@ type Credentials struct {
func NewCredentials(repoURI, username, password string) (authn.Keychain, error) {
repo, err := name.NewRepository(repoURI)
if err != nil {
return nil, err
return nil, fmt.Errorf("invalid repository URI: %w", err)
}

// NOTE: NewRepository parses incorrectly URIs with schemas
Expand Down