From b935fa1b630afa3dec92106b7921b20990dedb27 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Fri, 8 Nov 2024 12:07:35 -0500 Subject: [PATCH 1/2] Revert "Adding DeleteBeforeReplace for IAMMember, VPNTunnel, etc, fixes #190" This reverts commit ffc12a78c9b4934b6a7a82383e393e68f2e3e778. --- provider/resources.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/provider/resources.go b/provider/resources.go index 267aa229bb..2003641167 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -878,7 +878,6 @@ func Provider() tfbridge.ProviderInfo { Docs: &tfbridge.DocInfo{ Source: "google_project_iam.html.markdown", }, - DeleteBeforeReplace: true, }, "google_project_iam_policy": { Tok: gcpResource(gcpProject, "IAMPolicy"), @@ -937,7 +936,6 @@ func Provider() tfbridge.ProviderInfo { Docs: &tfbridge.DocInfo{ Source: "google_service_account_iam.html.markdown", }, - DeleteBeforeReplace: true, }, "google_service_account_iam_policy": { Tok: gcpResource(gcpServiceAccount, "IAMPolicy"), @@ -1031,7 +1029,7 @@ func Provider() tfbridge.ProviderInfo { }, }, "google_compute_external_vpn_gateway": {Tok: gcpResource(gcpCompute, "ExternalVpnGateway")}, - "google_compute_global_address": {Tok: gcpResource(gcpCompute, "GlobalAddress"), DeleteBeforeReplace: true}, + "google_compute_global_address": {Tok: gcpResource(gcpCompute, "GlobalAddress")}, "google_compute_global_forwarding_rule": {Tok: gcpResource(gcpCompute, "GlobalForwardingRule")}, "google_compute_global_network_endpoint": {Tok: gcpResource(gcpCompute, "GlobalNetworkEndpoint")}, "google_compute_global_network_endpoint_group": {Tok: gcpResource(gcpCompute, "GlobalNetworkEndpointGroup")}, @@ -1154,7 +1152,7 @@ func Provider() tfbridge.ProviderInfo { Fields: nameField(lowercaseAutoName()), }, "google_compute_vpn_gateway": {Tok: gcpResource(gcpCompute, "VPNGateway")}, - "google_compute_vpn_tunnel": {Tok: gcpResource(gcpCompute, "VPNTunnel"), DeleteBeforeReplace: true}, + "google_compute_vpn_tunnel": {Tok: gcpResource(gcpCompute, "VPNTunnel")}, "google_compute_reservation": {Tok: gcpResource(gcpCompute, "Reservation")}, "google_compute_region_health_check": {Tok: gcpResource(gcpCompute, "RegionHealthCheck")}, "google_compute_region_url_map": {Tok: gcpResource(gcpCompute, "RegionUrlMap")}, From 6b562981c9840751e46ef13059e0c70cb61a8919 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Fri, 8 Nov 2024 12:07:56 -0500 Subject: [PATCH 2/2] Revert "Adding in deleteBeforeReplace as default option, fixes #73 (#2586)" This reverts commit 4fd50a5b0fdf896f0a9d33a767b21a4c83ed003c. --- provider/resources.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/provider/resources.go b/provider/resources.go index 2003641167..d59058f6e9 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -1037,10 +1037,6 @@ func Provider() tfbridge.ProviderInfo { "google_compute_health_check": {Tok: gcpResource(gcpCompute, "HealthCheck")}, "google_compute_http_health_check": {Fields: nameField(lowercaseAutoName())}, "google_compute_https_health_check": {Fields: nameField(lowercaseAutoName())}, - "google_compute_instance": { - Tok: gcpResource(gcpCompute, "Instance"), - DeleteBeforeReplace: true, - }, "google_compute_instance_iam_binding": { Tok: gcpResource(gcpCompute, "InstanceIAMBinding"), Docs: &tfbridge.DocInfo{