Add support for in-place updates of application type versions and enhance error handling for existing application types

Author: williamoconnorme

README.md

@@ -46,10 +46,12 @@ provider "servicefabric" {
   client_id               = "22222222-2222-2222-2222-222222222222"
   client_secret           = var.service_principal_secret
   # default_credential_type = "azure_cli" # Optional override of the DefaultAzureCredential chain
+  # allow_application_type_version_updates = true
 }
 ```
 
 Optional provider argument `application_recreate_on_upgrade` (default `true`) controls whether replacing an existing application triggers a Service Fabric upgrade with ForceRestart instead of deleting the application.
+Set `allow_application_type_version_updates = true` to enable in-place updates of `servicefabric_application_type` versions during Terraform apply (the previous version remains registered in the cluster unless you unprovision it manually).
 
 ### Authentication Notes
 
@@ -150,6 +152,7 @@ provider "servicefabric" {
   client_id               = "22222222-2222-2222-2222-222222222222"
   client_secret           = var.service_principal_secret
   # default_credential_type = "managed_identity"
+  # allow_application_type_version_updates = true
 }
 
 resource "servicefabric_application_type" "sample" {

docs/index.md

@@ -54,6 +54,7 @@ The following arguments are supported in the provider block:
 - `tenant_id`, `client_id`, `client_secret` (Optional) Entra credential details.
 - `default_credential_type` (Optional) Restrict the DefaultAzureCredential chain to a single credential (`default`, `environment`, `workload_identity`, `managed_identity`, `azure_cli`, `azure_developer_cli`, `azure_powershell`).
 - `application_recreate_on_upgrade` (Optional) When true, replacements of existing applications trigger an upgrade with ForceRestart instead of deleting and recreating the application.
+- `allow_application_type_version_updates` (Optional) Permit in-place updates to `servicefabric_application_type` versions. When true, Terraform will show an update instead of a replacement, even though the previous version remains registered unless manually unprovisioned.
 
 ## Resources
 

docs/resources/application_type.md

@@ -21,7 +21,8 @@ The following arguments are supported:
 - `name` (Required) - Application type name as defined in the application
   manifest. Changing this recreates the resource.
 - `version` (Required) - Application type version. Changing this recreates the
-  resource.
+  resource unless the provider option `allow_application_type_version_updates`
+  is enabled.
 - `package_uri` (Required) - HTTPS URI to the `.sfpkg` package. Usually a SAS
   URL in Azure Blob Storage. Changing this recreates the resource.
 - `retain_versions` (Optional) - Defaults to `false`. When enabled the resource
@@ -35,6 +36,11 @@ In addition to the arguments above, the following attributes are exported:
 - `id` - Combination of `name/version`.
 - `status` - Provisioning status reported by the cluster.
 
+> **Note:** Enabling the provider option `allow_application_type_version_updates`
+> allows Terraform to update the `version` and `package_uri` in place. The
+> previous version remains registered in the cluster unless you unprovision it
+> manually or disable `retain_versions` and destroy the resource.
+
 ## Import
 
 Application types can be imported using `name/version`, for example:

internal/provider/provider.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net/http"
+	"sync/atomic"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
@@ -39,14 +40,18 @@ type serviceFabricProviderModel struct {
 	ClientCertificatePath        types.String `tfsdk:"client_certificate_path"`
 	ClientCertificatePassword    types.String `tfsdk:"client_certificate_password"`
 	ApplicationRecreateOnUpgrade types.Bool   `tfsdk:"application_recreate_on_upgrade"`
+	AllowApplicationTypeUpdates  types.Bool   `tfsdk:"allow_application_type_version_updates"`
 }
 
 type serviceFabricProvider struct{}
 
 type providerFeatures struct {
 	ApplicationRecreateOnUpgrade bool
+	AllowApplicationTypeUpdates  bool
 }
 
+var allowApplicationTypeUpdatesFlag atomic.Bool
+
 type providerData struct {
 	Client   *servicefabric.Client
 	Features providerFeatures
@@ -106,6 +111,10 @@ func (p *serviceFabricProvider) Schema(_ context.Context, _ provider.SchemaReque
 				Optional:    true,
 				Description: "When true, replacements of existing applications trigger a Service Fabric upgrade with ForceRestart instead of deleting and recreating the application. Defaults to true.",
 			},
+			"allow_application_type_version_updates": providerschema.BoolAttribute{
+				Optional:    true,
+				Description: "When true, version changes for servicefabric_application_type are applied in-place instead of forcing Terraform replacement. Use with caution: Terraform will treat the existing resource as updated even though the old version may remain registered in the cluster.",
+			},
 		},
 	}
 }
@@ -243,6 +252,10 @@ func (p *serviceFabricProvider) Configure(ctx context.Context, req provider.Conf
 	if !config.ApplicationRecreateOnUpgrade.IsNull() && !config.ApplicationRecreateOnUpgrade.IsUnknown() {
 		features.ApplicationRecreateOnUpgrade = config.ApplicationRecreateOnUpgrade.ValueBool()
 	}
+	if !config.AllowApplicationTypeUpdates.IsNull() && !config.AllowApplicationTypeUpdates.IsUnknown() {
+		features.AllowApplicationTypeUpdates = config.AllowApplicationTypeUpdates.ValueBool()
+	}
+	allowApplicationTypeUpdatesFlag.Store(features.AllowApplicationTypeUpdates)
 
 	providerData := &providerData{
 		Client:   client,
@@ -253,6 +266,10 @@ func (p *serviceFabricProvider) Configure(ctx context.Context, req provider.Conf
 	resp.ResourceData = providerData
 }
 
+func allowApplicationTypeUpdatesEnabled() bool {
+	return allowApplicationTypeUpdatesFlag.Load()
+}
+
 // Resources returns the resources implemented by the provider.
 func (p *serviceFabricProvider) Resources(_ context.Context) []func() resource.Resource {
 	return []func() resource.Resource{

internal/provider/resource_application_type.go

@@ -26,6 +26,32 @@ type applicationTypeResource struct {
 	features providerFeatures
 }
 
+func (r *applicationTypeResource) computeID(name, version string) string {
+	if allowApplicationTypeUpdatesEnabled() || r.features.AllowApplicationTypeUpdates {
+		return name
+	}
+	return fmt.Sprintf("%s/%s", name, version)
+}
+
+type featureAwareVersionPlanModifier struct {
+	resource *applicationTypeResource
+}
+
+func (m featureAwareVersionPlanModifier) Description(_ context.Context) string {
+	return "Requires replacement when provider feature allow_application_type_version_updates is disabled."
+}
+
+func (m featureAwareVersionPlanModifier) MarkdownDescription(_ context.Context) string {
+	return "Requires replacement when provider feature `allow_application_type_version_updates` is disabled."
+}
+
+func (m featureAwareVersionPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
+	if allowApplicationTypeUpdatesEnabled() || (m.resource != nil && m.resource.features.AllowApplicationTypeUpdates) {
+		return
+	}
+	stringplanmodifier.RequiresReplace().PlanModifyString(ctx, req, resp)
+}
+
 type applicationTypeResourceModel struct {
 	ID             types.String `tfsdk:"id"`
 	Name           types.String `tfsdk:"name"`
@@ -58,16 +84,16 @@ func (r *applicationTypeResource) Schema(_ context.Context, _ resource.SchemaReq
 					stringplanmodifier.RequiresReplace(),
 				},
 			},
-			"version": rschema.StringAttribute{
-				Required: true,
-				Validators: []validator.String{
-					stringvalidator.LengthAtLeast(1),
-				},
-				Description: "Application type version.",
-				PlanModifiers: []planmodifier.String{
-					stringplanmodifier.RequiresReplace(),
-				},
+		"version": rschema.StringAttribute{
+			Required: true,
+			Validators: []validator.String{
+				stringvalidator.LengthAtLeast(1),
+			},
+			Description: "Application type version.",
+			PlanModifiers: []planmodifier.String{
+				featureAwareVersionPlanModifier{resource: r},
 			},
+		},
 			"package_uri": rschema.StringAttribute{
 				Required:    true,
 				Description: "Service Fabric package URI (SAS URL) pointing to the SFPKG.",
@@ -110,16 +136,23 @@ func (r *applicationTypeResource) Create(ctx context.Context, req resource.Creat
 	}
 
 	if err := r.client.ProvisionApplicationType(ctx, plan.Name.ValueString(), plan.Version.ValueString(), plan.PackageURI.ValueString()); err != nil {
-		resp.Diagnostics.AddError("Provisioning failed", err.Error())
-		return
+		if servicefabric.IsApplicationTypeAlreadyExistsError(err) {
+			tflog.Info(ctx, "Application type version already provisioned", map[string]any{
+				"name":    plan.Name.ValueString(),
+				"version": plan.Version.ValueString(),
+			})
+		} else {
+			resp.Diagnostics.AddError("Provisioning failed", err.Error())
+			return
+		}
 	}
 
 	tflog.Info(ctx, "Provisioned Service Fabric application type", map[string]any{
 		"name":    plan.Name.ValueString(),
 		"version": plan.Version.ValueString(),
 	})
 
-	plan.ID = types.StringValue(fmt.Sprintf("%s/%s", plan.Name.ValueString(), plan.Version.ValueString()))
+	plan.ID = types.StringValue(r.computeID(plan.Name.ValueString(), plan.Version.ValueString()))
 
 	if err := r.readIntoState(ctx, &plan); err != nil {
 		resp.Diagnostics.AddError("Failed to read application type", err.Error())
@@ -154,9 +187,7 @@ func (r *applicationTypeResource) readIntoState(ctx context.Context, state *appl
 		return err
 	}
 	state.Status = types.StringValue(info.Status)
-	if state.ID.IsNull() || state.ID.ValueString() == "" {
-		state.ID = types.StringValue(fmt.Sprintf("%s/%s", state.Name.ValueString(), state.Version.ValueString()))
-	}
+	state.ID = types.StringValue(r.computeID(state.Name.ValueString(), state.Version.ValueString()))
 	if state.RetainVersions.IsNull() || state.RetainVersions.IsUnknown() {
 		state.RetainVersions = types.BoolValue(false)
 	}
@@ -172,13 +203,23 @@ func (r *applicationTypeResource) Update(ctx context.Context, req resource.Updat
 		return
 	}
 
+	if plan.RetainVersions.IsNull() || plan.RetainVersions.IsUnknown() {
+		plan.RetainVersions = state.RetainVersions
+	}
+	if plan.Status.IsNull() || plan.Status.IsUnknown() {
+		plan.Status = state.Status
+	}
+	if plan.ID.IsNull() || plan.ID.IsUnknown() {
+		plan.ID = state.ID
+	}
+
 	versionChanged := plan.Version.ValueString() != state.Version.ValueString()
 	packageChanged := plan.PackageURI.ValueString() != state.PackageURI.ValueString()
 
-	if versionChanged {
+	if versionChanged && !r.features.AllowApplicationTypeUpdates {
 		resp.Diagnostics.AddError(
 			"Application type version change requires replacement",
-			"Terraform planned an in-place update but version changes are handled via resource replacement. Set `lifecycle { create_before_destroy = true }` if you need zero-downtime upgrades.",
+			"Terraform planned an in-place update but version changes are handled via resource replacement. Enable provider setting `allow_application_type_version_updates` to permit in-place updates, or set `lifecycle { create_before_destroy = true }` for zero-downtime upgrades.",
 		)
 		return
 	}
@@ -189,11 +230,18 @@ func (r *applicationTypeResource) Update(ctx context.Context, req resource.Updat
 	}
 
 	if err := r.client.ProvisionApplicationType(ctx, plan.Name.ValueString(), plan.Version.ValueString(), plan.PackageURI.ValueString()); err != nil {
-		resp.Diagnostics.AddError("Provisioning failed", err.Error())
-		return
+		if servicefabric.IsApplicationTypeAlreadyExistsError(err) {
+			tflog.Info(ctx, "Application type version already provisioned", map[string]any{
+				"name":    plan.Name.ValueString(),
+				"version": plan.Version.ValueString(),
+			})
+		} else {
+			resp.Diagnostics.AddError("Provisioning failed", err.Error())
+			return
+		}
 	}
 
-	plan.ID = types.StringValue(fmt.Sprintf("%s/%s", plan.Name.ValueString(), plan.Version.ValueString()))
+	plan.ID = types.StringValue(r.computeID(plan.Name.ValueString(), plan.Version.ValueString()))
 
 	if err := r.readIntoState(ctx, &plan); err != nil {
 		resp.Diagnostics.AddError("Failed to read application type", err.Error())

internal/servicefabric/errors.go

@@ -41,6 +41,16 @@ func IsApplicationTypeInUseError(err error) bool {
 	return false
 }
 
+// IsApplicationTypeAlreadyExistsError reports whether the error corresponds to an
+// attempt to provision an application type version that already exists.
+func IsApplicationTypeAlreadyExistsError(err error) bool {
+	var apiErr *APIError
+	if errors.As(err, &apiErr) {
+		return apiErr.StatusCode == http.StatusConflict && apiErr.Code == "FABRIC_E_APPLICATION_TYPE_ALREADY_EXISTS"
+	}
+	return false
+}
+
 // IsApplicationUpgradeInProgressError reports whether an upgrade is already in progress.
 func IsApplicationUpgradeInProgressError(err error) bool {
 	var apiErr *APIError