Skip to content

Commit 6f76bb9

Browse files
bzonbzon
committed
refactor code and fix warnings from gometalinter
1 parent 44aa8b2 commit 6f76bb9

36 files changed

Lines changed: 209 additions & 302 deletions

‎cmd/delete_member.go‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ gitlabctl delete member john.smith --from-project Group1/Project1`,
4545
return validateFromGroupAndProjectFlags(cmd)
4646
},
4747
RunE: func(cmd *cobra.Command, args []string) error {
48-
if getFlagString(cmd, "from-group") != "" {
49-
return deleteGroupMember(cmd, args[0])
48+
if group := getFlagString(cmd, "from-group"); group != "" {
49+
return deleteGroupMember(group, args[0])
5050
}
51-
return deleteProjectMember(cmd, args[0])
51+
return deleteProjectMember(getFlagString(cmd, "from-project"), args[0])
5252
},
5353
}
5454

@@ -58,17 +58,16 @@ func init() {
5858
addFromProjectFlag(deleteMemberCmd)
5959
}
6060

61-
func deleteProjectMember(cmd *cobra.Command, user string) error {
61+
func deleteProjectMember(project string, user string) error {
6262
git, err := newGitlabClient()
6363
if err != nil {
6464
return err
6565
}
66-
project := getFlagString(cmd, "from-project")
6766
uid, err := strconv.Atoi(user)
6867
if err != nil {
69-
foundUser, err := getUserByUsername(user)
70-
if err != nil {
71-
return err
68+
foundUser, err2 := getUserByUsername(user)
69+
if err2 != nil {
70+
return err2
7271
}
7372
uid = foundUser.ID
7473
}
@@ -80,17 +79,16 @@ func deleteProjectMember(cmd *cobra.Command, user string) error {
8079
return nil
8180
}
8281

83-
func deleteGroupMember(cmd *cobra.Command, user string) error {
82+
func deleteGroupMember(group string, user string) error {
8483
git, err := newGitlabClient()
8584
if err != nil {
8685
return err
8786
}
88-
group := getFlagString(cmd, "from-group")
8987
uid, err := strconv.Atoi(user)
9088
if err != nil {
91-
foundUser, err := getUserByUsername(user)
92-
if err != nil {
93-
return err
89+
foundUser, err2 := getUserByUsername(user)
90+
if err2 != nil {
91+
return err2
9492
}
9593
uid = foundUser.ID
9694
}

‎cmd/delete_member_test.go‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package cmd
2222

2323
import (
2424
"fmt"
25-
"os"
2625
"testing"
2726

2827
"github.com/stretchr/testify/require"
@@ -31,11 +30,10 @@ import (
3130

3231
func TestDeleteMember(t *testing.T) {
3332
tg := []struct {
34-
name string
35-
args []string
36-
flagsMap map[string]string
37-
expect testResult
38-
expectOut string
33+
name string
34+
args []string
35+
flagsMap map[string]string
36+
expect testResult
3937
}{
4038
{
4139
name: "delete from a group",
@@ -64,10 +62,8 @@ func TestDeleteMember(t *testing.T) {
6462
&gitlab.AddGroupMemberOptions{
6563
AccessLevel: gitlab.AccessLevel(40),
6664
}); err != nil {
67-
tInfo("Test data setup failure for delete group member")
68-
os.Exit(1)
65+
tInfo(err)
6966
}
70-
tInfo("Test member to be removed is added")
7167
}
7268

7369
execT := execTestCmdFlags{
@@ -90,10 +86,8 @@ func TestDeleteMember(t *testing.T) {
9086
&gitlab.AddProjectMemberOptions{
9187
AccessLevel: gitlab.AccessLevel(40),
9288
}); err != nil {
93-
tInfo("Test data setup failure for delete project member")
94-
os.Exit(1)
89+
tInfo(err)
9590
}
96-
tInfo("Test member to be removed is added")
9791
}
9892

9993
execT := execTestCmdFlags{

‎cmd/delete_ssh_key.go‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ func deleteSSHKey(key int) error {
7676
return err
7777
}
7878
_, err = git.Users.DeleteSSHKey(key)
79-
if err != nil {
80-
return err
81-
}
82-
return nil
79+
return err
8380
}
8481

8582
func deleteSSHKeyForUser(uid, key int) error {
@@ -94,24 +91,3 @@ func deleteSSHKeyForUser(uid, key int) error {
9491
fmt.Printf("Deleted ssh key with id (%d) for user (%d)\n", key, uid)
9592
return nil
9693
}
97-
98-
// deleteAllSSHKeyForUser is currently used for test teardown
99-
func deleteAllSSHKeyForUser(user string) error {
100-
uid, err := strconv.Atoi(user)
101-
if err != nil {
102-
uid, err = getUserIDbyUsername(user)
103-
if err != nil {
104-
return err
105-
}
106-
}
107-
userKeys, err := getSSHKeysForUser(uid, nil)
108-
if err != nil {
109-
return err
110-
}
111-
for _, key := range userKeys {
112-
if err := deleteSSHKeyForUser(uid, key.ID); err != nil {
113-
return err
114-
}
115-
}
116-
return nil
117-
}

‎cmd/delete_user.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ func deleteUser(username string) error {
4141
// if there is an error, the username is not a number
4242
// therefore, search the username's user id, and then assign it to id
4343
if err != nil {
44-
users, _, err := git.Users.ListUsers(&gitlab.ListUsersOptions{
44+
users, _, err2 := git.Users.ListUsers(&gitlab.ListUsersOptions{
4545
Username: gitlab.String(username),
4646
})
47-
if err != nil {
48-
return err
47+
if err2 != nil {
48+
return err2
4949
}
5050
if len(users) < 1 {
5151
return fmt.Errorf("username %s not found", username)

‎cmd/desc_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func runDescGroup(cmd *cobra.Command, group string) error {
5252
if err != nil {
5353
return err
5454
}
55-
printGroupsOut(cmd, groupInfo)
55+
printGroupsOut(getFlagString(cmd, "out"), groupInfo)
5656
return nil
5757
}
5858

‎cmd/desc_member.go‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,63 +59,59 @@ func init() {
5959
}
6060

6161
func runDescGroupMember(cmd *cobra.Command, username string) error {
62-
group := getFlagString(cmd, "from-group")
63-
member, err := descGroupMember(group, username)
62+
member, err := descGroupMember(getFlagString(cmd, "from-group"), username)
6463
if err != nil {
6564
return err
6665
}
67-
printGroupMembersOut(cmd, member)
66+
printGroupMembersOut(getFlagString(cmd, "out"), member)
6867
return err
6968
}
7069

7170
func runDescProjectMember(cmd *cobra.Command, username string) error {
72-
group := getFlagString(cmd, "from-project")
73-
member, err := descProjectMember(group, username)
71+
member, err := descProjectMember(getFlagString(cmd, "from-project"), username)
7472
if err != nil {
7573
return err
7674
}
77-
printProjectMembersOut(cmd, member)
75+
printProjectMembersOut(getFlagString(cmd, "out"), member)
7876
return err
7977
}
8078

81-
func descProjectMember(pid interface{}, user string) (
82-
*gitlab.ProjectMember, error) {
79+
func descProjectMember(project string, user string) (*gitlab.ProjectMember, error) {
8380
git, err := newGitlabClient()
8481
if err != nil {
8582
return nil, err
8683
}
8784
uid, err := strconv.Atoi(user)
8885
if err != nil {
89-
foundUser, err := getUserByUsername(user)
90-
if err != nil {
91-
return nil, err
86+
foundUser, err2 := getUserByUsername(user)
87+
if err2 != nil {
88+
return nil, err2
9289
}
9390
uid = foundUser.ID
9491
}
9592

96-
member, _, err := git.ProjectMembers.GetProjectMember(pid, uid, nil)
93+
member, _, err := git.ProjectMembers.GetProjectMember(project, uid, nil)
9794
if err != nil {
9895
return nil, err
9996
}
10097
return member, nil
10198
}
10299

103-
func descGroupMember(gid interface{}, user string) (
104-
*gitlab.GroupMember, error) {
100+
func descGroupMember(group string, user string) (*gitlab.GroupMember, error) {
105101
git, err := newGitlabClient()
106102
if err != nil {
107103
return nil, err
108104
}
109105
uid, err := strconv.Atoi(user)
110106
if err != nil {
111-
foundUser, err := getUserByUsername(user)
112-
if err != nil {
113-
return nil, err
107+
foundUser, err2 := getUserByUsername(user)
108+
if err2 != nil {
109+
return nil, err2
114110
}
115111
uid = foundUser.ID
116112
}
117113

118-
member, _, err := git.GroupMembers.GetGroupMember(gid, uid, nil)
114+
member, _, err := git.GroupMembers.GetGroupMember(group, uid, nil)
119115
if err != nil {
120116
return nil, err
121117
}

‎cmd/desc_project.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func runDescProject(cmd *cobra.Command, project string) error {
5454
if err != nil {
5555
return err
5656
}
57-
printProjectsOut(cmd, projectInfo)
57+
printProjectsOut(getFlagString(cmd, "out"), projectInfo)
5858
return nil
5959
}
6060

‎cmd/desc_user.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ func runDescUser(cmd *cobra.Command, user string) error {
5555
// if user is not a number,
5656
// search for the username's user id and assign it to uid
5757
if err != nil {
58-
foundUser, err := getUserByUsername(user)
59-
if err != nil {
60-
return err
58+
foundUser, err2 := getUserByUsername(user)
59+
if err2 != nil {
60+
return err2
6161
}
6262
uid = foundUser.ID
6363
}
6464
userInfo, err := descUser(uid)
6565
if err != nil {
6666
return err
6767
}
68-
printUsersOut(cmd, userInfo)
68+
printUsersOut(getFlagString(cmd, "out"), userInfo)
6969
return nil
7070
}
7171

‎cmd/edit_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func runEditGroup(cmd *cobra.Command, group string) error {
7777
if err != nil {
7878
return err
7979
}
80-
printGroupsOut(cmd, editedGroup)
80+
printGroupsOut(getFlagString(cmd, "out"), editedGroup)
8181
return nil
8282
}
8383

‎cmd/edit_member.go‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@ func runEditProjectMember(cmd *cobra.Command, user string) error {
6666
if err != nil {
6767
return err
6868
}
69-
project := getFlagString(cmd, "from-project")
70-
member, err := editProjectMember(project, user, opts)
69+
member, err := editProjectMember(getFlagString(cmd, "from-project"), user, opts)
7170
if err != nil {
7271
return err
7372
}
74-
printProjectMembersOut(cmd, member)
73+
printProjectMembersOut(getFlagString(cmd, "out"), member)
7574
return err
7675
}
7776

@@ -80,17 +79,15 @@ func runEditGroupMember(cmd *cobra.Command, user string) error {
8079
if err != nil {
8180
return err
8281
}
83-
group := getFlagString(cmd, "from-group")
84-
member, err := editGroupMember(group, user, opts)
82+
member, err := editGroupMember(getFlagString(cmd, "from-group"), user, opts)
8583
if err != nil {
8684
return err
8785
}
88-
printGroupMembersOut(cmd, member)
86+
printGroupMembersOut(getFlagString(cmd, "out"), member)
8987
return err
9088
}
9189

92-
func editProjectMember(pid interface{}, user string,
93-
opts *gitlab.EditProjectMemberOptions) (*gitlab.ProjectMember, error) {
90+
func editProjectMember(project string, user string, opts *gitlab.EditProjectMemberOptions) (*gitlab.ProjectMember, error) {
9491
git, err := newGitlabClient()
9592
if err != nil {
9693
return nil, err
@@ -101,15 +98,14 @@ func editProjectMember(pid interface{}, user string,
10198
return nil, err
10299
}
103100

104-
member, _, err := git.ProjectMembers.EditProjectMember(pid, foundUser.ID, opts)
101+
member, _, err := git.ProjectMembers.EditProjectMember(project, foundUser.ID, opts)
105102
if err != nil {
106103
return nil, err
107104
}
108105
return member, nil
109106
}
110107

111-
func editGroupMember(gid interface{}, user string,
112-
opts *gitlab.EditGroupMemberOptions) (*gitlab.GroupMember, error) {
108+
func editGroupMember(group string, user string, opts *gitlab.EditGroupMemberOptions) (*gitlab.GroupMember, error) {
113109
git, err := newGitlabClient()
114110
if err != nil {
115111
return nil, err
@@ -119,7 +115,7 @@ func editGroupMember(gid interface{}, user string,
119115
if err != nil {
120116
return nil, err
121117
}
122-
member, _, err := git.GroupMembers.EditGroupMember(gid, foundUser.ID, opts)
118+
member, _, err := git.GroupMembers.EditGroupMember(group, foundUser.ID, opts)
123119
if err != nil {
124120
return nil, err
125121
}

0 commit comments

Comments
 (0)