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

Support organization iam conditions #4749

Merged

Conversation

melinath
Copy link
Member

@melinath melinath commented Apr 29, 2021

Resolved hashicorp/terraform-provider-google#8904. Organization IAM via terraform didn't properly support v3 policies (i.e. with conditions) resulting in the google API error:

Error 400: Policy cannot contain both conditions and condition hashes. Please update your client to request version 3 policy. For more information, please refer to https://cloud.google.com/iam/docs/policies#versions.

Note that the tests don't run in CI/CD so if you want to verify that they work at all (or that they don't work at places they're expected not to) you'll need to do so locally by setting your environment variables for a personal org and running:

TF_RUN_ORG_IAM=true make testacc TEST=./google TESTARGS='-run="TestAccOrganizationIamMembersAndBindings'

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

resourcemanager: fixed broken handling of IAM conditions for `google_organization_iam_member`, `google_organization_iam_binding`, and `google_organization_iam_policy`

@google-cla google-cla bot added the cla: yes label Apr 29, 2021
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 1 file changed, 132 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 1 file changed, 132 insertions(+), 6 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184945"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeBackendService_internalLoadBalancing|TestAccComputeInstance_serviceAccount_updated0to1to0scopes You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=184948"

@melinath melinath requested review from a team and c2thorn and removed request for a team April 30, 2021 17:59
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 175 insertions(+), 17 deletions(-))
Terraform Beta: Diff ( 6 files changed, 176 insertions(+), 18 deletions(-))
TF Conversion: Diff ( 2 files changed, 10 insertions(+), 2 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=185103"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeBackendService_internalLoadBalancing You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=185105"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants