Merge pull request #805 from timofurrer/feature/upgrade-go-gitlab

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

Author: armsnyder

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 {

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))

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)

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
 }

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
 )

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=