Add instance clusters to Terraform provider

[sfang97]

Add support for instance level cluster management via the Gitlab Terraform provider. Since instance cluster API has been added to Gitlab, instance cluster management should also be added to Terraform provider. The API implementation is in the upstream package

[sfang97]

Currently the CI checker is failing because "Unchanged files with check annotations" in vendor/github.com/xanzy/go-gitlab/labels.go. When I run go mod vendor a few files get modified including labels.go, and then when I run make build I get the Error: gitlab/resource_gitlab_label.go:72:81: cannot use promoted field ListOptions.Page in struct literal of type gitlab.ListLabelsOptions. After I git restore labels.go, make build passes. I'd appreciate any insight on how to fix this!

[stanhu]

@sfang97 Try this:

diff --git a/gitlab/resource_gitlab_label.go b/gitlab/resource_gitlab_label.go
index de1a3fe..f2fe533 100644
--- a/gitlab/resource_gitlab_label.go
+++ b/gitlab/resource_gitlab_label.go
@@ -69,7 +69,7 @@ func resourceGitlabLabelRead(d *schema.ResourceData, meta interface{}) error {
 	page := 1
 	labelsLen := 0
 	for page == 1 || labelsLen != 0 {
-		labels, _, err := client.Labels.ListLabels(project, &gitlab.ListLabelsOptions{Page: page})
+		labels, _, err := client.Labels.ListLabels(project, &gitlab.ListLabelsOptions{ListOptions: gitlab.ListOptions{Page: page}})
 		if err != nil {
 			return err
 		}

See golang/go#9859 for more details.

[stanhu]

I'm also wondering if the build weirdness is caused by this error that I got:

$ make
==> Checking that code complies with gofmt requirements...
go install
go: inconsistent vendoring in /Users/stanhu/github/terraform-provider-gitlab:
	github.com/xanzy/go-gitlab@v0.32.1: is replaced in go.mod, but not marked as replaced in vendor/modules.txt

run 'go mod vendor' to sync, or use -mod=mod or -mod=readonly to ignore the vendor directory

[sfang97]

@stanhu Thanks Stan, I tried replacing the line but no dice. The issue seems to be coming from the changes to label.go in the go-gitlab upstream package that aren't in the vendor file-- the last commit to the vendor version was 3 months ago, and the last commit to the go-gitlab package was 21 days ago, so I'm going to guess that something about the most recent change is making the compiler unhappy. I'll dig around in the diffs more to see if I can figure out what's going on.

As for the weird go mod vendor error, the command is supposed to make a copy of the packages needed for the build/tests, so I can tell that it's trying to replace github.com/xanzy/go-gitlab v0.32.1 with github.com/sfang97/go-gitlab v0.33.1-0.20200731201522-09106effb0dc (< my unmerged change) which is correct. I'm not sure how to run that command in the CI check though?

[sfang97]

@roidelapluie Hi there Julien! 👋 Could you review this PR?

[roidelapluie]

LGTM, some comments

[sfang97]

@roidelapluie Thanks for the review Julien, I've applied the changes-- take another look? 🏓

[nicholasklick]

@armsnyder mind taking a pass at this?

[armsnyder]

Looks good! I left some clarifying questions and minor suggestions for ya.

[armsnyder]

Looks like this MR needs a rebase as well.

[sfang97]

@armsnyder Thanks for the reviews Adam, I've applied the non-breaking changes and temporarily reverted the ones that are waiting for the go-gitlab changes to go in. Once those go in I can open a new PR in the terraform repo to reflect those changes. Take another look? :) 🏓

[armsnyder]

lgtm

[nicholasklick]

So can we merge this?

[sfang97]

@nicholasklick I think this can be merged, @armsnyder @roidelapluie what do y'all think?

[armsnyder]

@sfang97 Go ahead, unless you're waiting for @roidelapluie's feedback.

[armsnyder]

@sfang97 plz squash-merge lol 80 commits

[armsnyder]

@sfang97 That's fine how you did it, but for future reference, I meant that when you merge this PR from the GitHub UI there is an option to squash. That way you don't risk making any mistakes after the PR's already approved, too.

[sfang97]

@armsnyder Oops, understood! Thanks for the tip :)