Merge pull request #522 from vmware/fix-cloud-account-update

Fix update for vSphere/VMC/NSX-T/NSX-V cloud accounts

Author: frodenas

vra/resource_cloud_account_nsxt.go

@@ -191,8 +191,14 @@ func resourceCloudAccountNSXTUpdate(ctx context.Context, d *schema.ResourceData,
 			WithAPIVersion(IaaSAPIVersion).
 			WithID(id).
 			WithBody(&models.UpdateCloudAccountNsxTSpecification{
-				Description: d.Get("description").(string),
-				Tags:        expandTags(d.Get("tags").(*schema.Set).List()),
+				AcceptSelfSignedCertificate: d.Get("accept_self_signed_cert").(bool),
+				Dcid:                        withString(d.Get("dc_id").(string)),
+				Description:                 d.Get("description").(string),
+				HostName:                    withString(d.Get("hostname").(string)),
+				Name:                        d.Get("name").(string),
+				Password:                    withString(d.Get("password").(string)),
+				Tags:                        expandTags(d.Get("tags").(*schema.Set).List()),
+				Username:                    withString(d.Get("username").(string)),
 			}))
 	if err != nil {
 		return diag.FromErr(err)

vra/resource_cloud_account_nsxv.go

@@ -173,8 +173,12 @@ func resourceCloudAccountNSXVUpdate(ctx context.Context, d *schema.ResourceData,
 			WithAPIVersion(IaaSAPIVersion).
 			WithID(id).
 			WithBody(&models.UpdateCloudAccountNsxVSpecification{
-				Description: d.Get("description").(string),
-				Tags:        expandTags(d.Get("tags").(*schema.Set).List()),
+				AcceptSelfSignedCertificate: d.Get("accept_self_signed_cert").(bool),
+				Dcid:                        withString(d.Get("dc_id").(string)),
+				HostName:                    withString(d.Get("hostname").(string)),
+				Name:                        d.Get("name").(string),
+				Password:                    withString(d.Get("password").(string)),
+				Username:                    withString(d.Get("username").(string)),
 			}))
 	if err != nil {
 		return diag.FromErr(err)

vra/resource_cloud_account_vmc.go

@@ -229,6 +229,7 @@ func resourceCloudAccountVMCUpdate(ctx context.Context, d *schema.ResourceData,
 			WithBody(&models.UpdateCloudAccountSpecification{
 				CreateDefaultZones: false,
 				Description:        d.Get("description").(string),
+				Name:               d.Get("name").(string),
 				Regions:            regions,
 				Tags:               expandTags(d.Get("tags").(*schema.Set).List()),
 			}))

vra/resource_cloud_account_vsphere.go

@@ -213,10 +213,18 @@ func resourceCloudAccountVsphereRead(_ context.Context, d *schema.ResourceData,
 }
 
 func resourceCloudAccountVsphereUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var associatedCloudAccountIDs []string
 	var regions []*models.RegionSpecification
 
 	apiClient := m.(*Client).apiClient
 
+	if v, ok := d.GetOk("associated_cloud_account_ids"); ok {
+		if !compareUnique(v.(*schema.Set).List()) {
+			return diag.FromErr(errors.New("specified associated cloud account ids are not unique"))
+		}
+		associatedCloudAccountIDs = expandStringList(v.(*schema.Set).List())
+	}
+
 	if v, ok := d.GetOk("regions"); ok {
 		if !compareUnique(v.(*schema.Set).List()) {
 			return diag.FromErr(errors.New("specified regions are not unique"))
@@ -230,14 +238,16 @@ func resourceCloudAccountVsphereUpdate(ctx context.Context, d *schema.ResourceDa
 			WithAPIVersion(IaaSAPIVersion).
 			WithID(id).
 			WithBody(&models.UpdateCloudAccountVsphereSpecification{
-				CreateDefaultZones: false,
-				Description:        d.Get("description").(string),
-				HostName:           withString(d.Get("hostname").(string)),
-				Name:               d.Get("name").(string),
-				Password:           d.Get("password").(string),
-				Regions:            regions,
-				Tags:               expandTags(d.Get("tags").(*schema.Set).List()),
-				Username:           d.Get("username").(string),
+				AcceptSelfSignedCertificate: d.Get("accept_self_signed_cert").(bool),
+				AssociatedCloudAccountIds:   associatedCloudAccountIDs,
+				CreateDefaultZones:          false,
+				Description:                 d.Get("description").(string),
+				HostName:                    withString(d.Get("hostname").(string)),
+				Name:                        d.Get("name").(string),
+				Password:                    d.Get("password").(string),
+				Regions:                     regions,
+				Tags:                        expandTags(d.Get("tags").(*schema.Set).List()),
+				Username:                    d.Get("username").(string),
 			}))
 	if err != nil {
 		return diag.FromErr(err)