Skip to content

Commit d9818d1

Browse files
sfang97sfang97
and
sfang97
authoredAug 7, 2020
Bump go-gitlab to v.0.34.1 (#378)
* Fix variable passed to ListLabelsOptions Needed to fix nested struct format * Don't need go mod changes * Add back go mod * Bump to 0.34.1 * Add 0.34.1 to modules.txt * Revert "Add 0.34.1 to modules.txt" This reverts commit 2ac4e3e. * Add vendor files for bump Co-authored-by: sfang97 <[email protected]>
1 parent 594b1c2 commit d9818d1

23 files changed

+861
-108
lines changed
 

‎gitlab/resource_gitlab_label.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func resourceGitlabLabelRead(d *schema.ResourceData, meta interface{}) error {
6969
page := 1
7070
labelsLen := 0
7171
for page == 1 || labelsLen != 0 {
72-
labels, _, err := client.Labels.ListLabels(project, &gitlab.ListLabelsOptions{Page: page})
72+
labels, _, err := client.Labels.ListLabels(project, &gitlab.ListLabelsOptions{ListOptions: gitlab.ListOptions{Page: page}})
7373
if err != nil {
7474
return err
7575
}

‎gitlab/resource_gitlab_label_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func testAccCheckGitlabLabelExists(n string, label *gitlab.Label) resource.TestC
103103
}
104104
conn := testAccProvider.Meta().(*gitlab.Client)
105105

106-
labels, _, err := conn.Labels.ListLabels(repoName, &gitlab.ListLabelsOptions{PerPage: 1000})
106+
labels, _, err := conn.Labels.ListLabels(repoName, &gitlab.ListLabelsOptions{ListOptions: gitlab.ListOptions{PerPage: 1000}})
107107
if err != nil {
108108
return err
109109
}

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-gitlab
33
require (
44
github.com/hashicorp/terraform-plugin-sdk v1.13.1
55
github.com/mitchellh/hashstructure v1.0.0
6-
github.com/xanzy/go-gitlab v0.32.1
6+
github.com/xanzy/go-gitlab v0.34.1
77
)
88

99
go 1.14

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
192192
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
193193
github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
194194
github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
195-
github.com/xanzy/go-gitlab v0.32.1 h1:eKGfAP2FWbqStD7DtGoRBb18IYwjuCxdtEVea2rNge4=
196-
github.com/xanzy/go-gitlab v0.32.1/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
195+
github.com/xanzy/go-gitlab v0.34.1 h1:Dtqla2gWIQIevfZVS6FY4qjgrKf+5LYLzW6XBNstGSw=
196+
github.com/xanzy/go-gitlab v0.34.1/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
197197
github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
198198
github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
199199
github.com/zclconf/go-cty v1.2.1 h1:vGMsygfmeCl4Xb6OA5U5XVAaQZ69FvoG7X2jUtQujb8=

‎vendor/github.com/xanzy/go-gitlab/README.md

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/event_webhook_types.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/gitlab.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/group_clusters.go

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/group_labels.go

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/group_members.go

+44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/group_milestones.go

+39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/xanzy/go-gitlab/groups.go

+41-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.