Fix tenant resource failed read issue

OctopusDeployLabs · Aug 11, 2024 · 3db3bac · 3db3bac
1 parent 79fbbf3
commit 3db3bac
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/internal/errors/error.go b/internal/errors/error.go
@@ -38,6 +38,12 @@ func DeleteFromStateV2(ctx context.Context, resp *resource.ReadResponse, resourc
 	return nil
 }
 
+func DeleteFromUpdateStateV2(ctx context.Context, resp *resource.UpdateResponse, resource schemas.IResourceModel, resourceDescription string) error {
+	log.Printf("[INFO] %s (%s) not found; deleting from state", resourceDescription, resource.GetID())
+	resp.State.RemoveResource(ctx)
+	return nil
+}
+
 func ProcessApiErrorV2(ctx context.Context, resp *resource.ReadResponse, resource schemas.IResourceModel, err error, resourceDescription string) error {
 	if err == nil {
 		return nil
@@ -51,3 +57,17 @@ func ProcessApiErrorV2(ctx context.Context, resp *resource.ReadResponse, resourc
 
 	return nil
 }
+
+func ProcessUpdateApiErrorV2(ctx context.Context, resp *resource.UpdateResponse, resource schemas.IResourceModel, err error, resourceDescription string) error {
+	if err == nil {
+		return nil
+	}
+
+	if apiError, ok := err.(*core.APIError); ok {
+		if apiError.StatusCode == http.StatusNotFound {
+			return DeleteFromUpdateStateV2(ctx, resp, resource, resourceDescription)
+		}
+	}
+
+	return nil
+}
diff --git a/octopusdeploy_framework/resource_tenant.go b/octopusdeploy_framework/resource_tenant.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/tenants"
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/internal"
+	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/internal/errors"
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/octopusdeploy_framework/schemas"
 	"github.com/OctopusDeploy/terraform-provider-octopusdeploy/octopusdeploy_framework/util"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
@@ -109,7 +110,7 @@ func (r *tenantTypeResource) Update(ctx context.Context, req resource.UpdateRequ
 	tenant, err := mapStateToTenant(data)
 	tenant.ID = state.ID.ValueString()
 	if err != nil {
-		if err := errors.ProcessApiErrorV2(ctx, resp, data, err, "tenant"); err != nil {
+		if err := errors.ProcessUpdateApiErrorV2(ctx, resp, data, err, "tenant"); err != nil {
 			resp.Diagnostics.AddError("unable to load tenant", err.Error())
 		}
 		return

diff --git a/octopusdeploy_framework/schemas/tenant.go b/octopusdeploy_framework/schemas/tenant.go
@@ -15,10 +15,11 @@ import (
 type TenantModel struct {
 	ClonedFromTenantId types.String `tfsdk:"cloned_from_tenant_id"`
 	Description        types.String `tfsdk:"description"`
-	ID                 types.String `tfsdk:"id"`
 	Name               types.String `tfsdk:"name"`
 	SpaceID            types.String `tfsdk:"space_id"`
 	TenantTags         types.List   `tfsdk:"tenant_tags"`
+
+	ResourceModel
 }
 
 type TenantsModel struct {
@@ -133,4 +134,3 @@ func GetTenantResourceSchema() map[string]resourceSchema.Attribute {
 		},
 	}
 }
-