Skip template detachment when already detached

CiscoDevNet · Nov 23, 2023 · f9fb96f · f9fb96f
1 parent a763bb7
commit f9fb96f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Add `base_action` attribute to `sdwan_traffic_data_policy_definition` resource and data source
 - Allow full path variables in `sdwan_attach_feature_device_template` resource `variables` section
 - Always include empty lists in payloads to fix various GUI compatibility issues
+- Skip `sdwan_attach_feature_device_template` template detachment when device template is no longer attached
 
 ## 0.2.10
 

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -15,6 +15,7 @@ description: |-
 - Add `base_action` attribute to `sdwan_traffic_data_policy_definition` resource and data source
 - Allow full path variables in `sdwan_attach_feature_device_template` resource `variables` section
 - Always include empty lists in payloads to fix various GUI compatibility issues
+- Skip `sdwan_attach_feature_device_template` template detachment when device template is no longer attached
 
 ## 0.2.10
 

diff --git a/internal/provider/resource_sdwan_attach_feature_device_template.go b/internal/provider/resource_sdwan_attach_feature_device_template.go
@@ -215,11 +215,12 @@ func (r *AttachFeatureDeviceTemplateResource) Delete(ctx context.Context, req re
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to retrieve currently attached devices, got error: %s", err))
 		return
 	}
-	actionId := res.Get("id").String()
-	err = helpers.WaitForActionToComplete(ctx, r.client, actionId)
-	if err != nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to detach device template, got error: %s", err))
-		return
+	if res.Get("id").Exists() {
+		err = helpers.WaitForActionToComplete(ctx, r.client, res.Get("id").String())
+		if err != nil {
+			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to detach device template, got error: %s", err))
+			return
+		}
 	}
 
 	tflog.Debug(ctx, fmt.Sprintf("%s: Delete finished successfully", state.Id.ValueString()))

diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -15,6 +15,7 @@ description: |-
 - Add `base_action` attribute to `sdwan_traffic_data_policy_definition` resource and data source
 - Allow full path variables in `sdwan_attach_feature_device_template` resource `variables` section
 - Always include empty lists in payloads to fix various GUI compatibility issues
+- Skip `sdwan_attach_feature_device_template` template detachment when device template is no longer attached
 
 ## 0.2.10