Upgrade to go-gitlab v0.55.0

timofurrer · timofurrer · commit 4feb6565d1c5 · 2022-02-10T14:53:39.000+01:00
diff --git a/go.mod b/go.mod
@@ -5,11 +5,12 @@ go 1.16
 require (
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/aws/aws-sdk-go v1.37.0 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/hcl/v2 v2.8.2 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/hashstructure v1.1.0
 	github.com/onsi/gomega v1.18.1
-	github.com/xanzy/go-gitlab v0.54.4
+	github.com/xanzy/go-gitlab v0.55.0
 	google.golang.org/api v0.34.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -344,8 +344,8 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaU
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/xanzy/go-gitlab v0.54.4 h1:3CFEdQ9O+bFx3BsyuOK0gqgLPwnT2rwnPOjudV07wTw=
-github.com/xanzy/go-gitlab v0.54.4/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
+github.com/xanzy/go-gitlab v0.55.0 h1:klg5EgPYtsF6QlnVFpOpv/FmhqQxCUUG7zLJIL1NKz8=
+github.com/xanzy/go-gitlab v0.55.0/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/internal/provider/resource_gitlab_group_label.go b/internal/provider/resource_gitlab_group_label.go
@@ -85,7 +85,7 @@ func resourceGitlabGroupLabelRead(ctx context.Context, d *schema.ResourceData, m
 	page := 1
 	labelsLen := 0
 	for page == 1 || labelsLen != 0 {
-		labels, _, err := client.GroupLabels.ListGroupLabels(group, &gitlab.ListGroupLabelsOptions{Page: page}, gitlab.WithContext(ctx))
+		labels, _, err := client.GroupLabels.ListGroupLabels(group, &gitlab.ListGroupLabelsOptions{ListOptions: gitlab.ListOptions{Page: page}}, gitlab.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
 		}
diff --git a/internal/provider/resource_gitlab_group_label_test.go b/internal/provider/resource_gitlab_group_label_test.go
@@ -140,7 +140,7 @@ func testAccCheckGitlabGroupLabelExists(n string, label *gitlab.GroupLabel) reso
 			return fmt.Errorf("No group ID is set")
 		}
 
-		labels, _, err := testGitlabClient.GroupLabels.ListGroupLabels(groupName, &gitlab.ListGroupLabelsOptions{PerPage: 1000})
+		labels, _, err := testGitlabClient.GroupLabels.ListGroupLabels(groupName, &gitlab.ListGroupLabelsOptions{ListOptions: gitlab.ListOptions{PerPage: 1000}})
 		if err != nil {
 			return err
 		}
diff --git a/internal/provider/resource_gitlab_project_variable.go b/internal/provider/resource_gitlab_project_variable.go
@@ -203,7 +203,7 @@ func resourceGitlabProjectVariableDelete(ctx context.Context, d *schema.Resource
 	// but it will be ignored in prior versions, causing nondeterministic destroy behavior when
 	// destroying or updating scoped variables.
 	// ref: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39209
-	_, err := client.ProjectVariables.RemoveVariable(project, key, withEnvironmentScopeFilter(ctx, environmentScope))
+	_, err := client.ProjectVariables.RemoveVariable(project, key, nil, withEnvironmentScopeFilter(ctx, environmentScope))
 	return augmentProjectVariableClientError(d, err)
 }
 
diff --git a/internal/provider/resource_gitlab_project_variable_test.go b/internal/provider/resource_gitlab_project_variable_test.go
@@ -106,7 +106,7 @@ resource "gitlab_project_variable" "foo" {
 			// Check that the variable is recreated if deleted out-of-band.
 			{
 				PreConfig: func() {
-					if _, err := testGitlabClient.ProjectVariables.RemoveVariable(ctx.project.ID, "my_key"); err != nil {
+					if _, err := testGitlabClient.ProjectVariables.RemoveVariable(ctx.project.ID, "my_key", nil); err != nil {
 						t.Fatalf("failed to remove variable: %v", err)
 					}
 				},

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func resourceGitlabGroupLabelRead(ctx context.Context, d *schema.ResourceData, m`
`85`	`85`	`page := 1`
`86`	`86`	`labelsLen := 0`
`87`	`87`	`for page == 1 \|\| labelsLen != 0 {`
`88`		`- labels, _, err := client.GroupLabels.ListGroupLabels(group, &gitlab.ListGroupLabelsOptions{Page: page}, gitlab.WithContext(ctx))`
	`88`	`+ labels, _, err := client.GroupLabels.ListGroupLabels(group, &gitlab.ListGroupLabelsOptions{ListOptions: gitlab.ListOptions{Page: page}}, gitlab.WithContext(ctx))`
`89`	`89`	`if err != nil {`
`90`	`90`	`return diag.FromErr(err)`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func testAccCheckGitlabGroupLabelExists(n string, label *gitlab.GroupLabel) reso`
`140`	`140`	`return fmt.Errorf("No group ID is set")`
`141`	`141`	`}`
`142`	`142`
`143`		`- labels, _, err := testGitlabClient.GroupLabels.ListGroupLabels(groupName, &gitlab.ListGroupLabelsOptions{PerPage: 1000})`
	`143`	`+ labels, _, err := testGitlabClient.GroupLabels.ListGroupLabels(groupName, &gitlab.ListGroupLabelsOptions{ListOptions: gitlab.ListOptions{PerPage: 1000}})`
`144`	`144`	`if err != nil {`
`145`	`145`	`return err`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ func resourceGitlabProjectVariableDelete(ctx context.Context, d *schema.Resource`
`203`	`203`	`// but it will be ignored in prior versions, causing nondeterministic destroy behavior when`
`204`	`204`	`// destroying or updating scoped variables.`
`205`	`205`	`// ref: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39209`
`206`		`- _, err := client.ProjectVariables.RemoveVariable(project, key, withEnvironmentScopeFilter(ctx, environmentScope))`
	`206`	`+ _, err := client.ProjectVariables.RemoveVariable(project, key, nil, withEnvironmentScopeFilter(ctx, environmentScope))`
`207`	`207`	`return augmentProjectVariableClientError(d, err)`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ resource "gitlab_project_variable" "foo" {`
`106`	`106`	`// Check that the variable is recreated if deleted out-of-band.`
`107`	`107`	`{`
`108`	`108`	`PreConfig: func() {`
`109`		`- if _, err := testGitlabClient.ProjectVariables.RemoveVariable(ctx.project.ID, "my_key"); err != nil {`
	`109`	`+ if _, err := testGitlabClient.ProjectVariables.RemoveVariable(ctx.project.ID, "my_key", nil); err != nil {`
`110`	`110`	`t.Fatalf("failed to remove variable: %v", err)`
`111`	`111`	`}`
`112`	`112`	`},`