Removed post-create setting of identity fields that aren't computed or in id_format (#13836) (#10096)

[upstream:96b5bef18dca94f85b39be997000b375f827b890]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

google-beta/services/accesscontextmanager/resource_access_context_manager_access_level.go

@@ -419,30 +419,16 @@ func resourceAccessContextManagerAccessLevelCreate(d *schema.ResourceData, meta
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating AccessLevel", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating AccessLevel", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create AccessLevel: %s", err)
 	}
 
-	if err := d.Set("name", flattenAccessContextManagerAccessLevelName(opRes["name"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{name}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating AccessLevel %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerAccessLevelRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc.go

@@ -224,30 +224,16 @@ func resourceAccessContextManagerAuthorizedOrgsDescCreate(d *schema.ResourceData
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating AuthorizedOrgsDesc", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating AuthorizedOrgsDesc", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create AuthorizedOrgsDesc: %s", err)
 	}
 
-	if err := d.Set("name", flattenAccessContextManagerAuthorizedOrgsDescName(opRes["name"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{name}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	// This is useful if the resource in question doesn't have a perfectly consistent API
 	// That is, the Operation for Create might return before the Get operation shows the
 	// completed state of the resource.

google-beta/services/accesscontextmanager/resource_access_context_manager_egress_policy.go

@@ -143,40 +143,16 @@ func resourceAccessContextManagerEgressPolicyCreate(d *schema.ResourceData, meta
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating EgressPolicy", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating EgressPolicy", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create EgressPolicy: %s", err)
 	}
 
-	if _, ok := opRes["status"]; ok {
-		opRes, err = flattenNestedAccessContextManagerEgressPolicy(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("resource", flattenNestedAccessContextManagerEgressPolicyResource(opRes["resource"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{egress_policy_name}}/{{resource}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating EgressPolicy %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerEgressPolicyRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_ingress_policy.go

@@ -143,40 +143,16 @@ func resourceAccessContextManagerIngressPolicyCreate(d *schema.ResourceData, met
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating IngressPolicy", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating IngressPolicy", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create IngressPolicy: %s", err)
 	}
 
-	if _, ok := opRes["status"]; ok {
-		opRes, err = flattenNestedAccessContextManagerIngressPolicy(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("resource", flattenNestedAccessContextManagerIngressPolicyResource(opRes["resource"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{ingress_policy_name}}/{{resource}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating IngressPolicy %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerIngressPolicyRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter.go

@@ -1147,30 +1147,16 @@ func resourceAccessContextManagerServicePerimeterCreate(d *schema.ResourceData,
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating ServicePerimeter", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating ServicePerimeter", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create ServicePerimeter: %s", err)
 	}
 
-	if err := d.Set("name", flattenAccessContextManagerServicePerimeterName(opRes["name"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{name}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating ServicePerimeter %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerServicePerimeterRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy.go

@@ -432,46 +432,16 @@ func resourceAccessContextManagerServicePerimeterDryRunEgressPolicyCreate(d *sch
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating ServicePerimeterDryRunEgressPolicy", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating ServicePerimeterDryRunEgressPolicy", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create ServicePerimeterDryRunEgressPolicy: %s", err)
 	}
 
-	if _, ok := opRes["spec"]; ok {
-		opRes, err = flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicy(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("egress_from", flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyEgressFrom(opRes["egressFrom"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("egress_to", flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyEgressTo(opRes["egressTo"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("title", flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyTitle(opRes["title"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{perimeter}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating ServicePerimeterDryRunEgressPolicy %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerServicePerimeterDryRunEgressPolicyRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy.go

@@ -425,46 +425,16 @@ func resourceAccessContextManagerServicePerimeterDryRunIngressPolicyCreate(d *sc
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating ServicePerimeterDryRunIngressPolicy", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating ServicePerimeterDryRunIngressPolicy", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create ServicePerimeterDryRunIngressPolicy: %s", err)
 	}
 
-	if _, ok := opRes["spec"]; ok {
-		opRes, err = flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicy(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("ingress_from", flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyIngressFrom(opRes["ingressFrom"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("ingress_to", flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyIngressTo(opRes["ingressTo"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("title", flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyTitle(opRes["title"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{perimeter}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating ServicePerimeterDryRunIngressPolicy %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerServicePerimeterDryRunIngressPolicyRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource.go

@@ -167,40 +167,16 @@ func resourceAccessContextManagerServicePerimeterDryRunResourceCreate(d *schema.
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating ServicePerimeterDryRunResource", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating ServicePerimeterDryRunResource", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create ServicePerimeterDryRunResource: %s", err)
 	}
 
-	if _, ok := opRes["spec"]; ok {
-		opRes, err = flattenNestedAccessContextManagerServicePerimeterDryRunResource(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("resource", flattenNestedAccessContextManagerServicePerimeterDryRunResourceResource(opRes["resource"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{perimeter_name}}/{{resource}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating ServicePerimeterDryRunResource %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerServicePerimeterDryRunResourceRead(d, meta)

google-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy.go

@@ -430,46 +430,16 @@ func resourceAccessContextManagerServicePerimeterEgressPolicyCreate(d *schema.Re
 	}
 	d.SetId(id)
 
-	// Use the resource in the operation response to populate
-	// identity fields and d.Id() before read
-	var opRes map[string]interface{}
-	err = AccessContextManagerOperationWaitTimeWithResponse(
-		config, res, &opRes, "Creating ServicePerimeterEgressPolicy", userAgent,
+	err = AccessContextManagerOperationWaitTime(
+		config, res, "Creating ServicePerimeterEgressPolicy", userAgent,
 		d.Timeout(schema.TimeoutCreate))
+
 	if err != nil {
 		// The resource didn't actually create
 		d.SetId("")
-
 		return fmt.Errorf("Error waiting to create ServicePerimeterEgressPolicy: %s", err)
 	}
 
-	if _, ok := opRes["status"]; ok {
-		opRes, err = flattenNestedAccessContextManagerServicePerimeterEgressPolicy(d, meta, opRes)
-		if err != nil {
-			return fmt.Errorf("Error getting nested object from operation response: %s", err)
-		}
-		if opRes == nil {
-			// Object isn't there any more - remove it from the state.
-			return fmt.Errorf("Error decoding response from operation, could not find nested object")
-		}
-	}
-	if err := d.Set("egress_from", flattenNestedAccessContextManagerServicePerimeterEgressPolicyEgressFrom(opRes["egressFrom"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("egress_to", flattenNestedAccessContextManagerServicePerimeterEgressPolicyEgressTo(opRes["egressTo"], d, config)); err != nil {
-		return err
-	}
-	if err := d.Set("title", flattenNestedAccessContextManagerServicePerimeterEgressPolicyTitle(opRes["title"], d, config)); err != nil {
-		return err
-	}
-
-	// This may have caused the ID to update - update it if so.
-	id, err = tpgresource.ReplaceVars(d, config, "{{perimeter}}")
-	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
-	}
-	d.SetId(id)
-
 	log.Printf("[DEBUG] Finished creating ServicePerimeterEgressPolicy %q: %#v", d.Id(), res)
 
 	return resourceAccessContextManagerServicePerimeterEgressPolicyRead(d, meta)