Support Undelete for Vmwareengine Private Cloud (#11480) (#8005)

[upstream:c52857ebf0dbeff8d8894e7e30a0a2072b7eb492]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/11480.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+vmwareengine: Added PC undelete support in `google_vmwareengine_private_cloud`
+```

google-beta/services/vmwareengine/resource_vmwareengine_private_cloud.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"google.golang.org/api/googleapi"
 
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
@@ -67,6 +68,52 @@ func isMultiNodePrivateCloud(d *schema.ResourceData) bool {
 	return false
 }
 
+func isPrivateCloudInDeletedState(config *transport_tpg.Config, d *schema.ResourceData, billingProject string, userAgent string) (bool, error) {
+	baseurl, err := tpgresource.ReplaceVars(d, config, "{{VmwareengineBasePath}}projects/{{project}}/locations/{{location}}/privateClouds/{{name}}")
+	if err != nil {
+		return false, err
+	}
+	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		Config:    config,
+		Method:    "GET",
+		Project:   billingProject,
+		RawURL:    baseurl,
+		UserAgent: userAgent,
+	})
+	if err != nil {
+		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
+			log.Printf("[DEBUG] No existing private cloud found")
+			return false, nil
+		}
+		return false, err
+	}
+	// if resource exists but is marked for deletion
+	v, ok := res["state"]
+	if ok && v.(string) == "DELETED" {
+		log.Printf("[DEBUG] The Private cloud exists and is marked for deletion.")
+		return true, nil
+	}
+	return false, nil
+}
+
+// Check if private cloud is absent or if it exists in a deleted state.
+func pollCheckForPrivateCloudAbsence(resp map[string]interface{}, respErr error) transport_tpg.PollResult {
+	if respErr != nil {
+		if transport_tpg.IsGoogleApiErrorWithCode(respErr, 404) {
+			return transport_tpg.SuccessPollResult()
+		}
+		return transport_tpg.ErrorPollResult(respErr)
+	}
+	// if resource exists but is marked for deletion
+	log.Printf("[DEBUG] Fetching state of the private cloud.")
+	v, ok := resp["state"]
+	if ok && v.(string) == "DELETED" {
+		log.Printf("[DEBUG] The Private cloud has been successfully marked for delayed deletion.")
+		return transport_tpg.SuccessPollResult()
+	}
+	return transport_tpg.PendingStatusPollResult("found")
+}
+
 func ResourceVmwareenginePrivateCloud() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceVmwareenginePrivateCloudCreate,
@@ -400,6 +447,21 @@ func resourceVmwareenginePrivateCloudCreate(d *schema.ResourceData, meta interfa
 	}
 
 	headers := make(http.Header)
+	// Check if the project exists in a deleted state
+	pcMarkedForDeletion, err := isPrivateCloudInDeletedState(config, d, billingProject, userAgent)
+	if err != nil {
+		return fmt.Errorf("Error checking if Private Cloud exists and is marked for deletion: %s", err)
+	}
+	if pcMarkedForDeletion {
+		log.Printf("[DEBUG] Private Cloud exists and is marked for deletion. Triggering UNDELETE of the Private Cloud.\n")
+		url, err = tpgresource.ReplaceVars(d, config, "{{VmwareengineBasePath}}projects/{{project}}/locations/{{location}}/privateClouds/{{name}}:undelete")
+		if err != nil {
+			return err
+		}
+		obj = make(map[string]interface{})
+	} else {
+		log.Printf("[DEBUG] Private Cloud is not found to be marked for deletion. Triggering CREATE of the Private Cloud.\n")
+	}
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:               config,
 		Method:               "POST",
@@ -742,18 +804,11 @@ func resourceVmwareenginePrivateCloudDelete(d *schema.ResourceData, meta interfa
 			if err != nil {
 				return res, err
 			}
-			// if resource exists but is marked for deletion
-			log.Printf("[DEBUG] Fetching state of the private cloud.")
-			v, ok := res["state"]
-			if ok && v.(string) == "DELETED" {
-				log.Printf("[DEBUG] The Private cloud has been successfully marked for delayed deletion.")
-				return nil, nil
-			}
 			return res, nil
 		}
 	}
 
-	err = transport_tpg.PollingWaitTime(privateCloudPollRead(d, meta), transport_tpg.PollCheckForAbsence, "Deleting PrivateCloud", d.Timeout(schema.TimeoutDelete), 10)
+	err = transport_tpg.PollingWaitTime(privateCloudPollRead(d, meta), pollCheckForPrivateCloudAbsence, "Deleting PrivateCloud", d.Timeout(schema.TimeoutDelete), 10)
 	if err != nil {
 		return fmt.Errorf("Error waiting to delete PrivateCloud: %s", err)
 	}

google-beta/services/vmwareengine/resource_vmwareengine_private_cloud_test.go

@@ -49,13 +49,13 @@ func TestAccVmwareenginePrivateCloud_vmwareEnginePrivateCloudUpdate(t *testing.T
 					testAccCheckGoogleVmwareengineVcenterCredentialsMeta("data.google_vmwareengine_vcenter_credentials.vcenter-ds"),
 				),
 			},
-
 			{
 				ResourceName:            "google_vmwareengine_private_cloud.vmw-engine-pc",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"location", "name", "update_time", "type", "deletion_delay_hours", "send_deletion_delay_hours_if_zero"},
 			},
+
 			{
 				Config: testVmwareenginePrivateCloudUpdateConfig(context),
 				Check: resource.ComposeTestCheckFunc(
@@ -69,13 +69,43 @@ func TestAccVmwareenginePrivateCloud_vmwareEnginePrivateCloudUpdate(t *testing.T
 						}),
 				),
 			},
+			{
+				ResourceName:            "google_vmwareengine_private_cloud.vmw-engine-pc",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "name", "update_time", "type", "deletion_delay_hours", "send_deletion_delay_hours_if_zero"},
+			},
 
+			{
+				Config: testVmwareenginePrivateCloudDelayedDeleteConfig(context),
+			},
+			{
+				ResourceName:            "google_vmwareengine_network.vmw-engine-nw",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "name"},
+			},
+
+			{
+				Config: testVmwareenginePrivateCloudUndeleteConfig(context),
+				Check: resource.ComposeTestCheckFunc(
+					acctest.CheckDataSourceStateMatchesResourceStateWithIgnores(
+						"data.google_vmwareengine_private_cloud.ds",
+						"google_vmwareengine_private_cloud.vmw-engine-pc",
+						map[string]struct{}{
+							"type":                              {},
+							"deletion_delay_hours":              {},
+							"send_deletion_delay_hours_if_zero": {},
+						}),
+				),
+			},
 			{
 				ResourceName:            "google_vmwareengine_private_cloud.vmw-engine-pc",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"location", "name", "update_time", "type", "deletion_delay_hours", "send_deletion_delay_hours_if_zero"},
 			},
+
 			{
 				Config: testVmwareengineSubnetImportConfig(context),
 				Check: resource.ComposeTestCheckFunc(
@@ -88,6 +118,7 @@ func TestAccVmwareenginePrivateCloud_vmwareEnginePrivateCloudUpdate(t *testing.T
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"parent", "name"},
 			},
+
 			{
 				Config: testVmwareengineSubnetUpdateConfig(context),
 			},
@@ -106,6 +137,14 @@ func testVmwareenginePrivateCloudCreateConfig(context map[string]interface{}) st
 }
 
 func testVmwareenginePrivateCloudUpdateConfig(context map[string]interface{}) string {
+	return testVmwareenginePrivateCloudConfig(context, "sample updated description", "STANDARD", 3, 8) + testVmwareengineVcenterNSXCredentailsConfig(context)
+}
+
+func testVmwareenginePrivateCloudDelayedDeleteConfig(context map[string]interface{}) string {
+	return testVmwareenginePrivateCloudDeletedConfig(context)
+}
+
+func testVmwareenginePrivateCloudUndeleteConfig(context map[string]interface{}) string {
 	return testVmwareenginePrivateCloudConfig(context, "sample updated description", "STANDARD", 3, 0) + testVmwareengineVcenterNSXCredentailsConfig(context)
 }
 
@@ -123,7 +162,7 @@ func testVmwareenginePrivateCloudConfig(context map[string]interface{}, descript
 	context["description"] = description
 	context["type"] = pcType
 	return acctest.Nprintf(`
-resource "google_vmwareengine_network" "default-nw" {
+resource "google_vmwareengine_network" "vmw-engine-nw" {
   name              = "tf-test-pc-nw-%{random_suffix}"
   location          = "global"
   type              = "STANDARD"
@@ -139,7 +178,7 @@ resource "google_vmwareengine_private_cloud" "vmw-engine-pc" {
   send_deletion_delay_hours_if_zero = true
   network_config {
     management_cidr = "192.168.0.0/24"
-    vmware_engine_network = google_vmwareengine_network.default-nw.id
+    vmware_engine_network = google_vmwareengine_network.vmw-engine-nw.id
   }
   management_cluster {
     cluster_id = "tf-test-sample-mgmt-cluster-custom-core-count%{random_suffix}"
@@ -161,6 +200,17 @@ data "google_vmwareengine_private_cloud" "ds" {
 `, context)
 }
 
+func testVmwareenginePrivateCloudDeletedConfig(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_vmwareengine_network" "vmw-engine-nw" {
+  name              = "tf-test-pc-nw-%{random_suffix}"
+  location          = "global"
+  type              = "STANDARD"
+  description       = "PC network description."
+}
+`, context)
+}
+
 func testVmwareengineVcenterNSXCredentailsConfig(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 data "google_vmwareengine_nsx_credentials" "nsx-ds" {