Upgrade to go-gitlab v0.54.3. Closes #781

timofurrer · timofurrer · commit 1a6c166796d3 · 2022-01-27T21:14:42.000+01:00
diff --git a/gitlab/resource_gitlab_branch_protection.go b/gitlab/resource_gitlab_branch_protection.go
@@ -113,8 +113,8 @@ func resourceGitlabBranchProtectionCreate(ctx context.Context, d *schema.Resourc
 		Name:                      &branch,
 		PushAccessLevel:           &pushAccessLevel,
 		MergeAccessLevel:          &mergeAccessLevel,
-		AllowedToPush:             allowedToPush,
-		AllowedToMerge:            allowedToMerge,
+		AllowedToPush:             &allowedToPush,
+		AllowedToMerge:            &allowedToMerge,
 		CodeOwnerApprovalRequired: &codeOwnerApprovalRequired,
 	}, gitlab.WithContext(ctx))
 	if err != nil {
diff --git a/gitlab/resource_gitlab_deploy_token.go b/gitlab/resource_gitlab_deploy_token.go
@@ -112,7 +112,7 @@ func resourceGitlabDeployTokenCreate(ctx context.Context, d *schema.ResourceData
 			Name:      gitlab.String(d.Get("name").(string)),
 			Username:  gitlab.String(d.Get("username").(string)),
 			ExpiresAt: expiresAt,
-			Scopes:    *scopes,
+			Scopes:    scopes,
 		}
 
 		log.Printf("[DEBUG] Create GitLab deploy token %s in project %s", *options.Name, project.(string))
@@ -124,7 +124,7 @@ func resourceGitlabDeployTokenCreate(ctx context.Context, d *schema.ResourceData
 			Name:      gitlab.String(d.Get("name").(string)),
 			Username:  gitlab.String(d.Get("username").(string)),
 			ExpiresAt: expiresAt,
-			Scopes:    *scopes,
+			Scopes:    scopes,
 		}
 
 		log.Printf("[DEBUG] Create GitLab deploy token %s in group %s", *options.Name, group.(string))
diff --git a/gitlab/resource_gitlab_project_access_token.go b/gitlab/resource_gitlab_project_access_token.go
@@ -85,7 +85,7 @@ func resourceGitlabProjectAccessTokenCreate(ctx context.Context, d *schema.Resou
 	project := d.Get("project").(string)
 	options := &gitlab.CreateProjectAccessTokenOptions{
 		Name:   gitlab.String(d.Get("name").(string)),
-		Scopes: *stringSetToStringSlice(d.Get("scopes").(*schema.Set)),
+		Scopes: stringSetToStringSlice(d.Get("scopes").(*schema.Set)),
 	}
 
 	log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s for project ID %s", *options.Name, options.Scopes, project)
diff --git a/gitlab/resource_gitlab_project_approval_rule.go b/gitlab/resource_gitlab_project_approval_rule.go
@@ -240,22 +240,22 @@ func flattenProtectedBranchIDs(protectedBranches []*gitlab.ProtectedBranch) []in
 }
 
 // expandApproverIds Expands an interface into a list of ints to read from state.
-func expandApproverIds(ids interface{}) []int {
+func expandApproverIds(ids interface{}) *[]int {
 	var approverIDs []int
 
 	for _, id := range ids.(*schema.Set).List() {
 		approverIDs = append(approverIDs, id.(int))
 	}
 
-	return approverIDs
+	return &approverIDs
 }
 
-func expandProtectedBranchIDs(ids interface{}) []int {
+func expandProtectedBranchIDs(ids interface{}) *[]int {
 	var protectedBranchIDs []int
 
 	for _, id := range ids.(*schema.Set).List() {
 		protectedBranchIDs = append(protectedBranchIDs, id.(int))
 	}
 
-	return protectedBranchIDs
+	return &protectedBranchIDs
 }
diff --git a/go.mod b/go.mod
@@ -9,5 +9,5 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/hashstructure v1.1.0
 	github.com/onsi/gomega v1.18.0
-	github.com/xanzy/go-gitlab v0.51.1
+	github.com/xanzy/go-gitlab v0.54.3
 )
diff --git a/go.sum b/go.sum
@@ -162,8 +162,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -391,8 +391,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.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.54.3 h1:fPfZ3Jcu5dPc3xyIYtAALZsEgoyKNFNuULD+TdJ7Zvk=
+github.com/xanzy/go-gitlab v0.54.3/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func resourceGitlabProjectAccessTokenCreate(ctx context.Context, d *schema.Resou`
`85`	`85`	`project := d.Get("project").(string)`
`86`	`86`	`options := &gitlab.CreateProjectAccessTokenOptions{`
`87`	`87`	`Name: gitlab.String(d.Get("name").(string)),`
`88`		`- Scopes: stringSetToStringSlice(d.Get("scopes").(schema.Set)),`
	`88`	`+ Scopes: stringSetToStringSlice(d.Get("scopes").(*schema.Set)),`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`log.Printf("[DEBUG] create gitlab ProjectAccessToken %s %s for project ID %s", *options.Name, options.Scopes, project)`
Original file line number	Diff line number	Diff line change
`@@ -240,22 +240,22 @@ func flattenProtectedBranchIDs(protectedBranches []*gitlab.ProtectedBranch) []in`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`// expandApproverIds Expands an interface into a list of ints to read from state.`
`243`		`-func expandApproverIds(ids interface{}) []int {`
	`243`	`+func expandApproverIds(ids interface{}) *[]int {`
`244`	`244`	`var approverIDs []int`
`245`	`245`
`246`	`246`	`for _, id := range ids.(*schema.Set).List() {`
`247`	`247`	`approverIDs = append(approverIDs, id.(int))`
`248`	`248`	`}`
`249`	`249`
`250`		`- return approverIDs`
	`250`	`+ return &approverIDs`
`251`	`251`	`}`
`252`	`252`
`253`		`-func expandProtectedBranchIDs(ids interface{}) []int {`
	`253`	`+func expandProtectedBranchIDs(ids interface{}) *[]int {`
`254`	`254`	`var protectedBranchIDs []int`
`255`	`255`
`256`	`256`	`for _, id := range ids.(*schema.Set).List() {`
`257`	`257`	`protectedBranchIDs = append(protectedBranchIDs, id.(int))`
`258`	`258`	`}`
`259`	`259`
`260`		`- return protectedBranchIDs`
	`260`	`+ return &protectedBranchIDs`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ require (`
`9`	`9`	`github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1`
`10`	`10`	`github.com/mitchellh/hashstructure v1.1.0`
`11`	`11`	`github.com/onsi/gomega v1.18.0`
`12`		`- github.com/xanzy/go-gitlab v0.51.1`
	`12`	`+ github.com/xanzy/go-gitlab v0.54.3`
`13`	`13`	`)`