More handwritten ids #2527

slevenick · 2019-10-24T00:05:46Z

More handwritten id updates for 3.0.0 release.
Includes:
resource_compute_region_instance_group_manager.go.erb
resource_compute_security_policy.go
resource_compute_target_pool.go
resource_container_cluster.go.erb

Release Note Template for Downstream PRs (will be copied)

modular-magician · 2019-10-24T00:12:49Z

3.0.0 diff report as of 37ecb4f90292cd7def2051db53d7d06ae48283d2

TPG Diff
TPGB Diff
Mapper Diff

googlebot · 2019-10-24T21:11:51Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

danawillow · 2019-10-24T23:32:58Z

Looks like the magician got sad on your most recent commit, btw

googlebot · 2019-10-24T23:38:02Z

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

slevenick · 2019-10-24T23:39:36Z

Looks like the magician got sad on your most recent commit, btw

My rebase caught some other commits somehow! Fixed

danawillow · 2019-10-24T23:37:26Z

third_party/terraform/resources/resource_container_cluster.go.erb

 	default:
-		return nil, fmt.Errorf("Invalid container cluster specifier. Expecting {location}/{name} or {project}/{location}/{name}")
+		return nil, fmt.Errorf("Invalid container cluster specifier. Expecting {location}/{name}, {project}/{location}/{name} or projects/{project}/locations/{location}/clusters/{name}")


Can we use parseImportId here now instead of these case statements?

Yeah that should be easier. I tended to lean towards the case statements if we weren't setting some of the fields in state (parseImportId automatically sets state)

Setting project, region, etc shouldn't cause any issues though

Oh, I realized why I thought this was an issue!

Container cluster allows the user to specify either location or zone(deprecated) or region (deprecated)

We have removed zone and region in 3.0.0 though, so we should be good to go

danawillow · 2019-10-24T23:39:48Z

third_party/terraform/resources/resource_container_node_pool.go.erb

 	default:
-		return nil, fmt.Errorf("Invalid container cluster specifier. Expecting {location}/{cluster}/{name} or {project}/{location}/{cluster}/{name}")
+		return nil, fmt.Errorf("Invalid container cluster specifier. Expecting {location}/{cluster}/{name},  {project}/{location}/{cluster}/{name} or projects/{project}/locations/{location}/clusters/{cluster}/nodePools/{name}")


Same comment as above, also s/container cluster/container node pool/

danawillow · 2019-10-24T23:40:30Z

third_party/terraform/tests/resource_container_cluster_test.go.erb

@@ -94,13 +94,18 @@ func TestAccContainerCluster_basic(t *testing.T) {
 			},
 			{
 				ResourceName:		 "google_container_cluster.primary",
-				ImportStateIdPrefix: "us-central1-a/",
+				ImportStateId: fmt.Sprintf("us-central1-a/%s", clusterName),


nit: spacing

danawillow · 2019-10-24T23:41:54Z

third_party/terraform/tests/resource_container_cluster_test.go.erb

 				ImportState:		 true,
 				ImportStateVerify:	 true,
 			},
 		},
 	})
 }

+<% unless version.nil? || version == 'ga' -%>


This got deleted in #2523

danawillow · 2019-10-25T20:29:26Z

third_party/terraform/tests/resource_container_cluster_test.go.erb

-				ImportStateId: fmt.Sprintf("us-central1-a/%s", clusterName),
-				ImportState:		 true,
-				ImportStateVerify:	 true,
+				ResourceName:		   "google_container_cluster.primary",


nit: not a big deal but i'm still seeing some spacing weirdness here (it's a tabs/spaces thing)

modular-magician · 2019-10-25T22:07:20Z

3.0.0 diff report as of 8ffbbe71b27082789fcd478d2e1197c03f77597c

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-10-25T22:10:46Z

3.0.0 diff report as of `e44c53a`

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-10-25T22:13:23Z

3.0.0 diff report as of `e44c53a`

TPG Diff
TPGB Diff
Mapper Diff

* Fix cloudfunction formatting, migrate RIGM id * Update security policy resource id * Update target pool id format * Add new id for container cluster * Node pool id updates * PR feedback, using parseImportId for container resources * Formatting

* cloudbuild build trigger's trigger template should be required in 3.0.0. (#2352) * cloudbuild build trigger's trigger template should be required in 3.0.0. * Make backend_service.backends.group required. (#2373) * Remove Removed fields (#2391) * deprecated-->removed event notification config (#2390) * deprecated-->removed event notification config * remove singular config from tests/docs * pluralize * Update third_party/terraform/tests/resource_cloudiot_registry_test.go Co-Authored-By: Riley Karson <[email protected]> * Delete google_project_services in 3.0.0. (#2403) * Changing IAM audit config to be authoritative (#2438) * Changing IAM audit config to be authoritative * Remove unused code + test * Removing deprecated fields (#2436) * Add validation for scratch disks in Instance Template (#2282) * Add validation for scratch disks * Remove source from scratch disk * Use hardcoded image * Add reverse logic * Change default id format from {{name}} to self_link_uri (#2461) * Change default id format from {{name}} to self_link_uri * Updates to generated id formats (#2460) * Update ID fields for various MM-generated resources * gofmt -s -w extra file * Add userinfo.email to default scopes (#2473) * Set GKE Stackdriver defaults to GKE Stackdriver Monitoring (#2471) * only allow instance templates with 375gb scratch disks (#2495) * Update cloudfunction id for 3.0.0 release (#2501) * handle cloudfunctions deprecating nodejs6 (#2499) * Handwritten id updates for several compute resources (#2502) * Composer environment and compute attached disk id updates * Add compute instance * Add instance_from_group and instance_group * IGM id * Instance template tests passing * Add new id format to other calls of parseImportId in IGM * Small refactor to memoize var * Refactor, remove parseImportId in IGM * handle legacy network deprecation (#2508) * Fix gofmt diff in Cloud Functions (#2542) * More handwritten ids (#2527) * Fix cloudfunction formatting, migrate RIGM id * Update security policy resource id * Update target pool id format * Add new id for container cluster * Node pool id updates * PR feedback, using parseImportId for container resources * Formatting * fix container cluster (#2550) * Datasource id updates (#2544) * Update datasources * formatting * Even more handwritten ids (#2540) * Dataproc cluster, job, google project * Update sql ssl cert, database instance ids * Project id comparison include projects/ * remove kubernetes_dashboard from google_container_cluster (#2551) * Add back encoder that always sends autoCreateSubnetworks (#2558) * Allow defining empty taint, remove old DSF (#2537) * Remove encoder, can be done as send_empty_value on autoCreateSubnetworks (#2559) * deprecate 0.11 syntax in docs (datasources) (#2573) * deprecate 0.11 syntax in docs (resources) (#2574) * deprecate 0.11 syntax in docs (magic modules examples) (#2579) * remove long name behavior for pubsub subscriptions, clean up cu… (#2561) * remove long name behavior for pubsub subscriptions, clean up custom expanders * fix build * fix tests * Fix merge conflict in rigm test * Remove unused regexes from rigm (#2602) * Fix missing paren + bad var in resourcepolicy datasource 3.0.0 (#2600) * Test fixes based on integration tests, id formats + other easy fixes (#2605) * Test fixes based on integration tests, id formats + other easy fixes * Compute network id test update * Fix region disk test id * Update subnetwork to remove enable_flow_logs and depend on log_config instead (#2597) * Test updates to not depend on id format. Also test fixes (#2609) * Test updates to not depend on id format. Also test fixes * Typo * location -> region in node pool test * Cluster test fixes (#2611) * Fix container cluster tests, and signed url key, instance group * Fix invalid accessor * Update hand-written resources with `AtLeastOneOf` and `ExactlyOneOf` attributes (#2608) * Rigm/igm field removals for 3.0.0 (#2595) * Remove deprecated IGM fields for 3.0 * fix imports (#2619) * Remove automatic subnetwork creation in GKE (#2615) * Remove automatic subnetwork creation in GKE * Update docs, add Computed * More integration test fixes (#2617) * Fix bigtable for real, scratch disk size, target pool checks * Proxy test fixes * CloudIOT registry set removed field to nil. Add specific id format for access context manager * (r)igm imports for customdiff (#2623) * (r)igm imports for customdiff * Fix schema issues * Fix IGM custom diff and reuse method between resources (#2624) * Forwardingrule ip address (#2620) add the validation function * Remove unused sort import from rigm (#2625) * add composer test fixes, backend bucket signed url key (#2631) * Stop users from specifying bigquery-json in 3.0.0 (#2626) * Send null logConfig if subnetwork is L7ILB (#2635) * Send null logConfig if subnetwork is L7ILB * Move subnet ilb check to only if logConfig unspecified * deprecate 0.11 syntax in tests (datasources) (#2593) * Make master_authorized_networks_config.cidr_blocks Optional in… (#2642) * Make master_authorized_networks_config.cidr_blocks Optional in GKE * Add note * update magic module-generated resources with at_least_one_of (#2639) * add exactly_one_of to magic modules update comment * Update Data Fusion Instance to conform with 3.0.0 id updates (#2649) * Fix IAM doc id_format to new post 3.0.0 style * Add note on id format changes (#2656) * Add upgrade guide for subnetwork log_config (#2653) * Add upgrade guide for subnetwork log_config * Add examples for subnet logConfig update * Wording on upgrade guide * Add note on audit log config (#2658) * Add misc entries to the upgrade guide (#2657) * Add misc entries to the upgrade guide * Remove extra space * add info on scratch disk size and remove duplicate kms_key_self… (#2659) * Add upgrade guide notes. (#2663) * Add upgrade guide for forwarding rule validation (#2666) * Convert old import formats (using non-/) to use /. (#2638) * Convert old import formats (using non-/) to use /. * Upgrade proofreading (#2668) * Add upgrade note for IoT registry event_notification_configs (#2390) (#2651) Merged PR #2651. * sort upgrade guide; change wording in a few places * Password is not actually required. (#2670) * Add improved for_each non-module variant to project service upg… (#2671) * Update bigtable import & tests to 3.0 (#2673) * update upgrade guide (#2665) * update formatting for upgrade doc (#2674) * Add rigm to upgrade guide (#2667) Update docs to be accurate for 3.0 * proofreading changes (#2676) * Add back lost newlines

* Fix cloudfunction formatting, migrate RIGM id * Update security policy resource id * Update target pool id format * Add new id for container cluster * Node pool id updates * PR feedback, using parseImportId for container resources * Formatting

googlebot added the cla: yes label Oct 24, 2019

slevenick requested a review from danawillow October 24, 2019 16:19

rileykarson force-pushed the 3.0.0 branch from 0413e95 to 1c26baa Compare October 24, 2019 20:43

googlebot added cla: no and removed cla: yes labels Oct 24, 2019

slevenick force-pushed the more-handwritten-ids branch 2 times, most recently from 132396d to d0674cd Compare October 24, 2019 22:05

slevenick force-pushed the more-handwritten-ids branch from d0674cd to ce19c79 Compare October 24, 2019 23:37

googlebot added cla: yes and removed cla: no labels Oct 24, 2019

danawillow reviewed Oct 24, 2019

View reviewed changes

danawillow approved these changes Oct 25, 2019

View reviewed changes

slevenick added 7 commits October 25, 2019 15:02

Fix cloudfunction formatting, migrate RIGM id

d4f7312

Update security policy resource id

23f153c

Update target pool id format

db1ad78

Add new id for container cluster

26973de

Node pool id updates

7c7b7d1

PR feedback, using parseImportId for container resources

d54982f

Formatting

e44c53a

slevenick force-pushed the more-handwritten-ids branch from 8ffbbe7 to e44c53a Compare October 25, 2019 22:02

slevenick merged commit 3e997ca into GoogleCloudPlatform:3.0.0 Oct 25, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More handwritten ids #2527

More handwritten ids #2527

slevenick commented Oct 24, 2019

modular-magician commented Oct 24, 2019

googlebot commented Oct 24, 2019

danawillow commented Oct 24, 2019

googlebot commented Oct 24, 2019

slevenick commented Oct 24, 2019

danawillow Oct 24, 2019

slevenick Oct 25, 2019

slevenick Oct 25, 2019

danawillow Oct 24, 2019

danawillow Oct 24, 2019

danawillow Oct 24, 2019

danawillow Oct 25, 2019

modular-magician commented Oct 25, 2019

modular-magician commented Oct 25, 2019

modular-magician commented Oct 25, 2019

More handwritten ids #2527

More handwritten ids #2527

Conversation

slevenick commented Oct 24, 2019

modular-magician commented Oct 24, 2019

3.0.0 diff report as of 37ecb4f90292cd7def2051db53d7d06ae48283d2

googlebot commented Oct 24, 2019

danawillow commented Oct 24, 2019

googlebot commented Oct 24, 2019

slevenick commented Oct 24, 2019

danawillow Oct 24, 2019

Choose a reason for hiding this comment

slevenick Oct 25, 2019

Choose a reason for hiding this comment

slevenick Oct 25, 2019

Choose a reason for hiding this comment

danawillow Oct 24, 2019

Choose a reason for hiding this comment

danawillow Oct 24, 2019

Choose a reason for hiding this comment

danawillow Oct 24, 2019

Choose a reason for hiding this comment

danawillow Oct 25, 2019

Choose a reason for hiding this comment

modular-magician commented Oct 25, 2019

3.0.0 diff report as of 8ffbbe71b27082789fcd478d2e1197c03f77597c

modular-magician commented Oct 25, 2019

3.0.0 diff report as of e44c53a

modular-magician commented Oct 25, 2019

3.0.0 diff report as of e44c53a

3.0.0 diff report as of `e44c53a`

3.0.0 diff report as of `e44c53a`