Merge pull request #6713 from cloudflare/vaishak/pages-projects

feat(pages_project): State upgrade

Author: vaishakdinesh

internal/acctest/acctest.go

@@ -926,35 +926,6 @@ func RunMigrationV2Command(t *testing.T, v4Config string, tmpDir string, sourceV
 		t.Fatalf("tf-migrate binary not found at %s. Please set TF_MIGRATE_BINARY_PATH or ensure the binary is built.", migratorPath)
 	}
 
-	// Find state file in tmpDir
-	// First check if state file exists directly in tmpDir (from v4 import)
-	var stateFilePath string
-	directStateFile := filepath.Join(tmpDir, "terraform.tfstate")
-	if _, err := os.Stat(directStateFile); err == nil {
-		stateFilePath = directStateFile
-	} else {
-		// Look for state file in subdirectories (from test framework)
-		entries, err := os.ReadDir(tmpDir)
-		if err != nil {
-			t.Logf("Failed to read test directory: %v", err)
-		} else {
-			for _, entry := range entries {
-				if entry.IsDir() {
-					inner_entries, _ := os.ReadDir(filepath.Join(tmpDir, entry.Name()))
-					for _, inner_entry := range inner_entries {
-						if inner_entry.Name() == "terraform.tfstate" {
-							stateFilePath = filepath.Join(tmpDir, entry.Name(), "terraform.tfstate")
-							break
-						}
-					}
-				}
-				if stateFilePath != "" {
-					break
-				}
-			}
-		}
-	}
-
 	// Build the command
 	args := []string{
 		"migrate",
@@ -963,11 +934,6 @@ func RunMigrationV2Command(t *testing.T, v4Config string, tmpDir string, sourceV
 		"--target-version", targetVersion,
 	}
 
-	// Add state file argument if found
-	if stateFilePath != "" {
-		args = append(args, "--state-file", stateFilePath)
-	}
-
 	// Add debug logging if TF_LOG is set
 	if strings.ToLower(os.Getenv("TF_LOG")) == "debug" {
 		args = append(args, "--log-level", "debug")
@@ -1325,6 +1291,3 @@ func MigrationV2TestStepAllowCreate(t *testing.T, v4Config string, tmpDir string
 		},
 	}
 }
-
-// ImportResourceWithV4Provider imports a resource using the v4 provider before migration testing.
-// This is used for import-only resources that cannot be created via Terraform.

internal/services/pages_project/custom_test.go

@@ -266,9 +266,9 @@ func TestEnvVarsMatchIgnoringSecrets(t *testing.T) {
 			expected: true,
 		},
 		{
-			name:   "source nil, dest empty",
-			source: nil,
-			dest:   &map[string]PagesProjectDeploymentConfigsPreviewEnvVarsModel{},
+			name:     "source nil, dest empty",
+			source:   nil,
+			dest:     &map[string]PagesProjectDeploymentConfigsPreviewEnvVarsModel{},
 			expected: true,
 		},
 		{
@@ -402,7 +402,7 @@ func TestCompatibilityFlagsEqual(t *testing.T) {
 }
 
 // TestNormalizeBuildConfig_EmptyStrings tests that build_config with empty strings
-// is normalized to nil. This is the fix for the issue where the API returns empty
+// is normalized to null. This is the fix for the issue where the API returns empty
 // strings for build_config fields (like build_command = ""), and the provider would
 // incorrectly preserve these in the plan, causing "planned value for a non-computed
 // attribute" errors.
@@ -414,14 +414,14 @@ func TestNormalizeBuildConfig_EmptyStrings(t *testing.T) {
 		Name:             types.StringValue("test-project"),
 		AccountID:        types.StringValue("abc123"),
 		ProductionBranch: types.StringValue("main"),
-		BuildConfig: &PagesProjectBuildConfigModel{
-			BuildCaching:      types.BoolNull(),         // null bool
-			BuildCommand:      types.StringValue(""),    // empty string
-			DestinationDir:    types.StringValue(""),    // empty string
-			RootDir:           types.StringValue(""),    // empty string
-			WebAnalyticsTag:   types.StringValue(""),    // empty string
-			WebAnalyticsToken: types.StringValue(""),    // empty string
-		},
+		BuildConfig: customfield.NewObjectMust(ctx, &PagesProjectBuildConfigModel{
+			BuildCaching:      types.BoolNull(),      // null bool
+			BuildCommand:      types.StringValue(""), // empty string
+			DestinationDir:    types.StringValue(""), // empty string
+			RootDir:           types.StringValue(""), // empty string
+			WebAnalyticsTag:   types.StringValue(""), // empty string
+			WebAnalyticsToken: types.StringValue(""), // empty string
+		}),
 	}
 
 	// Call NormalizeDeploymentConfigs
@@ -431,14 +431,14 @@ func TestNormalizeBuildConfig_EmptyStrings(t *testing.T) {
 		t.Fatalf("unexpected diagnostics: %v", diags)
 	}
 
-	// build_config should be normalized to nil when all fields are empty/null
-	if result.BuildConfig != nil {
-		t.Errorf("expected build_config to be nil when all fields are empty/null, got %+v", result.BuildConfig)
+	// build_config should be normalized to null when all fields are empty/null
+	if !result.BuildConfig.IsNull() {
+		t.Errorf("expected build_config to be null when all fields are empty/null, got %+v", result.BuildConfig)
 	}
 }
 
 // TestNormalizeBuildConfig_WithActualValues tests that build_config with actual
-// values is NOT normalized to nil.
+// values is NOT normalized to null.
 func TestNormalizeBuildConfig_WithActualValues(t *testing.T) {
 	ctx := context.Background()
 
@@ -447,14 +447,14 @@ func TestNormalizeBuildConfig_WithActualValues(t *testing.T) {
 		Name:             types.StringValue("test-project"),
 		AccountID:        types.StringValue("abc123"),
 		ProductionBranch: types.StringValue("main"),
-		BuildConfig: &PagesProjectBuildConfigModel{
+		BuildConfig: customfield.NewObjectMust(ctx, &PagesProjectBuildConfigModel{
 			BuildCaching:      types.BoolValue(true),
 			BuildCommand:      types.StringValue("npm run build"),
 			DestinationDir:    types.StringValue("dist"),
 			RootDir:           types.StringValue("/"),
-			WebAnalyticsTag:   types.StringValue(""),  // empty is ok if others have values
-			WebAnalyticsToken: types.StringValue(""),  // empty is ok if others have values
-		},
+			WebAnalyticsTag:   types.StringValue(""), // empty is ok if others have values
+			WebAnalyticsToken: types.StringValue(""), // empty is ok if others have values
+		}),
 	}
 
 	// Call NormalizeDeploymentConfigs
@@ -464,8 +464,8 @@ func TestNormalizeBuildConfig_WithActualValues(t *testing.T) {
 		t.Fatalf("unexpected diagnostics: %v", diags)
 	}
 
-	// build_config should NOT be nil when fields have actual values
-	if result.BuildConfig == nil {
+	// build_config should NOT be null when fields have actual values
+	if result.BuildConfig.IsNull() {
 		t.Error("expected build_config to be preserved when fields have actual values")
 	}
 }
@@ -475,12 +475,12 @@ func TestNormalizeBuildConfig_WithActualValues(t *testing.T) {
 func TestMergeBuildConfigFromState(t *testing.T) {
 	// Plan has some values but not all
 	plan := &PagesProjectBuildConfigModel{
-		BuildCaching:      types.BoolNull(),           // not specified by user
+		BuildCaching:      types.BoolNull(),                // not specified by user
 		BuildCommand:      types.StringValue("yarn build"), // user specified
-		DestinationDir:    types.StringUnknown(),      // unknown
-		RootDir:           types.StringValue("/app"),  // user specified
-		WebAnalyticsTag:   types.StringNull(),         // not specified
-		WebAnalyticsToken: types.StringNull(),         // not specified
+		DestinationDir:    types.StringUnknown(),           // unknown
+		RootDir:           types.StringValue("/app"),       // user specified
+		WebAnalyticsTag:   types.StringNull(),              // not specified
+		WebAnalyticsToken: types.StringNull(),              // not specified
 	}
 
 	// State has values from a previous apply/import
@@ -526,4 +526,3 @@ func TestMergeBuildConfigFromState_NilInputs(t *testing.T) {
 	mergeBuildConfigFromState(nil, &PagesProjectBuildConfigModel{})
 	mergeBuildConfigFromState(&PagesProjectBuildConfigModel{}, nil)
 }
-

internal/services/pages_project/migration/v500/handler.go

@@ -0,0 +1,35 @@
+package v500
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+)
+
+// UpgradeNoOp handles state upgrades within the v5 series (schema_version=1+).
+// This is a no-op upgrade since the schema is compatible - just copy state through.
+func UpgradeNoOp(ctx context.Context, req resource.UpgradeStateRequest, resp *resource.UpgradeStateResponse) {
+	tflog.Info(ctx, "Upgrading pages_project state (no-op)")
+	// No-op upgrade: schema is compatible, just copy raw state through
+	resp.State.Raw = req.State.Raw
+}
+
+// UpgradeFromV0 upgrades the state from v4 (version 0) to v5.
+// v4 SDKv2 stores blocks as lists, so we access the first element of each slice.
+func UpgradeFromV0(ctx context.Context, req resource.UpgradeStateRequest, resp *resource.UpgradeStateResponse) {
+	var priorState SourcePagesProjectModelV0
+	resp.Diagnostics.Append(req.State.Get(ctx, &priorState)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// Transform the v0 (v4 provider) state to v5 state
+	newState, diags := Transform(ctx, priorState)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
+}