Merge pull request #773 from Juniper/bug/772-404-handling

Bugfix: Handle 404s when resource not found
Juniper · Aug 9, 2024 · 9b2036e · 9b2036e
2 parents 3a666d3 + 9b9cfbd
commit 9b2036e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/apstra/resource_freeform_allocation_group.go b/apstra/resource_freeform_allocation_group.go
@@ -95,7 +95,7 @@ func (o *resourceFreeformAllocGroup) Read(ctx context.Context, req resource.Read
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())

diff --git a/apstra/resource_freeform_config_template.go b/apstra/resource_freeform_config_template.go
@@ -95,7 +95,7 @@ func (o *resourceFreeformConfigTemplate) Read(ctx context.Context, req resource.
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())

diff --git a/apstra/resource_freeform_link.go b/apstra/resource_freeform_link.go
@@ -102,7 +102,7 @@ func (o *resourceFreeformLink) Read(ctx context.Context, req resource.ReadReques
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())

diff --git a/apstra/resource_freeform_property_set.go b/apstra/resource_freeform_property_set.go
@@ -95,7 +95,7 @@ func (o *resourceFreeformPropertySet) Read(ctx context.Context, req resource.Rea
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())

diff --git a/apstra/resource_freeform_resource.go b/apstra/resource_freeform_resource.go
@@ -191,7 +191,7 @@ func (o *resourceFreeformResource) Read(ctx context.Context, req resource.ReadRe
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())

diff --git a/apstra/resource_freeform_resource_group.go b/apstra/resource_freeform_resource_group.go
@@ -98,7 +98,7 @@ func (o *resourceFreeformResourceGroup) Read(ctx context.Context, req resource.R
 	bp, err := o.getBpClientFunc(ctx, state.BlueprintId.ValueString())
 	if err != nil {
 		if utils.IsApstra404(err) {
-			resp.Diagnostics.AddError(fmt.Sprintf("blueprint %s not found", state.BlueprintId), err.Error())
+			resp.State.RemoveResource(ctx)
 			return
 		}
 		resp.Diagnostics.AddError("failed to create blueprint client", err.Error())