notifier: preserve pagerduty credentials when API redacts values

Amp-Thread-ID: https://ampcode.com/threads/T-019cb11d-d0b4-724b-938e-a9eb7f44c002
Co-authored-by: Amp <amp@ampcode.com>

Author: toppercodes

axiom/resource_notifier.go

@@ -346,7 +346,7 @@ func (r *NotifierResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	resp.Diagnostics.Append(resp.State.Set(ctx, flattenNotifier(*notifier))...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, mergeNotifierState(flattenNotifier(*notifier), plan))...)
 }
 
 func (r *NotifierResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -373,7 +373,7 @@ func (r *NotifierResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 
-	resp.Diagnostics.Append(resp.State.Set(ctx, flattenNotifier(*notifier))...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, mergeNotifierState(flattenNotifier(*notifier), plan))...)
 }
 
 func (r *NotifierResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
@@ -397,7 +397,7 @@ func (r *NotifierResource) Update(ctx context.Context, req resource.UpdateReques
 		return
 	}
 
-	resp.Diagnostics.Append(resp.State.Set(ctx, flattenNotifier(*notifier))...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, mergeNotifierState(flattenNotifier(*notifier), plan))...)
 }
 
 func (r *NotifierResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
@@ -488,6 +488,26 @@ func flattenNotifier(notifier axiom.Notifier) NotifierResourceModel {
 	}
 }
 
+func mergeNotifierState(remote NotifierResourceModel, source NotifierResourceModel) NotifierResourceModel {
+	if remote.Properties == nil || source.Properties == nil {
+		return remote
+	}
+
+	if remote.Properties.Pagerduty == nil || source.Properties.Pagerduty == nil {
+		return remote
+	}
+
+	if remote.Properties.Pagerduty.RoutingKey.ValueString() == "" {
+		remote.Properties.Pagerduty.RoutingKey = source.Properties.Pagerduty.RoutingKey
+	}
+
+	if remote.Properties.Pagerduty.Token.ValueString() == "" {
+		remote.Properties.Pagerduty.Token = source.Properties.Pagerduty.Token
+	}
+
+	return remote
+}
+
 func buildNotifierProperties(properties axiom.NotifierProperties) *NotifierProperties {
 	var notifierProperties NotifierProperties
 	if properties.Discord != nil {

axiom/resource_notifier_unit_test.go

@@ -0,0 +1,67 @@
+package axiom
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func TestMergeNotifierStatePagerDutyFallback(t *testing.T) {
+	source := NotifierResourceModel{
+		Properties: &NotifierProperties{
+			Pagerduty: &PagerDutyConfig{
+				RoutingKey: types.StringValue("plan-routing-key"),
+				Token:      types.StringValue("plan-token"),
+			},
+		},
+	}
+
+	remote := NotifierResourceModel{
+		Properties: &NotifierProperties{
+			Pagerduty: &PagerDutyConfig{
+				RoutingKey: types.StringValue(""),
+				Token:      types.StringValue(""),
+			},
+		},
+	}
+
+	merged := mergeNotifierState(remote, source)
+
+	if got := merged.Properties.Pagerduty.RoutingKey.ValueString(); got != "plan-routing-key" {
+		t.Fatalf("RoutingKey = %q, expected plan-routing-key", got)
+	}
+
+	if got := merged.Properties.Pagerduty.Token.ValueString(); got != "plan-token" {
+		t.Fatalf("Token = %q, expected plan-token", got)
+	}
+}
+
+func TestMergeNotifierStatePagerDutyKeepsRemoteValues(t *testing.T) {
+	source := NotifierResourceModel{
+		Properties: &NotifierProperties{
+			Pagerduty: &PagerDutyConfig{
+				RoutingKey: types.StringValue("plan-routing-key"),
+				Token:      types.StringValue("plan-token"),
+			},
+		},
+	}
+
+	remote := NotifierResourceModel{
+		Properties: &NotifierProperties{
+			Pagerduty: &PagerDutyConfig{
+				RoutingKey: types.StringValue("api-routing-key"),
+				Token:      types.StringValue("api-token"),
+			},
+		},
+	}
+
+	merged := mergeNotifierState(remote, source)
+
+	if got := merged.Properties.Pagerduty.RoutingKey.ValueString(); got != "api-routing-key" {
+		t.Fatalf("RoutingKey = %q, expected api-routing-key", got)
+	}
+
+	if got := merged.Properties.Pagerduty.Token.ValueString(); got != "api-token" {
+		t.Fatalf("Token = %q, expected api-token", got)
+	}
+}