Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func DeleteArtifactCommand() *cobra.Command {
log.Errorf("failed to get project name: %v", utils.ParseHarborErrorMsg(err))
}
repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
}
err = api.DeleteArtifact(projectName, repoName, reference)
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/label/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ Examples:
return fmt.Errorf("failed to get project name: %v", utils.ParseHarborErrorMsg(err))
}
repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
}

if len(args) == 2 {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/label/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ Examples:
return fmt.Errorf("failed to get project name: %v", utils.ParseHarborErrorMsg(err))
}
repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
}

if len(args) == 2 {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/label/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ Supports output formatting such as JSON or YAML using the --output (-o) flag.`,
return fmt.Errorf("failed to get project name: %v", utils.ParseHarborErrorMsg(err))
}
repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
}

if reference == "" {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/scan/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ func parseArgs(args []string) (string, string, string, error) {
return "", "", "", err
}
repoName := prompt.GetRepoNameFromUser(projectName)
reference := prompt.GetReferenceFromUser(repoName, projectName)
reference, err := prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return "", "", "", err
}

return projectName, repoName, reference, nil
}
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/tags/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ func CreateTagsCmd() *cobra.Command {
}

repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
create.CreateTagView(&tagName)
}
err = api.CreateTag(projectName, repoName, reference, tagName)
Expand Down
10 changes: 8 additions & 2 deletions cmd/harbor/root/artifact/tags/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ func DeleteTagsCmd() *cobra.Command {
}

repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
tagName = prompt.GetTagFromUser(repoName, projectName, reference)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
tagName, err = prompt.GetTagFromUser(repoName, projectName, reference)
if err != nil {
return fmt.Errorf("failed to list tags: %v", err)
}
}

err = api.DeleteTag(projectName, repoName, reference, tagName)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/artifact/tags/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ func ListTagsCmd() *cobra.Command {
if repoName == "" {
return fmt.Errorf("invalid repository name provided")
}
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
return fmt.Errorf("failed to list artifacts: %v", err)
}
}

tags, err = api.ListTags(projectName, repoName, reference)
Expand Down
6 changes: 5 additions & 1 deletion cmd/harbor/root/artifact/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ func ViewArtifactCommmand() *cobra.Command {
return
}
repoName = prompt.GetRepoNameFromUser(projectName)
reference = prompt.GetReferenceFromUser(repoName, projectName)
reference, err = prompt.GetReferenceFromUser(repoName, projectName)
if err != nil {
log.Errorf("failed to list artifacts: %v", err)
return
}
}

if reference == "" {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/instance/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ If no argument is provided, you will be prompted to select an instance from a li
} else if len(args) > 0 {
instanceName = args[0]
} else {
instanceName = prompt.GetInstanceFromUser()
instanceName, err = prompt.GetInstanceFromUser()
if err != nil {
return fmt.Errorf("failed to list instances: %v", err)
}
}
err = api.DeleteInstance(instanceName)
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/project/member/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ func DeleteMemberCommand() *cobra.Command {
return nil
} else if !delAllFlag {
log.Println("Please provide a username or use --all flag to delete all members")
memID = prompt.GetMemberIDFromUser(project, username)
memID, err = prompt.GetMemberIDFromUser(project, username)
if err != nil {
return fmt.Errorf("failed to list members: %v", err)
}
if memID == 0 {
fmt.Println("No members found in project")
return nil
Expand Down
6 changes: 4 additions & 2 deletions cmd/harbor/root/project/member/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ func UpdateMemberCommand() *cobra.Command {
}

if memberName == "" {
opts.ID = prompt.GetMemberIDFromUser(opts.ProjectNameOrID, memberName)

opts.ID, err = prompt.GetMemberIDFromUser(opts.ProjectNameOrID, memberName)
if err != nil {
return fmt.Errorf("failed to list members: %v", err)
}
if opts.ID == 0 {
return fmt.Errorf("No members found in project")
}
Expand Down
6 changes: 4 additions & 2 deletions cmd/harbor/root/quota/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ func UpdateQuotaCommand() *cobra.Command {
}

func GetQuotaFromUser(args []string, opts api.ListQuotaFlags) (*models.Quota, error) {
var err error
var quota *models.Quota

if len(args) > 0 {
Expand Down Expand Up @@ -133,7 +132,10 @@ func GetQuotaFromUser(args []string, opts api.ListQuotaFlags) (*models.Quota, er
return nil, err
}
} else {
quotaID := prompt.GetQuotaIDFromUser()
quotaID, err := prompt.GetQuotaIDFromUser()
if err != nil {
return nil, fmt.Errorf("failed to list quotas: %v", err)
}
if quotaID == 0 {
err := fmt.Errorf("failed to get quotaID from user")
return nil, err
Expand Down
7 changes: 5 additions & 2 deletions cmd/harbor/root/registry/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ func DeleteRegistryCommand() *cobra.Command {
}(registryID)
}
} else {
registryId := prompt.GetRegistryNameFromUser()
err := api.DeleteRegistry(registryId)
registryId, err := prompt.GetRegistryNameFromUser()
if err != nil {
return fmt.Errorf("failed to get registry: %v", err)
}
err = api.DeleteRegistry(registryId)
if err != nil {
return fmt.Errorf("failed to delete registry: %v", err)
}
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/registry/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ func UpdateRegistryCommand() *cobra.Command {
return fmt.Errorf("failed to get registry id: %v", err)
}
} else {
registryId = prompt.GetRegistryNameFromUser()
registryId, err = prompt.GetRegistryNameFromUser()
if err != nil {
return fmt.Errorf("failed to get registry: %v", err)
}
}

existingRegistry, err := api.GetRegistryResponse(registryId)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/registry/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func ViewRegistryCommand() *cobra.Command {
return fmt.Errorf("failed to get registry name by id: %v", err)
}
} else {
registryId = prompt.GetRegistryNameFromUser()
registryId, err = prompt.GetRegistryNameFromUser()
if err != nil {
return fmt.Errorf("failed to get registry: %v", err)
}
}

registry, err = api.ViewRegistry(registryId)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/replication/policies/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ func CreateCommand() *cobra.Command {
} else {
opts = &create.CreateView{}
create.CreateRPolicyView(opts, false)
registryID = prompt.GetRegistryNameFromUser()
registryID, err = prompt.GetRegistryNameFromUser()
if err != nil {
return fmt.Errorf("failed to get registry: %v", err)
}
}

registry, err := api.GetRegistryResponse(registryID)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/scanner/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ Examples:
}
registrationID = scanner.UUID
} else {
registrationID = prompt.GetScannerIdFromUser()
registrationID, err = prompt.GetScannerIdFromUser()
if err != nil {
return fmt.Errorf("failed to list scanners: %v", err)
}
}

err = api.DeleteScanner(registrationID)
Expand Down
6 changes: 5 additions & 1 deletion cmd/harbor/root/scanner/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,18 @@ Flags:
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
var registrationID string
var err error
if len(args) > 0 {
scanner, err := api.GetScannerByName(args[0])
if err != nil {
return fmt.Errorf("failed to retrieve scanner by name %q: %v", args[0], err)
}
registrationID = scanner.UUID
} else {
registrationID = prompt.GetScannerIdFromUser()
registrationID, err = prompt.GetScannerIdFromUser()
if err != nil {
return fmt.Errorf("failed to list scanners: %v", err)
}
}

meta, err := api.GetScannerMetadata(registrationID)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/scanner/set_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ func SetDefaultCommand() *cobra.Command {
}
registrationID = scanner.UUID
} else {
registrationID = prompt.GetScannerIdFromUser()
registrationID, err = prompt.GetScannerIdFromUser()
if err != nil {
return fmt.Errorf("failed to list scanners: %v", err)
}
}
err = api.SetDefaultScanner(registrationID)
if err != nil {
Expand Down
6 changes: 5 additions & 1 deletion cmd/harbor/root/scanner/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,18 @@ Only the fields passed through flags will be updated; other fields will retain t
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
var registrationID string
var err error
if len(args) > 0 {
scanner, err := api.GetScannerByName(args[0])
if err != nil {
return fmt.Errorf("failed to retrieve scanner by name %q: %v", args[0], err)
}
registrationID = scanner.UUID
} else {
registrationID = prompt.GetScannerIdFromUser()
registrationID, err = prompt.GetScannerIdFromUser()
if err != nil {
return fmt.Errorf("failed to list scanners: %v", err)
}
}

resp, err := api.GetScanner(registrationID)
Expand Down
5 changes: 4 additions & 1 deletion cmd/harbor/root/scanner/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ Examples:
}
scanner = &resp
} else {
id := prompt.GetScannerIdFromUser()
id, err := prompt.GetScannerIdFromUser()
if err != nil {
return fmt.Errorf("failed to list scanners: %v", err)
}
resp, err := api.GetScanner(id)
if err != nil {
return fmt.Errorf("failed to get scanner by ID %q: %v", id, err)
Expand Down
10 changes: 8 additions & 2 deletions cmd/harbor/root/tag/immutable/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@ func DeleteImmutableCommand() *cobra.Command {
var immutableId int64
if len(args) > 0 {
projectName = args[0]
immutableId = prompt.GetImmutableTagRule(args[0])
immutableId, err = prompt.GetImmutableTagRule(args[0])
if err != nil {
return fmt.Errorf("failed to list immutable tag rules: %v", err)
}
} else {
projectName, err = prompt.GetProjectNameFromUser()
if err != nil {
return fmt.Errorf("failed to get project name: %v", utils.ParseHarborErrorMsg(err))
}
immutableId = prompt.GetImmutableTagRule(projectName)
immutableId, err = prompt.GetImmutableTagRule(projectName)
if err != nil {
return fmt.Errorf("failed to list immutable tag rules: %v", err)
}
}
err = api.DeleteImmutable(projectName, immutableId)
if err != nil {
Expand Down
Loading
Loading