resource/gitlab_project: Fix admin token requirement to check default branch protection #1169
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timofurrer
changed the title
github-actions
bot
added
documentation
provider
resource
RicePatrick
reviewed
Jul 11, 2022
RicePatrick
reviewed
Jul 11, 2022
RicePatrick
previously approved these changes
Jul 11, 2022
timofurrer
force-pushed
the
bugfix/1167
branch
2 times, most recently
from
19a2c11 to
a8cc890
Compare
RicePatrick
previously approved these changes
Jul 11, 2022
RicePatrick
previously approved these changes
Jul 11, 2022
|
Holding little bit on this before we merge it - Timo and I have an outstanding discussion on Discord around whether we need to store this value in state. We likely do, because otherwise we'll have non-empty plans on subsequent runs. |
timofurrer
force-pushed
the
bugfix/1167
branch
2 times, most recently
from
bb825ec to
22cd624
Compare
… branch protection This bugfix change set gracefully handles checking for the instance-level default branch protection setting if the provider token is not from an administrator user. This bug was introduced in gitlabhq#1128 in an attempt to check the instance-level wide settings - which unfortunately, and not to my knowledge at the time requires an admin token. In case the token is not from an admin the project resource won't check for the settings and by default restore the faulty behavior before gitlabhq#1128 which was to wait for the default branch protection to be created. However, if this won't happen because it's disabled on the instance-level the user can set `skip_wait_for_default_branch_protection = true` which skips waiting for the default branch protection. Closes: #1167
RicePatrick
approved these changes
Jul 11, 2022
|
This functionality has been released in v3.16.1 of the Terraform GitLab Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. For further feature requests or bug reports with this functionality, please create a new GitHub issue. Thank you! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This bugfix change set gracefully handles checking for the
instance-level default branch protection setting if the provider token
is not from an administrator user.
This bug was introduced in
#1128 in an
attempt to check the instance-level wide settings - which unfortunately,
and not to my knowledge at the time requires an admin token.
In case the token is not from an admin the project resource won't check
for the settings and by default restore the faulty behavior before #1128
which was to wait for the default branch protection to be created.
However, if this won't happen because it's disabled on the
instance-level the user can set
skip_wait_for_default_branch_protection = truewhich skips waiting forthe default branch protection.
Closes: #1167