Set folder only if one is detected

Add import verification to acceptance tests
hashicorp · Mar 31, 2022 · 3b66ceb · 3b66ceb
1 parent 15c2fb3
commit 3b66ceb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/vsphere/resource_vsphere_datacenter.go b/vsphere/resource_vsphere_datacenter.go
@@ -287,15 +287,17 @@ func resourceVSphereDatacenterImport(d *schema.ResourceData, meta interface{}) (
 		return nil, err
 	}
 
+	// determine a folder if one is present
 	f, err := folder.ParentFromPath(client, p, folder.VSphereFolderTypeDatacenter, dc)
 	if err != nil {
 		return nil, fmt.Errorf("cannot locate folder: %s", err)
 	}
 
 	path := strings.TrimPrefix(f.InventoryPath, "/")
-
-	if err := d.Set("folder", path); err != nil {
-		return nil, err
+	if path != "" {
+		if err := d.Set("folder", path); err != nil {
+			return nil, err
+		}
 	}
 
 	d.SetId(dc.Name())

diff --git a/vsphere/resource_vsphere_datacenter_test.go b/vsphere/resource_vsphere_datacenter_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -13,23 +14,27 @@ import (
 
 const testAccCheckVSphereDatacenterResourceName = "vsphere_datacenter.testDC"
 
-const testAccCheckVSphereDatacenterConfig = `
+func testAccCheckVSphereDatacenterConfig(name string) string {
+	return fmt.Sprintf(`
 resource "vsphere_datacenter" "testDC" {
-  name = "testDC"
+  name = "%s"
+}
+`, name)
 }
-`
 
-const testAccCheckVSphereDatacenterConfigSubfolder = `
+func testAccCheckVSphereDatacenterConfigSubfolder(name, folder string) string {
+	return fmt.Sprintf(`
 resource "vsphere_folder" "folder" {
   path = "%s"
   type = "datacenter"
 }
 
 resource "vsphere_datacenter" "testDC" {
-  name   = "testDC"
+  name   = "%s"
   folder = vsphere_folder.folder.path
 }
-`
+`, folder, name)
+}
 
 const testAccCheckVSphereDatacenterConfigTags = `
 resource "vsphere_tag_category" "testacc-category" {
@@ -129,37 +134,53 @@ resource "vsphere_datacenter" "testDC" {
 
 // Create a datacenter on the root folder
 func TestAccResourceVSphereDatacenter_createOnRootFolder(t *testing.T) {
+	name := "testDC"
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVSphereDatacenterDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckVSphereDatacenterConfig,
+				Config: testAccCheckVSphereDatacenterConfig(name),
 				Check:  resource.ComposeTestCheckFunc(testAccCheckVSphereDatacenterExists(testAccCheckVSphereDatacenterResourceName, true)),
 			},
+			{
+				ResourceName:        testAccCheckVSphereDatacenterResourceName,
+				ImportState:         true,
+				ImportStateVerify:   true,
+				ImportStateIdPrefix: "/",
+				ImportStateId:       name,
+			},
 		},
 	})
 }
 
 // Create a datacenter on a subfolder
 func TestAccResourceVSphereDatacenter_createOnSubfolder(t *testing.T) {
 	dcFolder := os.Getenv("TF_VAR_VSPHERE_DC_FOLDER")
+	name := "testDC"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVSphereDatacenterDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: fmt.Sprintf(testAccCheckVSphereDatacenterConfigSubfolder, dcFolder),
+				Config: testAccCheckVSphereDatacenterConfigSubfolder(name, dcFolder),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckVSphereDatacenterExists(
 						testAccCheckVSphereDatacenterResourceName,
 						true,
 					),
 				),
 			},
+			{
+				ResourceName:        testAccCheckVSphereDatacenterResourceName,
+				ImportState:         true,
+				ImportStateVerify:   true,
+				ImportStateIdPrefix: "/",
+				ImportStateId:       path.Join(dcFolder, name),
+			},
 		},
 	})
 }