Skip to content
Open
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
40 changes: 20 additions & 20 deletions cmd/harbor/root/project/member/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,36 +53,36 @@ func UpdateMemberCommand() *cobra.Command {
}
}

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

if opts.ID == 0 {
return fmt.Errorf("No members found in project")
}
} else {
opts.ID, err = api.GetUsersIdByName(memberName)
if err != nil {
return err
}
}

if roleID == 0 {
roleID = prompt.GetRoleIDFromUser()
}
opts.RoleID = &models.RoleRequest{
RoleID: roleID,
}
role := &models.RoleRequest{RoleID: roleID}

// when set true parses projectNameOrID as projectName
// else it parses as an integer ID
opts.XIsResourceName = !isID
opts.RoleID = role

if memberName != "" {
if err = api.UpdateMemberByUsername(opts.ProjectNameOrID, memberName, opts.XIsResourceName, role); err != nil {
return fmt.Errorf("failed to update member: %v", err)
}
fmt.Printf("successfully updated %s to role ID %d in project %s\n", memberName, roleID, opts.ProjectNameOrID)
return nil
}

if opts.ID == 0 {
opts.ID = prompt.GetMemberIDFromUser(opts.ProjectNameOrID, memberName)
if opts.ID == 0 {
return fmt.Errorf("No members found in project")
}
}

err = api.UpdateMember(opts)
if err != nil {
return fmt.Errorf("failed to get members list: %v", err)
if err = api.UpdateMember(opts); err != nil {
return fmt.Errorf("failed to update member: %v", err)
}

fmt.Printf("successfully updated user with ID %d with role ID %d for project %s\n", opts.ID, opts.RoleID, opts.ProjectNameOrID)
fmt.Printf("successfully updated member ID %d to role ID %d in project %s\n", opts.ID, roleID, opts.ProjectNameOrID)
return nil
},
}
Expand Down
30 changes: 30 additions & 0 deletions pkg/api/member_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,36 @@ func DeleteMemberByUsername(projectName string, username string, xIsResourceName
return nil
}

// UpdateMemberByUsername resolves a project-member entry by username and
// updates its role. The Harbor UpdateProjectMember API takes the project
// member ID (project_members.id), not the user ID — these are distinct and
// must not be confused, so callers should prefer this helper over manually
// looking up the user ID and passing it as Mid.
func UpdateMemberByUsername(projectNameOrID, username string, xIsResourceName bool, role *models.RoleRequest) error {
members, err := ListMembers(projectNameOrID, username, true)
if err != nil {
return err
}

var memberID int64
for _, m := range members.Payload {
if m.EntityName == username {
memberID = m.ID
break
}
}
if memberID == 0 {
return fmt.Errorf("member with username %q not found in project %q", username, projectNameOrID)
}

return UpdateMember(UpdateMemberOptions{
ProjectNameOrID: projectNameOrID,
ID: memberID,
XIsResourceName: xIsResourceName,
RoleID: role,
})
}

func UpdateMember(opts UpdateMemberOptions) error {
ctx, client, err := utils.ContextWithClient()
if err != nil {
Expand Down
4 changes: 4 additions & 0 deletions pkg/api/scanner_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ func UpdateScanner(registrationID string, opts models.ScannerRegistration) error
return err
}

if opts.Auth == "None" {
opts.Auth = ""
}

scannerRegReq := models.ScannerRegistrationReq{
Name: &opts.Name,
Description: opts.Description,
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/webhook_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func UpdateWebhook(opts *edit.EditView) error {
Name: opts.Name,
Targets: []*models.WebhookTargetObject{
{
Address: opts.EndpointURL,
Address: strings.TrimSpace(opts.EndpointURL),
AuthHeader: opts.AuthHeader,
PayloadFormat: models.PayloadFormatType(opts.PayloadFormat),
SkipCertVerify: !opts.VerifyRemoteCertificate,
Expand Down