Promoted (most of) the supported cloud identity resources to GA #4211

melinath · 2020-11-09T22:00:55Z

Resolved hashicorp/terraform-provider-google#7757.

Notes:

Enabled additional_keys and member_key fields, beta-only
Removed references to dynamic groups; they are in the API but will require additional work because they require a premium SKU to test. Since they were already not included in the provider, we don't lose anything by fully deleting them.

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)

cloud_identity: promoted `google_cloud_identity_group` to GA

cloud_identity: promoted `google_cloud_identity_group_membership` to GA

cloud_identity: promoted data source `google_cloud_identity_groups` to GA

cloud_identity: promoted data source `google_cloud_identity_group_memberships` to GA

modular-magician · 2020-11-09T22:09:09Z

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

Diff report:

Terraform GA: Diff ( 15 files changed, 1792 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 8 files changed, 120 insertions(+), 23 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-09T22:09:17Z

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

modular-magician · 2020-11-09T22:21:49Z

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

Diff report:

Terraform GA: Diff ( 15 files changed, 1788 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 8 files changed, 120 insertions(+), 27 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-09T22:21:56Z

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

…ty test code

modular-magician · 2020-11-09T22:40:49Z

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

Diff report:

Terraform GA: Diff ( 15 files changed, 1787 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 8 files changed, 120 insertions(+), 28 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-09T22:40:58Z

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

melinath · 2020-11-09T23:42:30Z

non-beta test run here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=156843

modular-magician · 2020-11-10T16:58:48Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1790 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 9 files changed, 300 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-10T16:58:54Z

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

…hipDestroyProducer

modular-magician · 2020-11-10T17:20:34Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1790 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 9 files changed, 270 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-10T17:20:43Z

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

modular-magician · 2020-11-10T18:01:06Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1767 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 10 files changed, 649 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-10T18:01:16Z

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

modular-magician · 2020-11-10T18:36:54Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1721 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 10 files changed, 361 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-10T18:37:01Z

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

modular-magician · 2020-11-11T00:02:55Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1699 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 9 files changed, 179 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-11T00:03:05Z

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

modular-magician · 2020-11-11T16:48:23Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1696 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 9 files changed, 176 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-11T16:48:30Z

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

slevenick · 2020-11-11T18:55:42Z

templates/terraform/examples/cloud_identity_group_membership_user.tf.erb

  group    = google_cloud_identity_group.group.id

-  member_key {
+  preferred_member_key {


Why is the name changing here?

member_key is only supported in the beta API. This test is being run against the GA API; member_key usage is instead handled by handwritten tests in third_party/terraform/tests/resource_cloud_identity_group_membership_test.go.erb

products/cloudidentity/api.yaml

slevenick · 2020-11-11T19:05:45Z

products/cloudidentity/api.yaml

@@ -222,6 +143,7 @@ objects:
        input: true
        description: |
          EntityKey of the member.
+        min_version: beta


How does exactly_one_of work when one field is beta and one isn't?

It looks like exactly_one_of is converted directly into terraform, but using get_property_schema_path and array.compact, which seems to be eliminating the beta field from the resulting golang code.

In other words, in GA, the go code ends up with a "exactly one of" constraint that doesn't include beta fields - in this case meaning it only contains one property, at least one of which much be specified, which I believe is the correct behavior.

modular-magician · 2020-11-11T21:48:29Z

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

Diff report:

Terraform GA: Diff ( 16 files changed, 1696 insertions(+), 15 deletions(-))
Terraform Beta: Diff ( 9 files changed, 176 insertions(+), 32 deletions(-))
TF Conversion: Diff ( 3 files changed, 265 insertions(+))

modular-magician · 2020-11-11T21:48:36Z

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

melinath · 2020-11-11T22:09:18Z

Everything still passes after correcting the GA url so I'm gonna go ahead and merge.

https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=157312
https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=157314

rileykarson

I think we need to un-guard these lines as well, to make the datasources appear at GA: https://github.com/GoogleCloudPlatform/magic-modules/blob/master/third_party/terraform/utils/provider.go.erb#L183-L186

That should additionally resolve the unused code warnings in tpg eg https://travis-ci.org/github/hashicorp/terraform-provider-google/builds/743049795

melinath · 2020-11-12T19:44:19Z

Thanks Riley - I've opened #4229 making that change!

melinath added 5 commits November 9, 2020 11:55

Promoted supported cloud identity APIs to GA

497f4bd

Removed trailing references to cloudidentity v1beta1 api

9e6ec8c

cloud identity group membership member_key is still in beta

b404052

Use v1beta1 cloudidentity sdk in beta

fc5d401

Skip tests relying on cust_id and identity_user if not set

09cc045

google-cla bot added the cla: yes label Nov 9, 2020

Removed trailing references to beta provider in data source tests

519a5e7

melinath force-pushed the tpg-7757 branch from 28a4dde to 88141f1 Compare November 9, 2020 22:22

Corrected trailing references to google-beta provider in cloud identi…

cf769cd

…ty test code

melinath force-pushed the tpg-7757 branch from 88141f1 to cf769cd Compare November 9, 2020 22:32

melinath marked this pull request as ready for review November 9, 2020 22:33

Moved tests involving member_key to beta-only

1d9a9cc

Removed duplicate func in beta: testAccCheckCloudIdentityGroupMembers…

f0a2e81

…hipDestroyProducer

Enabled / marked remaining beta fields

486deb8

Removed dynamic groups because they require a premium SKU

5bd3096

Removed references to additionalGroupKeys

ec15422

Fixed test file imports

31579d1

melinath requested a review from slevenick November 11, 2020 17:15

slevenick reviewed Nov 11, 2020

View reviewed changes

slevenick approved these changes Nov 11, 2020

View reviewed changes

Corrected Cloud Identity GA version to use GA api

69e3111

melinath merged commit 4639b3d into GoogleCloudPlatform:master Nov 11, 2020

melinath deleted the tpg-7757 branch November 11, 2020 22:09

rileykarson reviewed Nov 12, 2020

View reviewed changes

melinath mentioned this pull request Nov 12, 2020

Added cloud identity data sources to GA #4229

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Promoted (most of) the supported cloud identity resources to GA #4211

Promoted (most of) the supported cloud identity resources to GA #4211

melinath commented Nov 9, 2020 •

edited

Loading

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

melinath commented Nov 9, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

modular-magician commented Nov 11, 2020

modular-magician commented Nov 11, 2020

modular-magician commented Nov 11, 2020

modular-magician commented Nov 11, 2020

slevenick Nov 11, 2020

melinath Nov 11, 2020

slevenick Nov 11, 2020

melinath Nov 11, 2020

modular-magician commented Nov 11, 2020

modular-magician commented Nov 11, 2020

melinath commented Nov 11, 2020

rileykarson left a comment •

edited

Loading

melinath commented Nov 12, 2020

Promoted (most of) the supported cloud identity resources to GA #4211

Promoted (most of) the supported cloud identity resources to GA #4211

Conversation

melinath commented Nov 9, 2020 • edited Loading

modular-magician commented Nov 9, 2020

Diff report:

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

Diff report:

modular-magician commented Nov 9, 2020

modular-magician commented Nov 9, 2020

Diff report:

modular-magician commented Nov 9, 2020

melinath commented Nov 9, 2020

modular-magician commented Nov 10, 2020

Diff report:

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

Diff report:

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

Diff report:

modular-magician commented Nov 10, 2020

modular-magician commented Nov 10, 2020

Diff report:

modular-magician commented Nov 10, 2020

modular-magician commented Nov 11, 2020

Diff report:

modular-magician commented Nov 11, 2020

modular-magician commented Nov 11, 2020

Diff report:

modular-magician commented Nov 11, 2020

slevenick Nov 11, 2020

Choose a reason for hiding this comment

melinath Nov 11, 2020

Choose a reason for hiding this comment

slevenick Nov 11, 2020

Choose a reason for hiding this comment

melinath Nov 11, 2020

Choose a reason for hiding this comment

modular-magician commented Nov 11, 2020

Diff report:

modular-magician commented Nov 11, 2020

melinath commented Nov 11, 2020

rileykarson left a comment • edited Loading

Choose a reason for hiding this comment

melinath commented Nov 12, 2020

melinath commented Nov 9, 2020 •

edited

Loading

rileykarson left a comment •

edited

Loading