Skip to content

Commit

Permalink
Revert delete before replace changes (#2595)
Browse files Browse the repository at this point in the history
Context:

#2596

Revert:

- #2586
- #2588

Affected resources:

- google_compute_global_address
- google_compute_instance
- google_compute_vpn_tunnel
- google_project_iam_member
- google_service_account_iam_member
  • Loading branch information
t0yv0 authored Nov 8, 2024
1 parent a349104 commit 4b294a0
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -1031,18 +1029,14 @@ 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")},
"google_compute_ha_vpn_gateway": {Tok: gcpResource(gcpCompute, "HaVpnGateway")},
"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{
Expand Down Expand Up @@ -1154,7 +1148,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")},
Expand Down

0 comments on commit 4b294a0

Please sign in to comment.