Handwritten id updates for several compute resources #2502

slevenick · 2019-10-22T00:06:24Z

Handwritten id updates for several compute resources for 3.0.0 release

Breaking this up for ease of review

Release Note Template for Downstream PRs (will be copied)

modular-magician · 2019-10-22T00:12:51Z

3.0.0 diff report as of `73fbeb3`

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-10-22T22:37:46Z

3.0.0 diff report as of `e7a26d8`

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-10-23T16:40:56Z

3.0.0 diff report as of `271f49a`

TPG Diff
TPGB Diff
Mapper Diff

rileykarson · 2019-10-23T16:39:15Z

third_party/terraform/resources/resource_compute_instance.go

@@ -902,7 +904,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err

 	// Use beta api directly in order to read network_interface.fingerprint without having to put it in the schema.
 	// Change back to getInstance(config, d) once updating alias ips is GA.
-	instance, err := config.clientComputeBeta.Instances.Get(project, zone, d.Id()).Do()
+	instance, err := config.clientComputeBeta.Instances.Get(project, zone, d.Get("name").(string)).Do()


At least in Update, probably worth pulling name out to a variable.

rileykarson · 2019-10-23T16:40:48Z

third_party/terraform/resources/resource_compute_instance_group.go

-		return nil, fmt.Errorf("Invalid compute instance group specifier. Expecting {zone}/{name} or {project}/{zone}/{name}")
+	config := meta.(*Config)
+	if err := parseImportId([]string{
+		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instanceGroups/(?P<name>[^/]+)",


Can you add this form to the docs?

rileykarson · 2019-10-23T16:42:51Z

third_party/terraform/resources/resource_compute_instance_group_manager.go.erb

@@ -451,7 +451,7 @@ func flattenFixedOrPercent(fixedOrPercent *computeBeta.FixedOrPercent) []map[str

 func getManager(d *schema.ResourceData, meta interface{}) (*computeBeta.InstanceGroupManager, error) {
 	config := meta.(*Config)
-	if err := parseImportId([]string{"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instanceGroupManagers/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {


What circumstances will this + others be needed under? Import should set all the appropriate values, will Create not?

I think this can be removed now that we have an import method.

rileykarson · 2019-10-23T16:43:28Z

third_party/terraform/resources/resource_compute_instance_group_manager.go.erb

@@ -1020,12 +1020,12 @@ func flattenUpdatePolicy(updatePolicy *computeBeta.InstanceGroupManagerUpdatePol
 func resourceInstanceGroupManagerStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	d.Set("wait_for_instances", false)
 	config := meta.(*Config)
-	if err := parseImportId([]string{"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instanceGroupManagers/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {


Same as above- I think we need docs for the full form

rileykarson · 2019-10-23T16:44:05Z

third_party/terraform/resources/resource_compute_instance_template.go

+
+func resourceComputeInstanceTemplateImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	config := meta.(*Config)
+	if err := parseImportId([]string{"projects/(?P<project>[^/]+)/global/instanceTemplates/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {


This will need new docs

modular-magician · 2019-10-23T17:26:07Z

3.0.0 diff report as of `fdbf488`

TPG Diff
TPGB Diff
Mapper Diff

* 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

* 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

* 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

slevenick added 3 commits October 21, 2019 15:07

Composer environment and compute attached disk id updates

642d38f

Add compute instance

ed51673

Add instance_from_group and instance_group

73fbeb3

googlebot added the cla: yes label Oct 22, 2019

slevenick added 3 commits October 22, 2019 11:24

IGM id

5122763

Instance template tests passing

47d5b65

Add new id format to other calls of parseImportId in IGM

e7a26d8

Small refactor to memoize var

271f49a

slevenick requested a review from rileykarson October 23, 2019 16:36

rileykarson reviewed Oct 23, 2019

View reviewed changes

Refactor, remove parseImportId in IGM

fdbf488

rileykarson approved these changes Oct 23, 2019

View reviewed changes

slevenick merged commit 1232e2d into GoogleCloudPlatform:3.0.0 Oct 23, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handwritten id updates for several compute resources #2502

Handwritten id updates for several compute resources #2502

slevenick commented Oct 22, 2019 •

edited

Loading

modular-magician commented Oct 22, 2019

modular-magician commented Oct 22, 2019

modular-magician commented Oct 23, 2019

rileykarson Oct 23, 2019

rileykarson Oct 23, 2019

rileykarson Oct 23, 2019

slevenick Oct 23, 2019

rileykarson Oct 23, 2019

rileykarson Oct 23, 2019

modular-magician commented Oct 23, 2019

Handwritten id updates for several compute resources #2502

Handwritten id updates for several compute resources #2502

Conversation

slevenick commented Oct 22, 2019 • edited Loading

modular-magician commented Oct 22, 2019

3.0.0 diff report as of 73fbeb3

modular-magician commented Oct 22, 2019

3.0.0 diff report as of e7a26d8

modular-magician commented Oct 23, 2019

3.0.0 diff report as of 271f49a

rileykarson Oct 23, 2019

Choose a reason for hiding this comment

rileykarson Oct 23, 2019

Choose a reason for hiding this comment

rileykarson Oct 23, 2019

Choose a reason for hiding this comment

slevenick Oct 23, 2019

Choose a reason for hiding this comment

rileykarson Oct 23, 2019

Choose a reason for hiding this comment

rileykarson Oct 23, 2019

Choose a reason for hiding this comment

modular-magician commented Oct 23, 2019

3.0.0 diff report as of fdbf488

slevenick commented Oct 22, 2019 •

edited

Loading

3.0.0 diff report as of `73fbeb3`

3.0.0 diff report as of `e7a26d8`

3.0.0 diff report as of `271f49a`

3.0.0 diff report as of `fdbf488`