Normalize default dashboard owner during import

Amp-Thread-ID: https://ampcode.com/threads/T-019cb38a-d07d-75bf-9176-bc810a11c485
Co-authored-by: Amp <amp@ampcode.com>

Author: toppercodes

axiom/resource_dashboard.go

@@ -28,6 +28,8 @@ var dashboardServerManagedFields = map[string]struct{}{
 	"updatedBy": {},
 }
 
+const dashboardDefaultOwner = "x-axiom-everyone"
+
 var (
 	_ resource.Resource                = &DashboardResource{}
 	_ resource.ResourceWithImportState = &DashboardResource{}
@@ -447,6 +449,8 @@ func normalizeDashboardRaw(raw json.RawMessage, configured types.String) (string
 		normalizeConfiguredOwnerCase(parsed, configuredMap)
 	}
 
+	removeDefaultOwnerIfUnconfigured(parsed, configuredMap, hasConfiguredMap)
+
 	for field := range dashboardServerManagedFields {
 		delete(parsed, field)
 	}
@@ -533,6 +537,21 @@ func normalizeConfiguredOwnerCase(parsed, configured map[string]any) {
 	}
 }
 
+func removeDefaultOwnerIfUnconfigured(parsed, configured map[string]any, hasConfiguredMap bool) {
+	owner, ok := stringValueFromMap(parsed, "owner")
+	if !ok || !strings.EqualFold(owner, dashboardDefaultOwner) {
+		return
+	}
+
+	if hasConfiguredMap {
+		if _, configuredHasOwner := configured["owner"]; configuredHasOwner {
+			return
+		}
+	}
+
+	delete(parsed, "owner")
+}
+
 func addDashboardUpdateError(resp *resource.UpdateResponse, err error, uid string, localVersion int64) {
 	addDashboardWriteErrorDiagnostics(&resp.Diagnostics, err, uid, localVersion)
 }

axiom/resource_dashboard_integration_test.go

@@ -63,10 +63,7 @@ func TestAccAxiomDashboardResource_WithProvidedUID(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateId:     uid,
-				ImportStateVerifyIgnore: []string{
-					"dashboard",
-				},
-				ImportStateCheck: testAccCheckImportedDashboardState(uid, updatedName, nil),
+				ImportStateCheck:  testAccCheckImportedDashboardState(uid, updatedName, nil),
 			},
 		},
 	})
@@ -103,7 +100,7 @@ func TestAccAxiomDashboardResource_ServerGeneratedUID(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccAxiomDashboardConfigWithoutUID(updatedName, true),
+				Config: testAccAxiomDashboardConfigWithoutUID(updatedName, false),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAxiomResourcesExist(client, resourceName),
 					resource.TestCheckResourceAttrWith(resourceName, "uid", func(v string) error {
@@ -133,10 +130,6 @@ func TestAccAxiomDashboardResource_ServerGeneratedUID(t *testing.T) {
 					return generatedUID, nil
 				},
 				ImportStateVerify: true,
-				ImportStateVerifyIgnore: []string{
-					"dashboard",
-					"overwrite",
-				},
 				ImportStateCheck: testAccCheckImportedDashboardState(generatedUID, updatedName, func(v string) error {
 					if v != "false" {
 						return fmt.Errorf("expected imported overwrite to default to false, got %q", v)

axiom/resource_dashboard_test.go

@@ -123,6 +123,19 @@ func TestNormalizeDashboardRaw_RemovesEmptyOverridesWhenConfigUnavailable(t *tes
 	}
 }
 
+func TestNormalizeDashboardRaw_RemovesDefaultOwnerWhenConfigUnavailable(t *testing.T) {
+	got, err := normalizeDashboardRaw(
+		json.RawMessage(`{"name":"dashboard","owner":"X-AXIOM-EVERYONE"}`),
+		types.StringNull(),
+	)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if strings.Contains(got, `"owner"`) {
+		t.Fatalf("expected default owner to be removed when not configured, got %s", got)
+	}
+}
+
 func TestNormalizeDashboardRaw_PreservesConfiguredOwnerCasing(t *testing.T) {
 	got, err := normalizeDashboardRaw(
 		json.RawMessage(`{"name":"dashboard","owner":"x-axiom-everyone"}`),