chore update go gitlab

api/merge_request.go

@@ -111,7 +111,7 @@ var ListMRsWithAssigneesOrReviewers = func(client *gitlab.Client, projectID inte
 
 	mrs := make([]*gitlab.MergeRequest, 0)
 	for _, id := range assigneeIds {
-		opts.AssigneeID = gitlab.Int(id)
+		opts.AssigneeID = gitlab.AssigneeID(id)
 		assingeMrs, err := ListMRs(client, projectID, opts)
 		if err != nil {
 			return nil, err
@@ -120,7 +120,7 @@ var ListMRsWithAssigneesOrReviewers = func(client *gitlab.Client, projectID inte
 	}
 	opts.AssigneeID = nil // reset because it's Assignee OR Reviewer
 	for _, id := range reviewerIds {
-		opts.ReviewerID = gitlab.Int(id)
+		opts.ReviewerID = gitlab.ReviewerID(id)
 		reviewerMrs, err := ListMRs(client, projectID, opts)
 		if err != nil {
 			return nil, err

api/milestone.go

@@ -45,7 +45,7 @@ type ListMilestonesOptions struct {
 
 func (opts *ListMilestonesOptions) ListProjectMilestonesOptions() *gitlab.ListMilestonesOptions {
 	projectOpts := &gitlab.ListMilestonesOptions{
-		IIDs:   opts.IIDs,
+		IIDs:   &opts.IIDs,
 		State:  opts.State,
 		Title:  opts.Title,
 		Search: opts.Search,
@@ -57,7 +57,7 @@ func (opts *ListMilestonesOptions) ListProjectMilestonesOptions() *gitlab.ListMi
 
 func (opts *ListMilestonesOptions) ListGroupMilestonesOptions() *gitlab.ListGroupMilestonesOptions {
 	groupOpts := &gitlab.ListGroupMilestonesOptions{
-		IIDs:                    opts.IIDs,
+		IIDs:                    &opts.IIDs,
 		State:                   opts.State,
 		Title:                   opts.Title,
 		Search:                  opts.Search,

api/variable.go

@@ -35,16 +35,12 @@ var DeleteProjectVariable = func(client *gitlab.Client, projectID interface{}, k
 		client = apiClient.Lab()
 	}
 
-	var filter = func(request *retryablehttp.Request) error {
-		q := request.URL.Query()
-		q.Add("filter[environment_scope]", scope)
-
-		request.URL.RawQuery = q.Encode()
-
-		return nil
+	opts := gitlab.RemoveProjectVariableOptions{}
+	if scope != "" {
+		opts.Filter = &gitlab.VariableFilter{EnvironmentScope: scope}
 	}
 
-	_, err := client.ProjectVariables.RemoveVariable(projectID, key, filter)
+	_, err := client.ProjectVariables.RemoveVariable(projectID, key, &opts)
 
 	if err != nil {
 		return err

commands/ci/run/run.go

@@ -82,7 +82,7 @@ func NewCmdRun(f *cmdutils.Factory) *cobra.Command {
 			}
 
 			c := &gitlab.CreatePipelineOptions{
-				Variables: pipelineVars,
+				Variables: &pipelineVars,
 			}
 
 			if m, _ := cmd.Flags().GetString("branch"); m != "" {

commands/cmdutils/cmdutils.go

@@ -352,12 +352,12 @@ func PickMetadata() ([]Action, error) {
 }
 
 //IDsFromUsers collects all user IDs from a slice of users
-func IDsFromUsers(users []*gitlab.User) []int {
+func IDsFromUsers(users []*gitlab.User) *[]int {
 	ids := make([]int, len(users))
 	for i, user := range users {
 		ids[i] = user.ID
 	}
-	return ids
+	return &ids
 }
 
 func ParseMilestone(apiClient *gitlab.Client, repo glrepo.Interface, milestoneTitle string) (int, error) {
@@ -433,7 +433,7 @@ func (ua *UserAssignments) VerifyAssignees() error {
 // UsersFromReplaces converts all users from the `ToReplace` member of the struct into
 // an Slice of String representing the Users' IDs, it also takes a Slice of Strings and
 // writes a proper action message to it
-func (ua *UserAssignments) UsersFromReplaces(apiClient *gitlab.Client, actions []string) ([]int, []string, error) {
+func (ua *UserAssignments) UsersFromReplaces(apiClient *gitlab.Client, actions []string) (*[]int, []string, error) {
 	users, err := api.UsersByNames(apiClient, ua.ToReplace)
 	if err != nil {
 		return nil, actions, err
@@ -463,7 +463,7 @@ func (ua *UserAssignments) UsersFromAddRemove(
 	mergeRequestAssignees []*gitlab.BasicUser,
 	apiClient *gitlab.Client,
 	actions []string,
-) ([]int, []string, error) {
+) (*[]int, []string, error) {
 
 	var assignedIDs []int
 	var usernames []string
@@ -533,7 +533,7 @@ func (ua *UserAssignments) UsersFromAddRemove(
 	if len(assignedIDs) == 0 {
 		assignedIDs = []int{0}
 	}
-	return assignedIDs, actions, nil
+	return &assignedIDs, actions, nil
 }
 
 func ConfirmTransfer() error {

commands/cmdutils/cmdutils_test.go

@@ -323,7 +323,7 @@ func Test_UsersFromAddRemove(t *testing.T) {
 					Username: "foo",
 				},
 			},
-			expectedIDs:    []int{0},
+			expectedIDs:    nil,
 			expectedAction: []string{`unassigned "@foo"`},
 			ua:             UserAssignments{ToRemove: []string{"foo"}},
 		},
@@ -385,7 +385,7 @@ func Test_UsersFromAddRemove(t *testing.T) {
 					Username: "foo",
 				},
 			},
-			expectedIDs:    []int{0},
+			expectedIDs:    nil,
 			expectedAction: []string{`unassigned "@foo"`},
 			ua:             UserAssignments{ToRemove: []string{"foo"}},
 		},

commands/issue/board/view/issue_board_view.go

@@ -82,7 +82,7 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 				var boardIssues string
 				issues, err = api.ListIssues(apiClient, repo.FullName(), &gitlab.ListProjectIssuesOptions{
 					State:  gitlab.String("opened"),
-					Labels: gitlab.Labels{list.Label.Name},
+					Labels: &gitlab.Labels{list.Label.Name},
 				})
 				if err != nil {
 					return fmt.Errorf("error retrieving list issues: %w", err)

commands/issue/create/issue_create.go

@@ -316,7 +316,7 @@ func createRun(opts *CreateOpts) error {
 
 	if action == cmdutils.SubmitAction {
 		issueCreateOpts.Title = gitlab.String(opts.Title)
-		issueCreateOpts.Labels = opts.Labels
+		*issueCreateOpts.Labels = gitlab.Labels(opts.Labels)
 		issueCreateOpts.Description = &opts.Description
 		if opts.IsConfidential {
 			issueCreateOpts.Confidential = gitlab.Bool(opts.IsConfidential)

commands/issue/list/issue_list.go

@@ -192,11 +192,11 @@ func listRun(opts *ListOptions) error {
 		opts.ListType = "search"
 	}
 	if len(opts.Labels) != 0 {
-		listOpts.Labels = opts.Labels
+		*listOpts.Labels = gitlab.Labels(opts.Labels)
 		opts.ListType = "search"
 	}
 	if len(opts.NotLabels) != 0 {
-		listOpts.NotLabels = opts.NotLabels
+		*listOpts.NotLabels = gitlab.Labels(opts.NotLabels)
 		opts.ListType = "search"
 	}
 	if opts.Milestone != "" {

commands/issue/update/issue_update.go

@@ -85,11 +85,11 @@ func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
 			}
 			if m, _ := cmd.Flags().GetStringSlice("label"); len(m) != 0 {
 				actions = append(actions, fmt.Sprintf("added labels %s", strings.Join(m, " ")))
-				l.AddLabels = gitlab.Labels(m)
+				*l.AddLabels = gitlab.Labels(m)
 			}
 			if m, _ := cmd.Flags().GetStringSlice("unlabel"); len(m) != 0 {
 				actions = append(actions, fmt.Sprintf("removed labels %s", strings.Join(m, " ")))
-				l.RemoveLabels = gitlab.Labels(m)
+				*l.RemoveLabels = gitlab.Labels(m)
 			}
 			if m, _ := cmd.Flags().GetBool("public"); m {
 				actions = append(actions, "made public")
@@ -114,7 +114,7 @@ func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
 				}
 			}
 			if cmd.Flags().Changed("unassign") {
-				l.AssigneeIDs = []int{0} // 0 or an empty int[] is the documented way to unassign
+				l.AssigneeIDs = nil
 				actions = append(actions, "unassigned all users")
 			}
 			if ua != nil {

commands/mr/create/mr_create.go

@@ -285,7 +285,7 @@ func createRun(opts *CreateOpts) error {
 		}
 
 		if opts.CopyIssueLabels {
-			mrCreateOpts.Labels = issue.Labels
+			*mrCreateOpts.Labels = issue.Labels
 		}
 		opts.Description = fmt.Sprintf("Closes #%d", issue.IID)
 		opts.Title = fmt.Sprintf("Resolve \"%s\"", issue.Title)
@@ -500,7 +500,7 @@ func createRun(opts *CreateOpts) error {
 
 	// These actions need to be done here, after the `Add metadata` prompt because
 	// they are metadata that can be modified by the prompt
-	mrCreateOpts.Labels = append(mrCreateOpts.Labels, opts.Labels...)
+	*mrCreateOpts.Labels = append(*mrCreateOpts.Labels, opts.Labels...)
 
 	if len(opts.Assignees) > 0 {
 		users, err := api.UsersByNames(labClient, opts.Assignees)

commands/mr/for/mr_for.go

@@ -105,7 +105,7 @@ func NewCmdFor(f *cmdutils.Factory) *cobra.Command {
 			l := &gitlab.CreateMergeRequestOptions{}
 			l.Title = gitlab.String(mergeTitle)
 			l.Description = gitlab.String(fmt.Sprintf("Closes #%d", issue.IID))
-			l.Labels = gitlab.Labels{mergeLabel}
+			*l.Labels = gitlab.Labels{mergeLabel}
 			l.SourceBranch = gitlab.String(sourceBranch)
 			l.TargetBranch = gitlab.String(targetBranch)
 			if milestone, _ := cmd.Flags().GetInt("milestone"); milestone != -1 {
@@ -118,7 +118,7 @@ func NewCmdFor(f *cmdutils.Factory) *cobra.Command {
 				l.RemoveSourceBranch = gitlab.Bool(true)
 			}
 			if withLables, _ := cmd.Flags().GetBool("with-labels"); withLables {
-				l.Labels = issue.Labels
+				*l.Labels = issue.Labels
 			}
 
 			if a, _ := cmd.Flags().GetString("assignee"); a != "" {
@@ -129,7 +129,7 @@ func NewCmdFor(f *cmdutils.Factory) *cobra.Command {
 					j := utils.StringToInt(i)
 					t2 = append(t2, j)
 				}
-				l.AssigneeIDs = t2
+				l.AssigneeIDs = &t2
 			}
 
 			mr, err := api.CreateMR(apiClient, repo.FullName(), l)

commands/mr/list/mr_list.go

@@ -181,7 +181,7 @@ func listRun(opts *ListOptions) error {
 		opts.ListType = "search"
 	}
 	if len(opts.Labels) > 0 {
-		l.Labels = opts.Labels
+		*l.Labels = gitlab.Labels(opts.Labels)
 		opts.ListType = "search"
 	}
 	if opts.Milestone != "" {

commands/mr/update/mr_update.go

@@ -131,11 +131,11 @@ func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
 
 			if m, _ := cmd.Flags().GetStringSlice("label"); len(m) != 0 {
 				actions = append(actions, fmt.Sprintf("added labels %s", strings.Join(m, " ")))
-				l.AddLabels = gitlab.Labels(m)
+				*l.AddLabels = gitlab.Labels(m)
 			}
 			if m, _ := cmd.Flags().GetStringSlice("unlabel"); len(m) != 0 {
 				actions = append(actions, fmt.Sprintf("removed labels %s", strings.Join(m, " ")))
-				l.RemoveLabels = gitlab.Labels(m)
+				*l.RemoveLabels = gitlab.Labels(m)
 			}
 			if m, _ := cmd.Flags().GetString("target-branch"); m != "" {
 				actions = append(actions, fmt.Sprintf("set target branch to %q", m))
@@ -156,7 +156,7 @@ func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
 				}
 			}
 			if cmd.Flags().Changed("unassign") {
-				l.AssigneeIDs = []int{0} // 0 or an empty int[] is the documented way to unassign
+				l.AssigneeIDs = nil
 				actions = append(actions, "unassigned all users")
 			}
 			if ua != nil {

commands/release/create/create.go

@@ -337,7 +337,7 @@ func createRun(opts *CreateOpts) error {
 		}
 
 		if len(opts.Milestone) > 0 {
-			createOpts.Milestones = opts.Milestone
+			createOpts.Milestones = &opts.Milestone
 		}
 
 		release, _, err = client.Releases.CreateRelease(repo.FullName(), createOpts)
@@ -362,7 +362,7 @@ func createRun(opts *CreateOpts) error {
 		}
 
 		if len(opts.Milestone) > 0 {
-			updateOpts.Milestones = opts.Milestone
+			updateOpts.Milestones = &opts.Milestone
 		}
 
 		release, _, err = client.Releases.UpdateRelease(repo.FullName(), opts.TagName, updateOpts)

commands/release/releaseutils/upload/upload.go

@@ -55,8 +55,14 @@ func (c *Context) UploadFiles(projectID, tagName string) error {
 			color.ProgressIcon(), color.Blue("file"), file.Path,
 			color.Blue("name"), file.Name)
 
+		readCloser, err := file.Open()
+		if err != nil {
+			return err
+		}
+
 		projectFile, _, err := c.Client.Projects.UploadFile(
 			projectID,
+			readCloser,
 			file.Path,
 			nil,
 		)

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/tidwall/pretty v1.2.0
-	github.com/xanzy/go-gitlab v0.51.1
+	github.com/xanzy/go-gitlab v0.59.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
@@ -67,11 +67,11 @@ require (
 	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/yuin/goldmark v1.4.2 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
-	golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 // indirect
-	golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 // indirect
-	golang.org/x/sys v0.0.0-20211103184734-ae416a5f93c7 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

@@ -354,6 +354,8 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/xanzy/go-gitlab v0.51.1 h1:wWKLalwx4omxFoHh3PLs9zDgAD4GXDP/uoxwMRCSiWM=
 github.com/xanzy/go-gitlab v0.51.1/go.mod h1:Q+hQhV508bDPoBijv7YjK/Lvlb4PhVhJdKqXVQrUoAE=
+github.com/xanzy/go-gitlab v0.59.0 h1:fAr6rT/YIdfmBavYgI42+Op7yAAex2Y4xOfvbjN9hxQ=
+github.com/xanzy/go-gitlab v0.59.0/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -460,6 +462,9 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 h1:VrJZAjbekhoRn7n5FBujY31gboH+iB3pdLxn3gE9FjU=
 golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -475,6 +480,8 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 h1:v79phzBz03tsVCUTbvTBmmC3CUXF5mKYt7DA4ZVldpM=
 golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM=
+golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -538,6 +545,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211103184734-ae416a5f93c7 h1:wQUOddybiV2Rfc8FX691KCOx5yEoZlfwpBjtKV6huYo=
 golang.org/x/sys v0.0.0-20211103184734-ae416a5f93c7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -559,6 +568,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs=
+golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=