Fix Org Settings + Org LDAP destroy issues (#61)

Signed-off-by: abarreiro <abarreiro@vmware.com>

Author: adambarreiro

.changes/v1.0.0/26-features.md

@@ -1,4 +1,4 @@
-- **New Resource:** `vcfa_org_ldap` to manage LDAP settings of Organizations [GH-26, GH-28, GH-50]
-- **New Data Source:** `vcfa_org_ldap` to read LDAP settings of Organizations [GH-26, GH-28, GH-50]
+- **New Resource:** `vcfa_org_ldap` to manage LDAP settings of Organizations [GH-26, GH-28, GH-50, GH-61]
+- **New Data Source:** `vcfa_org_ldap` to read LDAP settings of Organizations [GH-26, GH-28, GH-50, GH-61]
 - **New Resource:** `vcfa_provider_ldap` to manage global Provider LDAP settings [GH-28]
 - **New Data Source:** `vcfa_provider_ldap` to read global Provider LDAP settings [GH-28]

.changes/v1.0.0/50-features.md

@@ -1,2 +1,2 @@
-- **New Resource:** `vcfa_org_settings` to manage Organization general settings [GH-50]
-- **New Data Source:** `vcfa_org_settings` to read Organization general settings [GH-50]
+- **New Resource:** `vcfa_org_settings` to manage Organization general settings [GH-50, GH-61]
+- **New Data Source:** `vcfa_org_settings` to read Organization general settings [GH-50, GH-61]

vcfa/resource_vcfa_org_ldap.go

@@ -242,13 +242,18 @@ func resourceVcfaOrgLdap() *schema.Resource {
 }
 
 func resourceVcfaOrgLdapCreateOrUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}, origin string) diag.Diagnostics {
+	// Lock the Organization to serialize create/update operation and prevent side effects like bricked Organizations when
+	// vcfa_org_settings is updated at the same time
+	orgId := d.Get("org_id").(string)
+	vcfa.kvLock(orgId)
+	defer vcfa.kvUnlock(orgId)
+
 	settings, err := fillOrgLdapSettings(d)
 	if err != nil {
 		return diag.Errorf("[Org LDAP %s] error collecting settings values: %s", origin, err)
 	}
 
 	tmClient := meta.(ClientContainer).tmClient
-	orgId := d.Get("org_id").(string)
 	org, err := tmClient.GetTmOrgById(orgId)
 	if err != nil {
 		return diag.Errorf("[Org LDAP %s] error searching for Org %s: %s", origin, orgId, err)
@@ -350,8 +355,13 @@ func resourceVcfaOrgLdapUpdate(ctx context.Context, d *schema.ResourceData, meta
 }
 
 func resourceVcfaOrgLdapDelete(_ context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	tmClient := meta.(ClientContainer).tmClient
+	// Lock the Organization to serialize delete operation and prevent side effects like bricked Organizations when
+	// vcfa_org_settings is deleted at the same time
 	orgId := d.Get("org_id").(string)
+	vcfa.kvLock(orgId)
+	defer vcfa.kvUnlock(orgId)
+
+	tmClient := meta.(ClientContainer).tmClient
 
 	tmOrg, err := tmClient.GetTmOrgById(orgId)
 	if err != nil {

vcfa/resource_vcfa_org_settings.go

@@ -44,11 +44,17 @@ func resourceVcfaOrgSettings() *schema.Resource {
 }
 
 func resourceVcfaOrgSettingsCreateUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	// Lock the Organization to serialize create/update operation and prevent side effects like bricked Organizations when
+	// vcfa_org_ldap is updated at the same time
+	orgId := d.Get("org_id").(string)
+	vcfa.kvLock(orgId)
+	defer vcfa.kvUnlock(orgId)
+
 	tmClient := meta.(ClientContainer).tmClient
 
-	org, err := tmClient.GetTmOrgById(d.Get("org_id").(string))
+	org, err := tmClient.GetTmOrgById(orgId)
 	if err != nil {
-		return diag.Errorf("error retrieving %s: %s", labelVcfaOrg, err)
+		return diag.Errorf("error retrieving %s '%s' : %s", labelVcfaOrg, orgId, err)
 	}
 
 	d.SetId(org.TmOrg.ID)
@@ -95,10 +101,16 @@ func resourceVcfaOrgSettingsRead(ctx context.Context, d *schema.ResourceData, me
 }
 
 func resourceVcfaOrgSettingsDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	// Lock the Organization to serialize delete operation and prevent side effects like bricked Organizations when
+	// vcfa_org_ldap is deleted at the same time
+	orgId := d.Get("org_id").(string)
+	vcfa.kvLock(orgId)
+	defer vcfa.kvUnlock(orgId)
+
 	tmClient := meta.(ClientContainer).tmClient
-	org, err := tmClient.GetTmOrgById(d.Get("org_id").(string))
+	org, err := tmClient.GetTmOrgById(orgId)
 	if err != nil {
-		return diag.Errorf("error retrieving %s: %s", labelVcfaOrg, err)
+		return diag.Errorf("error retrieving %s '%s': %s", labelVcfaOrg, orgId, err)
 	}
 
 	// reset settings