Fix e2e v4 version (#262)

* feat: add minimum provider version check for v4→v5 migrations

Add validation to ensure users are running Cloudflare Provider v4.52.5 or higher
before attempting v4→v5 migrations. This version introduced critical state
migration capabilities required for tf-migrate to work correctly.

Features:
- Check .terraform.lock.hcl for installed provider version (primary)
- Fallback to required_providers version constraint in .tf files
- Block migration with clear error messages if version < 4.52.5
- Add --skip-version-check flag for testing/CI scenarios
- Update integration tests to use --skip-version-check

Files changed:
- cmd/tf-migrate/version_check.go (new)
- cmd/tf-migrate/version_check_test.go (new)
- cmd/tf-migrate/main.go
- integration/test_runner.go
- integration/v4_to_v5/phased_migration_test.go
- README.md

* fix e2e v4 version

Author: tamas-jozsa

cmd/e2e-runner/main.go

@@ -46,6 +46,7 @@ var migrateCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		resources, _ := cmd.Flags().GetString("resources")
 		phase, _ := cmd.Flags().GetString("phase")
+		targetProviderVersion, _ := cmd.Flags().GetString("target-provider-version")
 		if phase != "" {
 			if resources != "" {
 				return fmt.Errorf("--phase and --resources are mutually exclusive; use one or the other")
@@ -56,7 +57,7 @@ var migrateCmd = &cobra.Command{
 			}
 			resources = strings.Join(phaseResources, ",")
 		}
-		return e2e.RunMigrate(resources, false)
+		return e2e.RunMigrate(resources, false, targetProviderVersion)
 	},
 }
 
@@ -69,14 +70,15 @@ var runCmd = &cobra.Command{
 		parallelism, _ := cmd.Flags().GetInt("parallelism")
 
 		cfg := &e2e.RunConfig{
-			SkipV4Test:        cmd.Flag("skip-v4-test").Changed,
-			ApplyExemptions:   cmd.Flag("apply-exemptions").Changed,
-			NoRefreshSnapshot: cmd.Flag("no-refresh-snapshot").Changed,
-			Parallelism:       parallelism,
-			Resources:         cmd.Flag("resources").Value.String(),
-			Exclude:           cmd.Flag("exclude").Value.String(),
-			Phase:             cmd.Flag("phase").Value.String(),
-			ProviderPath:      cmd.Flag("provider").Value.String(),
+			SkipV4Test:            cmd.Flag("skip-v4-test").Changed,
+			ApplyExemptions:       cmd.Flag("apply-exemptions").Changed,
+			NoRefreshSnapshot:     cmd.Flag("no-refresh-snapshot").Changed,
+			Parallelism:           parallelism,
+			Resources:             cmd.Flag("resources").Value.String(),
+			Exclude:               cmd.Flag("exclude").Value.String(),
+			Phase:                 cmd.Flag("phase").Value.String(),
+			ProviderPath:          cmd.Flag("provider").Value.String(),
+			TargetProviderVersion: cmd.Flag("target-provider-version").Value.String(),
 		}
 		return e2e.RunE2ETests(cfg)
 	},
@@ -195,6 +197,7 @@ func init() {
 	// Migrate command flags
 	migrateCmd.Flags().String("resources", "", "Target specific resources (comma-separated)")
 	migrateCmd.Flags().String("phase", "", "Run predefined phase(s) (comma-separated numbers, e.g., '0' or '0,1')")
+	migrateCmd.Flags().String("target-provider-version", "", "Explicit provider version to set in required_providers (e.g. 5.19.0-beta.3); skips GitHub API lookup")
 
 	// Run command flags
 	runCmd.Flags().Bool("skip-v4-test", false, "Skip v4 testing phase")
@@ -205,6 +208,7 @@ func init() {
 	runCmd.Flags().String("provider", "", "Path to provider source directory (will be built automatically)")
 	runCmd.Flags().Int("parallelism", 0, "Terraform parallelism for plan/apply (0 uses Terraform default)")
 	runCmd.Flags().Bool("no-refresh-snapshot", false, "Run an additional diagnostic terraform plan with -refresh=false before the authoritative refresh plan")
+	runCmd.Flags().String("target-provider-version", "", "Explicit provider version to set in required_providers (e.g. 5.19.0-beta.3); skips GitHub API lookup")
 
 	// Clean command flags
 	cleanCmd.Flags().String("modules", "", "Modules to remove from state (comma-separated)")

cmd/tf-migrate/main.go

@@ -245,6 +245,11 @@ func runMigration(log hclog.Logger, cfg config) error {
 		return err
 	}
 
+	// Check that the installed provider version meets minimum requirements
+	if err := checkMinimumProviderVersion(cfg); err != nil {
+		return err
+	}
+
 	// Check for same-version migration (bypass mode)
 	if cfg.sourceVersion == cfg.targetVersion {
 		fmt.Printf("\n⚠ Same-version migration detected (%s → %s)\n", cfg.sourceVersion, cfg.targetVersion)

e2e/tf/v4/provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 4.0"
+      version = "~> 4.52"
     }
   }
 

internal/e2e-runner/migrate.go

@@ -21,9 +21,10 @@ import (
 )
 
 // RunMigrate copies v4/ to migrated-v4_to_v5/ and runs migration.
-// When yes is true, --yes is passed to tf-migrate to auto-confirm the phase-1
+// When yes is true, --skip-phase-check is passed to tf-migrate to auto-confirm the phase-1
 // completion prompt (used for the phase-2 call in the e2e runner).
-func RunMigrate(resources string, yes bool) error {
+// targetProviderVersion is an optional explicit provider version to set in required_providers.
+func RunMigrate(resources string, yes bool, targetProviderVersion string) error {
 	repoRoot := getRepoRoot()
 	e2eRoot := filepath.Join(repoRoot, "e2e")
 	v4Dir := filepath.Join(e2eRoot, "tf", "v4")
@@ -106,6 +107,9 @@ func RunMigrate(resources string, yes bool) error {
 	if yes {
 		args = append(args, "--skip-phase-check")
 	}
+	if targetProviderVersion != "" {
+		args = append(args, "--target-provider-version", targetProviderVersion)
+	}
 
 	cmd := exec.Command(binary, args...)
 	cmd.Stdout = os.Stdout

internal/e2e-runner/runner.go

@@ -33,14 +33,15 @@ const (
 
 // RunConfig holds configuration for e2e test run
 type RunConfig struct {
-	SkipV4Test        bool
-	ApplyExemptions   bool
-	NoRefreshSnapshot bool
-	Parallelism       int
-	Resources         string
-	Exclude           string // comma-separated resource names to exclude
-	Phase             string // comma-separated phase numbers (e.g., "0,1")
-	ProviderPath      string
+	SkipV4Test            bool
+	ApplyExemptions       bool
+	NoRefreshSnapshot     bool
+	Parallelism           int
+	Resources             string
+	Exclude               string // comma-separated resource names to exclude
+	Phase                 string // comma-separated phase numbers (e.g., "0,1")
+	ProviderPath          string
+	TargetProviderVersion string // explicit provider version to set in required_providers
 }
 
 // testContext holds shared state for e2e test execution
@@ -313,11 +314,11 @@ func RunE2ETests(cfg *RunConfig) error {
 	printCyan("Step 2: Running migration")
 	printYellow("Running ./scripts/migrate...")
 
-	// Run the full migration directly (--yes bypasses phased migration detection).
+	// Run the full migration directly (--skip-phase-check bypasses phased migration detection).
 	// The e2e runner handles state cleanup itself below via terraform state rm,
 	// which is simpler and reliable. The phased migration (_phase1_cleanup.tf)
 	// is for real Atlantis users who cannot run terraform state rm.
-	if err := RunMigrate(cfg.Resources, true); err != nil {
+	if err := RunMigrate(cfg.Resources, true, cfg.TargetProviderVersion); err != nil {
 		printError("Migration failed")
 		return err
 	}