Merge pull request #16 from browningluke/handle_upstream_deletion

Handle upstream resource deletion

internal/service/interfaces_vlan_resource.go

@@ -98,6 +98,12 @@ func (r *InterfacesVlanResource) Read(ctx context.Context, req resource.ReadRequ
 	// Get VLAN from OPNsense core API
 	vlan, err := r.client.Interfaces.GetVlan(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("vlan not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read vlan, got error: %s", err))
 		return

internal/service/route_resource.go

@@ -98,6 +98,12 @@ func (r *RouteResource) Read(ctx context.Context, req resource.ReadRequest, resp
 	// Get route from OPNsense core API
 	route, err := r.client.Routes.GetRoute(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("route not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read route, got error: %s", err))
 		return

internal/service/unbound_domain_override_resource.go

@@ -98,6 +98,12 @@ func (r *UnboundDomainOverrideResource) Read(ctx context.Context, req resource.R
 	// Get domain override from OPNsense unbound API
 	override, err := r.client.Unbound.GetDomainOverride(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("domain override not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read domain override, got error: %s", err))
 		return

internal/service/unbound_forward_resource.go

@@ -98,6 +98,12 @@ func (r *UnboundForwardResource) Read(ctx context.Context, req resource.ReadRequ
 	// Get forward from OPNsense unbound API
 	forward, err := r.client.Unbound.GetForward(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("forward not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read forward, got error: %s", err))
 		return

internal/service/unbound_host_alias_resource.go

@@ -100,6 +100,12 @@ func (r *UnboundHostAliasResource) Read(ctx context.Context, req resource.ReadRe
 	// Get host alias from OPNsense unbound API
 	alias, err := r.client.Unbound.GetHostAlias(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("host alias not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read parse alias, got error: %s", err))
 		return

internal/service/unbound_host_override_resource.go

@@ -98,6 +98,12 @@ func (r *UnboundHostOverrideResource) Read(ctx context.Context, req resource.Rea
 	// Get host override from OPNsense unbound API
 	override, err := r.client.Unbound.GetHostOverride(ctx, data.Id.ValueString())
 	if err != nil {
+		if err.Error() == "unable to find resource. it may have been deleted upstream" {
+			tflog.Warn(ctx, fmt.Sprintf("host override not present in remote, removing from state"))
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError("Client Error",
 			fmt.Sprintf("Unable to read host override, got error: %s", err))
 		return