[fix #1604]Add support for applying existing customization specs to r…

…/virtual_machine - added `vsphere_guest_os_customization` data source for existing customization specs - added `vsphere_guest_os_customization` resource for CRUD operations on customization specs - added customization_spec attribute to VirtualMachineCloneSchema to enable `vsphere_guest_os_customization` usage on VM clone - virtual machine customization and guest os customization are using the same code for expanding/flattening specs sent to API - deleted the file containing the common code regarding guest OS customizations shared between VM and customizations - created e2e tests - added documentation for `d/vsphere_guest_os_customization` and `r/vsphere_guest_os_customization` - addressed comments Testing done: - `make build` - Verified that the folowing e2e tests pass: - TestAccResourceVSphereVirtualMachine_cloneWithDifferentHostname - TestAccResourceVSphereVirtualMachine_cloneCustomizeWithNewResourcePool - TestAccResourceVSphereVirtualMachine_cloneWithDifferentTimezone - TestAccResourceVSphereVirtualMachine_cloneCustomizeForceNewWithDatastore - Verified that the newly introduced e2e tests pass Signed-off-by: Vasil Atanasov <[email protected]>
hashicorp · Nov 17, 2023 · 903db0a · 903db0a
1 parent a92a5b5
commit 903db0a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,13 @@ BUG FIXES:
 
 FEATURES:
 
-* `resource/virtual_machine`: Adds support for the SR-IOV (`sriov`) network interface adapter type. ([#2059](https://github.com/hashicorp/terraform-provider-vsphere/pull/2059) ([#1417](https://github.com/hashicorp/terraform-provider-vsphere/pull/1417)
 * `resource/compute_cluster`: Adds support for vSAN Express Storage Architecture in vSphere 8.0. ([#1874](https://github.com/terraform-providers/terraform-provider-vsphere/pull/1874))
 * `resource/compute_cluster`: Adds support for vSAN stretched clusters. ([#1885](https://github.com/hashicorp/terraform-provider-vsphere/pull/1885/))
 * `resource/compute_cluster`: Adds support for vSAN fault domains. ([#1968](https://github.com/hashicorp/terraform-provider-vsphere/pull/1969/))
+* `resource/guest_os_customization`: Adds support for the customization specifications for guest operating systems. ([#2053](https://github.com/hashicorp/terraform-provider-vsphere/pull/2053))
+* `datasource/guest_os_customization`: Adds support for the customization specifications for guest operating systems. ([#2053](https://github.com/hashicorp/terraform-provider-vsphere/pull/2053))
+* `resource/virtual_machine`: Adds support for the use of customization specifications for guest operating systems. ([#2053](https://github.com/hashicorp/terraform-provider-vsphere/pull/2053))
+* `resource/virtual_machine`: Adds support for the SR-IOV (`sriov`) network interface adapter type. ([#2059](https://github.com/hashicorp/terraform-provider-vsphere/pull/2059) and [#1417](https://github.com/hashicorp/terraform-provider-vsphere/pull/1417))
 
 ## 2.5.1 (October 12, 2023)
 
@@ -88,7 +91,7 @@ BUG FIXES:
 IMPROVEMENTS:
 
 * `resource/host`: Documentation updates. ([#1884](https://github.com/terraform-providers/terraform-provider-vsphere/pull/1884))
-* `resource/vnic`: Fixes vnic tests. ([#1887](https://github.com/terraform-providers/terraform-provider-vsphere/pull/1887))
+* `resource/vnic`: Fixes tests. ([#1887](https://github.com/terraform-providers/terraform-provider-vsphere/pull/1887))
 
 CHORES:
 
@@ -188,7 +191,7 @@ BUG FIXES:
 * `resource/compute_cluster`: Updates `ha_datastore_apd_response_delay` to the API default (180) for `vmTerminateDelayForAPDSec`. Previously set to 3 (minutes) however the codebase uses this value as seconds. Users who had the field left blank may see a warning about the state value drifting from 3 to 180, after applying this should go away. ([#1542](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1542))
 * `resource/virtual_machine`: Don't read `storage_policy_id` if vCenter is not configured. This is not a scenario we test or support explicitly ([#1408](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1408))
 * `datasource/virtual_machine`: Fixes silent failure and add `default_ip_address` attribute. ([#1532](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1532))
-* `resource/virtual_machine`: Fixs race condition by always forcing a new datastore id. ([#1486](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1486))
+* `resource/virtual_machine`: Fixes race condition by always forcing a new datastore id. ([#1486](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1486))
 * `resource/virtual_machine`: Fixes default guest OS identifier. ([#1543](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1543))
 * `resource/virtual_machine`: Updates `windows_options` to ensure all required options for domain join are provided ([#1562](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1562))
 * `resource/virtual_machine`: Fixes migration of all disks and configuration files when the datastore_cluster_id is changed on the resource. ([#1546](https://github.com/terraform-providers/terraform-provider-vsphere/issues/1546))
@@ -230,18 +233,18 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
-* `resource/virtual_machine`: Fix logic bug that caused the provider to set unsupported fields when talking to vsphere 6.5. ([1430](https://github.com/hashicorp/terraform-provide-vsphere/pull/1430))
+* `resource/virtual_machine`: Fix logic bug that caused the provider to set unsupported fields when talking to vSphere 6.5. ([1430](https://github.com/hashicorp/terraform-provide-vsphere/pull/1430))
 * `resource/virtual_machine`: Fix resource diff bug where it was not possible to ignore changes to `cdrom` subresource. ([1433](https://github.com/hashicorp/terraform-provide-vsphere/pull/1433))
 
 IMPROVEMENTS:
 
-* `resource/virtual_machine`: Support periodic time syncing for VMs on vsphere 7.0U1 onwards. ([1431](https://github.com/hashicorp/terraform-provide-vsphere/pull/1431))
+* `resource/virtual_machine`: Support periodic time syncing for VMs on vSphere 7.0U1 onwards. ([1431](https://github.com/hashicorp/terraform-provide-vsphere/pull/1431))
 
 ## 2.0.1 (June 09, 2021)
 
 BUG FIXES:
 
-* `resource/virtual_machine`: Only set vvtd/vbs if vsphere version is newer than 6.5. ([1423](https://github.com/hashicorp/terraform-provider-vsphere/pull/1423))
+* `resource/virtual_machine`: Only set vvtd/vbs if vSphere version is newer than 6.5. ([1423](https://github.com/hashicorp/terraform-provider-vsphere/pull/1423))
 
 ## 2.0.0 (June 02, 2021)
 
@@ -262,9 +265,9 @@ IMPROVEMENTS:
 * `provider`: Provider wide API timeout setting. ([1405](https://github.com/hashicorp/terraform-provider-vsphere/pull/1405))
 * `provider`: Enable keepalive for REST API sessions. ([1301](https://github.com/hashicorp/terraform-provider-vsphere/pull/1301))
 * `provider`: Upgrade Plugin SDK to 2.6.1 ([1379](https://github.com/hashicorp/terraform-provider-vsphere/pull/1379))
-* `datasource/virtual_machine`: Added 'network_interfaces' output. ([#1274]())
-* `resource/virtual_machine`: Allow unconfigurable vApp properties to be set. ([1199](https://github.com/hashicorp/terraform-provider-vsphere/pull/1199))
-* `resource/virtual_machine`: Enable VBS (vbsEnabled) and I/O MMU (vvtdEnabled). ([1287](https://github.com/hashicorp/terraform-provider-vsphere/pull/1287))
+* `datasource/virtual_machine`: Added `network_interfaces`` output. ([#1274](https://github.com/hashicorp/terraform-provider-vsphere/pull/1274))
+* `resource/virtual_machine`: Allow non-configurable vApp properties to be set. ([1199](https://github.com/hashicorp/terraform-provider-vsphere/pull/1199))
+* `resource/virtual_machine`: Enable VBS (`vbsEnabled`) and I/O MMU (`vvtdEnabled`). ([1287](https://github.com/hashicorp/terraform-provider-vsphere/pull/1287))
 * `resource/virtual_machine`: Added `replace_trigger` to support replacement of vms based external changes such as cloud_init ([#1360](https://github.com/hashicorp/terraform-provider-vsphere/issues/1360))
 
 ## 1.26.0 (April 20, 2021)
@@ -283,8 +286,8 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
-* `resource/vsphere_entity_permissions`: Sorting permission objects on username/groupname before storing. ([#1311](https://github.com/hashicorp/terraform-provider-vsphere/pull/1311))
-* `resource/virtual_machine`: Limit netmask length for ipv4 and ipv6 netmasks. ([#1321](https://github.com/hashicorp/terraform-provider-vsphere/pull/1321))
+* `resource/vsphere_entity_permissions`: Sorting permission objects on user name/group name before storing. ([#1311](https://github.com/hashicorp/terraform-provider-vsphere/pull/1311))
+* `resource/virtual_machine`: Limit netmask length for ipv4 and ipv6 netmask. ([#1321](https://github.com/hashicorp/terraform-provider-vsphere/pull/1321))
 * `resource/virtual_machine`: Fix missing vApp properties. ([#1322](https://github.com/hashicorp/terraform-provider-vsphere/pull/1322))
 
 FEATURES:
@@ -293,7 +296,7 @@ FEATURES:
 
 IMPROVEMENTS:
 
-* `resource/distributed_virtual_switch`: Allow vsphere 7. ([#1363](https://github.com/hashicorp/terraform-provider-vsphere/pull/1363))
+* `resource/distributed_virtual_switch`: Allow vSphere7. ([#1363](https://github.com/hashicorp/terraform-provider-vsphere/pull/1363))
 * `provider`: Bump Go to version 1.16. ([#1365](https://github.com/hashicorp/terraform-provider-vsphere/pull/1365))
 
 ## 1.24.3 (December 14, 2020)
@@ -307,7 +310,7 @@ BUG FIXES:
 
 BUG FIXES:
 
-* `resource/virtual_machine`: Prevent guest_id nil condition. ([#1234](https://github.com/hashicorp/terraform-provider-vsphere/pull/1234))
+* `resource/virtual_machine`: Prevent `guest_id`` nil condition. ([#1234](https://github.com/hashicorp/terraform-provider-vsphere/pull/1234))
 
 ## 1.24.1 (October 07, 2020)
 
@@ -367,11 +370,13 @@ FEATURES:
 * `datasource/entity_permission`: Data source to acquire ESXi host thumbprints . ([#1142](https://github.com/hashicorp/terraform-provider-vsphere/pull/1142))
 
 ## 1.21.1 (July 20, 2020)
+
 BUG FIXES:
 
 * `resource/virtual_machine`: Set guest_id before customization. ([#1139](https://github.com/hashicorp/terraform-provider-vsphere/pull/1139))
 
 ## 1.21.0 (June 30, 2020)
+
 FEATURES:
 
 * `resource/virtual_machine`: Support for SATA and IDE disks. ([#1118](https://github.com/hashicorp/terraform-provider-vsphere/pull/1118))
@@ -591,7 +596,7 @@ IMPROVEMENTS:
 * Add missing ENV variable checks for acceptance tests. ([#758](https://github.com/hashicorp/terraform-provider-vsphere/pull/758))
 * Switch to Terraform 0.12 SDK which is required for Terraform 0.12 support.
   This is the first release to use the 0.12 SDK required for Terraform 0.12
-  support. Some provider behaviour may have changed as a result of changes made
+  support. Some provider behavior may have changed as a result of changes made
   by the new SDK version. ([#760](https://github.com/hashicorp/terraform-provider-vsphere/pull/760))
 
 ## 1.10.0 (March 15, 2019)
@@ -960,7 +965,7 @@ BREAKING CHANGES:
 To transition to the new syntax, any `disk` sub-resource in a
 `vsphere_virtual_machine` resource that depends on a syntax such as:
 
-```
+```hcl
 resource "vsphere_virtual_machine" "vm" {
   ...
 
@@ -973,7 +978,7 @@ resource "vsphere_virtual_machine" "vm" {
 
 Should be changed to:
 
-```
+```hcl
 resource "vsphere_virtual_machine" "vm" {
   ...
 
@@ -987,7 +992,7 @@ resource "vsphere_virtual_machine" "vm" {
 If you are using `linked_clone`, add the new settings for `eagerly_scrub` and
 `thin_provisioned`:
 
-```
+```hcl
 resource "vsphere_virtual_machine" "vm" {
   ...
 
@@ -1141,8 +1146,8 @@ FEATURES:
 
 * **New Data Source:** `vsphere_tag` ([#171](https://github.com/hashicorp/terraform-provider-vsphere/issues/171))
 * **New Data Source:** `vsphere_tag_category` ([#167](https://github.com/hashicorp/terraform-provider-vsphere/issues/167))
-* **New Resoruce:** `vsphere_tag` ([#171](https://github.com/hashicorp/terraform-provider-vsphere/issues/171))
-* **New Resoruce:** `vsphere_tag_category` ([#164](https://github.com/hashicorp/terraform-provider-vsphere/issues/164))
+* **New Resource:** `vsphere_tag` ([#171](https://github.com/hashicorp/terraform-provider-vsphere/issues/171))
+* **New Resource:** `vsphere_tag_category` ([#164](https://github.com/hashicorp/terraform-provider-vsphere/issues/164))
 
 IMPROVEMENTS:
 
@@ -1174,7 +1179,7 @@ BUG FIXES:
 
 BREAKING CHANGES:
 
-* `vsphere_virtual_machine` now waits on a _routeable_ IP address by default,
+* `vsphere_virtual_machine` now waits on a _routable_ IP address by default,
   and does not wait when running `terraform plan`, `terraform refresh`, or
   `terraform destroy`. There is also now a timeout of 5 minutes, after which
   `terraform apply` will fail with an error. Note that the apply may not fail
@@ -1245,7 +1250,7 @@ IMPROVEMENTS:
 BUG FIXES:
 
 * Updated [govmomi](https://github.com/vmware/govmomi) to v0.15.0 ([#114](https://github.com/hashicorp/terraform-provider-vsphere/issues/114))
-* Updated network interface discovery behaviour in refresh. [[#129](https://github.com/hashicorp/terraform-provider-vsphere/issues/129)]. This fixes
+* Updated network interface discovery behavior in refresh. [[#129](https://github.com/hashicorp/terraform-provider-vsphere/issues/129)]. This fixes
   several reported bugs - see the PR for references!
 
 ## 0.1.0 (June 20, 2017)

diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -11,6 +11,7 @@ The Terraform provider for VMware vSphere team at HashiCorp include:
 Collaborators from VMware include:
 
 * Ryan Johnson, Senior Staff Solutions Architect - [@tenthirtyam](https://github.com/tenthirtyam)
+* Vasil Atanasov, Member of Technical Staff - [@vasilsatanasov](https://github.com/vasilsatanasov)
 
 ### Why isn’t my PR merged yet?
 

diff --git a/vsphere/data_source_vsphere_guest_os_customization.go b/vsphere/data_source_vsphere_guest_os_customization.go
@@ -103,7 +103,7 @@ func dataSourceVSphereGuestOSCustomization() *schema.Resource {
 									"auto_logon": {
 										Type:        schema.TypeBool,
 										Computed:    true,
-										Description: "Specifies whether or not the VM automatically logs on as Administrator.",
+										Description: "Specifies whether or not the guest operating system automatically logs on as Administrator.",
 									},
 									"auto_logon_count": {
 										Type:        schema.TypeInt,

diff --git a/vsphere/internal/vmworkflow/virtual_machine_clone_subresource.go b/vsphere/internal/vmworkflow/virtual_machine_clone_subresource.go
@@ -65,14 +65,14 @@ func VirtualMachineCloneSchema() map[string]*schema.Schema {
 			Type:          schema.TypeList,
 			Optional:      true,
 			MaxItems:      1,
-			Description:   "The customization spec for this clone. This allows the user to configure the virtual machine post-clone.",
+			Description:   "The customization specification for the virtual machine post-clone.",
 			ConflictsWith: []string{"clone.0.customize"},
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"id": {
 						Type:        schema.TypeString,
 						Required:    true,
-						Description: "The id of the GOSC spec equals to the GOSC name - unique per VC",
+						Description: "The unique identifier of the customization specification is its name and is unique per vCenter Server instance.",
 					},
 					"timeout": {
 						Type:        schema.TypeInt,

diff --git a/vsphere/resource_vsphere_guest_os_customization.go b/vsphere/resource_vsphere_guest_os_customization.go
@@ -31,7 +31,7 @@ func resourceVSphereGuestOsCustomizationRead(d *schema.ResourceData, meta interf
 }
 
 func resourceVSphereGuestOsCustomizationCreate(d *schema.ResourceData, meta interface{}) error {
-	log.Printf("[DEBUG] Beginning creation of guest customization spec %s", d.Get("name"))
+	log.Printf("[DEBUG] Beginning creation of customization specification %s", d.Get("name"))
 	client := meta.(*Client).vimClient
 	ctx, cancel := context.WithTimeout(context.Background(), provider.DefaultAPITimeout)
 	defer cancel()