registry_gpg_key: Add plan mod for provider org default changes

Author: brandonc

internal/provider/provider_custom_diffs.go

@@ -3,6 +3,9 @@ package provider
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -13,11 +16,30 @@ func customizeDiffIfProviderDefaultOrganizationChanged(c context.Context, diff *
 	plannedOrg := diff.Get("organization").(string)
 
 	if configOrg.IsNull() && config.Organization != plannedOrg {
-		// There is no organization configured on the resource, yet it is different from
-		// the state organization. We must conclude that the provider default organization changed.
+		// There is no organization configured on the resource, yet the provider org is different from
+		// the planned organization. We must conclude that the provider default organization changed.
 		if err := diff.SetNew("organization", config.Organization); err != nil {
 			return err
 		}
 	}
 	return nil
 }
+
+func modifyPlanForDefaultOrganizationChange(ctx context.Context, providerDefaultOrg string, req resource.ModifyPlanRequest, resp *resource.ModifyPlanResponse) {
+	if req.State.Raw.IsNull() {
+		return
+	}
+
+	orgPath := path.Root("organization")
+
+	var configOrg, plannedOrg *string
+	resp.Diagnostics.Append(req.Config.GetAttribute(ctx, orgPath, &configOrg)...)
+	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, orgPath, &plannedOrg)...)
+
+	if configOrg == nil && plannedOrg != nil && providerDefaultOrg != *plannedOrg {
+		// There is no organization configured on the resource, yet the provider org is different from
+		// the planned organization value. We must conclude that the provider default organization changed.
+		resp.Plan.SetAttribute(ctx, orgPath, types.StringValue(providerDefaultOrg))
+		resp.RequiresReplace.Append(orgPath)
+	}
+}

internal/provider/resource_tfe_registry_gpg_key.go

@@ -37,6 +37,10 @@ func (r *resourceTFERegistryGPGKey) Metadata(ctx context.Context, req resource.M
 	resp.TypeName = req.ProviderTypeName + "_registry_gpg_key"
 }
 
+func (r *resourceTFERegistryGPGKey) ModifyPlan(ctx context.Context, req resource.ModifyPlanRequest, resp *resource.ModifyPlanResponse) {
+	modifyPlanForDefaultOrganizationChange(ctx, r.config.Organization, req, resp)
+}
+
 func (r *resourceTFERegistryGPGKey) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Description: "Manages a public key of the GPG key pair used to sign releases of private providers in the private registry.",
@@ -57,6 +61,9 @@ func (r *resourceTFERegistryGPGKey) Schema(ctx context.Context, req resource.Sch
 				Validators: []validator.String{
 					stringvalidator.LengthAtLeast(1),
 				},
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
 			},
 			"ascii_armor": schema.StringAttribute{
 				Description: "ASCII-armored representation of the GPG key.",
@@ -175,12 +182,10 @@ func (r *resourceTFERegistryGPGKey) Update(ctx context.Context, req resource.Upd
 
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+
 	if resp.Diagnostics.HasError() {
 		return
 	}