Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add management_project_id for Group and Project Clusters #301

Merged
merged 1 commit into from May 30, 2020

Conversation

magic7s
Copy link
Contributor

@magic7s magic7s commented Apr 18, 2020

Adds management_project_id as an option to Group and Project Clusters.
Requires GitLab 12.10
Option Documentation: https://docs.gitlab.com/ee/api/group_clusters.html#add-existing-cluster-to-group

@magic7s magic7s marked this pull request as draft April 18, 2020 15:36
@magic7s
Copy link
Contributor Author

magic7s commented Apr 18, 2020

Moving to draft until GitLab 12.10 is released and tests will pass.

@ghost ghost added size/L and removed size/M labels Apr 18, 2020
@magic7s
Copy link
Contributor Author

magic7s commented Apr 18, 2020

Tests passing on gitlab.com version GitLab Enterprise Edition 12.10.0-pre 462a6166989

$ TESTARGS="-run Cluster" make testacc
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test -v ./gitlab -run Cluster -timeout 40m
=== RUN   TestAccGitlabGroupCluster_basic
--- PASS: TestAccGitlabGroupCluster_basic (59.58s)
=== RUN   TestAccGitlabGroupCluster_import
--- PASS: TestAccGitlabGroupCluster_import (20.81s)
=== RUN   TestAccGitlabProjectCluster_basic
--- PASS: TestAccGitlabProjectCluster_basic (47.39s)
=== RUN   TestAccGitlabProjectCluster_import
--- PASS: TestAccGitlabProjectCluster_import (16.97s)
PASS
ok  	github.com/terraform-providers/terraform-provider-gitlab/gitlab	145.229s

@magic7s magic7s marked this pull request as ready for review April 24, 2020 16:36
@magic7s
Copy link
Contributor Author

magic7s commented Apr 24, 2020

Ready for first review. Tests passing.

@magic7s
Copy link
Contributor Author

magic7s commented May 16, 2020

@roidelapluie wondering if you could take a look at this. It's blocking another project. Thanks!

@magic7s
Copy link
Contributor Author

magic7s commented May 30, 2020

@ringods could you please review this?

@ringods
Copy link
Contributor

ringods commented May 30, 2020

@magic7s if you could rebase this PR and squash some of your commits for a cleaner history, I'll merge immediately after that. You will also notice that the EE tests will be skipped instead of fail after the rebase, which is more clear as an input for merging. 😉

@ghost ghost added size/XXL and removed size/L labels May 30, 2020
@magic7s magic7s force-pushed the add-cluster-management-proj-id branch from 64b54c4 to 7ef503b Compare May 30, 2020 16:12
@ghost ghost added size/L and removed size/XXL labels May 30, 2020
@magic7s magic7s force-pushed the add-cluster-management-proj-id branch from 7ef503b to 8b11b75 Compare May 30, 2020 16:20
@ringods
Copy link
Contributor

ringods commented May 30, 2020

Failing test is related to #319.

@ringods ringods merged commit 343e93a into gitlabhq:master May 30, 2020
@magic7s
Copy link
Contributor Author

magic7s commented May 30, 2020

Thanks @ringods ! I thought PRs would squash on merge.

@magic7s
Copy link
Contributor Author

magic7s commented May 30, 2020

Now we just need a new release when you are ready. =)

@ringods
Copy link
Contributor

ringods commented May 31, 2020

@magic7s Github as an option to squash on merge but I usually choose not to do that. It is your work, so I rather let you choose how much commits you leave in the PR and the commit comments.
Also, Github will not rebase automatically on merge. Given a number of PRs are open for quite a while, I am interested to see each set of changes on the tip of master to prevent unexpected behaviour.

@ringods
Copy link
Contributor

ringods commented Jun 2, 2020

Released in v2.9.0

ahmet2mir pushed a commit to ahmet2mir/terraform-provider-gitlab that referenced this pull request Sep 15, 2020
…roj-id

Add management_project_id for Group and Project Clusters
@github-actions github-actions bot locked and limited conversation to collaborators Nov 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
2 participants