Skip to content

fix(migrate): add target flag to specify resources #6324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaishakdinesh merged 2 commits into from
Oct 14, 2025
Merged

fix(migrate): add target flag to specify resources #6324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fcddf0
fix(migrate): add target flag to specify resources
vaishakdinesh Oct 8, 2025
6e8c6a5
Merge branch 'next' into vaishak/target
vaishakdinesh Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/migrate/load_balancer_monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func TestLoadBalancerMonitorFullStateTransformation(t *testing.T) {
}`

// Transform the state
transformedBytes, err := transformStateJSON([]byte(oldState))
transformedBytes, err := transformStateJSON([]byte(oldState), nil)
if err != nil {
t.Fatalf("Failed to transform state: %v", err)
}
Expand Down Expand Up @@ -398,7 +398,7 @@ func TestComprehensiveLoadBalancerMonitorStateMigration(t *testing.T) {
}`

// Transform the state
transformedBytes, err := transformStateJSON([]byte(oldState))
transformedBytes, err := transformStateJSON([]byte(oldState), nil)
if err != nil {
t.Fatalf("Failed to transform state: %v", err)
}
Expand Down
81 changes: 63 additions & 18 deletions cmd/migrate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func main() {
patternsDir := flag.String("patterns-dir", "", "Local directory to get patterns from (otherwise they're pulled from github)")
zoneSettingsModule := flag.Bool("zone-settings-module", false, "Expand zone_settings module calls to individual resources at call sites")
skipImports := flag.Bool("skip-imports", false, "Skip generating import blocks for zone settings resources")
target := flag.String("target", "", "Comma-separated list of resource types to migrate (e.g., 'cloudflare_record' or 'cloudflare_record,cloudflare_argo'). If not specified, all resources are migrated. This flag is only relevant when using the transformer and not using grit.")
flag.Parse()

// Default config directory to current working directory if not specified
Expand Down Expand Up @@ -57,6 +58,13 @@ func main() {
}
}

// Parse target resources if specified
var targetResources map[string]bool
if *target != "" {
targetResources = parseTargetResources(*target)
fmt.Printf("Targeting specific resources: %s\n", *target)
}

if *dryRun {
fmt.Println("DRY RUN MODE - No files will be modified")
fmt.Println(strings.Repeat("=", 50))
Expand All @@ -65,6 +73,9 @@ func main() {
// Run grit migrations if enabled
if *useGrit {
fmt.Println("Running grit migrations...")
if targetResources != nil {
fmt.Println(" Note: Grit transformations will apply to all resources. Target filtering only affects Go-based transformations.")
}
if err := checkGritInstalled(); err != nil {
log.Fatalf("Error: %v", err)
}
Expand Down Expand Up @@ -101,7 +112,7 @@ func main() {
}

// Run the YAML-based transformations
if err := runYAMLTransformations(*configDir, *stateFile, transformerDir, *dryRun); err != nil {
if err := runYAMLTransformations(*configDir, *stateFile, transformerDir, *dryRun, targetResources); err != nil {
log.Fatalf("Error running YAML transformations: %v", err)
}
fmt.Println("YAML transformations completed")
Expand All @@ -111,14 +122,14 @@ func main() {
// Process config directory if specified and not explicitly disabled
if *configDir != "" && *configDir != "false" {
fmt.Println("Running Go transformations on configuration files...")
if err := processConfigDirectory(*configDir, *dryRun, *zoneSettingsModule, *skipImports); err != nil {
if err := processConfigDirectory(*configDir, *dryRun, *zoneSettingsModule, *skipImports, targetResources); err != nil {
log.Fatalf("Error processing config directory: %v", err)
}
}

// Process state file if specified and not explicitly disabled
if *stateFile != "" && *stateFile != "false" {
if err := processStateFile(*stateFile, *dryRun); err != nil {
if err := processStateFile(*stateFile, *dryRun, targetResources); err != nil {
log.Fatalf("Error processing state file: %v", err)
}
}
Expand All @@ -128,7 +139,7 @@ func main() {
}
}

func processConfigDirectory(directory string, dryRun bool, zoneSettingsModule bool, skipImports bool) error {
func processConfigDirectory(directory string, dryRun bool, zoneSettingsModule bool, skipImports bool, targetResources map[string]bool) error {
// Check if the directory exists
info, err := os.Stat(directory)
if err != nil {
Expand Down Expand Up @@ -158,7 +169,7 @@ func processConfigDirectory(directory string, dryRun bool, zoneSettingsModule bo
}

// Process the file
if err := processFile(path, dryRun, zoneSettingsModule, skipImports); err != nil {
if err := processFile(path, dryRun, zoneSettingsModule, skipImports, targetResources); err != nil {
log.Printf("Error processing file %s: %v", path, err)
// return err
}
Expand All @@ -167,7 +178,7 @@ func processConfigDirectory(directory string, dryRun bool, zoneSettingsModule bo
})
}

func processStateFile(stateFile string, dryRun bool) error {
func processStateFile(stateFile string, dryRun bool, targetResources map[string]bool) error {
// Check if the state file exists
info, err := os.Stat(stateFile)
if err != nil {
Expand All @@ -189,7 +200,7 @@ func processStateFile(stateFile string, dryRun bool) error {
fmt.Printf(" State file size: %d bytes\n", info.Size())
} else {
// Actually transform the state file
if err := transformStateFile(stateFile); err != nil {
if err := transformStateFile(stateFile, targetResources); err != nil {
return fmt.Errorf("failed to transform state file: %v", err)
}
fmt.Printf(" ✓ Updated state file %s\n", stateFile)
Expand All @@ -198,7 +209,7 @@ func processStateFile(stateFile string, dryRun bool) error {
return nil
}

func processFile(filename string, dryRun bool, zoneSettingsModule bool, skipImports bool) error {
func processFile(filename string, dryRun bool, zoneSettingsModule bool, skipImports bool, targetResources map[string]bool) error {

// Read the file
originalBytes, err := os.ReadFile(filename)
Expand All @@ -207,7 +218,7 @@ func processFile(filename string, dryRun bool, zoneSettingsModule bool, skipImpo
}

// Transform the file
transformedBytes, err := transformFile(originalBytes, filename, zoneSettingsModule, skipImports)
transformedBytes, err := transformFile(originalBytes, filename, zoneSettingsModule, skipImports, targetResources)
if err != nil {
return err
}
Expand All @@ -230,7 +241,7 @@ func processFile(filename string, dryRun bool, zoneSettingsModule bool, skipImpo
return nil
}

func transformFile(content []byte, filename string, zoneSettingsModule bool, skipImports bool) ([]byte, error) {
func transformFile(content []byte, filename string, zoneSettingsModule bool, skipImports bool, targetResources map[string]bool) ([]byte, error) {
// Create new diagnostics collector for this file
diags := ast.NewDiagnostics()
// Handle zone_settings module expansion if enabled
Expand All @@ -240,14 +251,25 @@ func transformFile(content []byte, filename string, zoneSettingsModule bool, ski
content = []byte(contentStr)
}

// First, transform header blocks in load_balancer_pool resources at the string level
// This is needed because grit leaves header blocks inside origins lists, which causes parsing issues
// Apply string-level transformations only if the resource type is in the target list (or no target specified)
contentStr := string(content)
contentStr = transformLoadBalancerPoolHeaders(contentStr)
// Also transform tiered_cache values at the string level
contentStr = transformTieredCacheValues(contentStr)

// Transform header blocks in load_balancer_pool resources at the string level
// This is needed because grit leaves header blocks inside origins lists, which causes parsing issues
if targetResources == nil || targetResources["cloudflare_load_balancer_pool"] {
contentStr = transformLoadBalancerPoolHeaders(contentStr)
}

// Transform tiered_cache values at the string level
if targetResources == nil || targetResources["cloudflare_tiered_cache"] {
contentStr = transformTieredCacheValues(contentStr)
}

// Transform page_rule configuration (remove minify, fix cache_ttl_by_status format)
contentStr = transformPageRuleConfig(contentStr)
if targetResources == nil || targetResources["cloudflare_page_rule"] {
contentStr = transformPageRuleConfig(contentStr)
}

content = []byte(contentStr)

file, hcl_diags := hclwrite.ParseConfig(content, filename, hcl.InitialPos)
Expand All @@ -264,6 +286,17 @@ func transformFile(content []byte, filename string, zoneSettingsModule bool, ski
var newBlocks []*hclwrite.Block

for _, block := range blocks {
// Skip blocks that are not in the target resources list
if targetResources != nil && block.Type() == "resource" {
labels := block.Labels()
if len(labels) > 0 {
resourceType := labels[0]
if !targetResources[resourceType] {
continue // Skip this resource as it's not in the target list
}
}
}

applyRenames(block)

// TODO declare a map from resource types to transform functions
Expand Down Expand Up @@ -331,7 +364,6 @@ func transformFile(content []byte, filename string, zoneSettingsModule bool, ski
transformZeroTrustAccessMTLSHostnameSettingsBlock(block, diags)
}


if isManagedTransformsResource(block) {
transformManagedTransformsBlock(block)
}
Expand Down Expand Up @@ -426,5 +458,18 @@ func transformFile(content []byte, filename string, zoneSettingsModule bool, ski
// transformFileDefault is a wrapper for transformFile with default settings (no zone settings module expansion, no skip imports)
// This maintains backward compatibility with existing test functions
func transformFileDefault(content []byte, filename string) ([]byte, error) {
return transformFile(content, filename, false, false)
return transformFile(content, filename, false, false, nil)
}

// parseTargetResources parses a comma-separated list of resource types into a map for quick lookup
func parseTargetResources(target string) map[string]bool {
resources := make(map[string]bool)
parts := strings.Split(target, ",")
for _, part := range parts {
trimmed := strings.TrimSpace(part)
if trimmed != "" {
resources[trimmed] = true
}
}
return resources
}
2 changes: 1 addition & 1 deletion cmd/migrate/snippet_rules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ func TestTransformSnippetRulesStateJSON(t *testing.T) {
}

// Transform the state
result, err := transformStateJSON([]byte(tt.input))
result, err := transformStateJSON([]byte(tt.input), nil)
if err != nil {
t.Fatalf("transformStateJSON failed: %v", err)
}
Expand Down
11 changes: 8 additions & 3 deletions cmd/migrate/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
)

// transformStateFile reads a terraform state file, transforms it, and writes it back
func transformStateFile(filename string) error {
func transformStateFile(filename string, targetResources map[string]bool) error {
// Read the state file
data, err := os.ReadFile(filename)
if err != nil {
return fmt.Errorf("failed to read state file: %w", err)
}

// Transform the state
transformed, err := transformStateJSON(data)
transformed, err := transformStateJSON(data, targetResources)
if err != nil {
return fmt.Errorf("failed to transform state: %w", err)
}
Expand All @@ -33,7 +33,7 @@ func transformStateFile(filename string) error {
}

// transformStateJSON transforms the state JSON using gjson/sjson
func transformStateJSON(data []byte) ([]byte, error) {
func transformStateJSON(data []byte, targetResources map[string]bool) ([]byte, error) {
jsonStr := string(data)
result := jsonStr
// Process each resource
Expand All @@ -49,6 +49,11 @@ func transformStateJSON(data []byte) ([]byte, error) {
resourcePath := fmt.Sprintf("resources.%d", i)
resourceType := gjson.Get(result, resourcePath+".type").String()

// Skip resources that are not in the target list
if targetResources != nil && !targetResources[resourceType] {
continue
}

// Handle zone_settings_override -> zone_setting transformation
if resourceType == "cloudflare_zone_settings_override" {
result = transformZoneSettingsStateJSON(result, resourcePath)
Expand Down
4 changes: 2 additions & 2 deletions cmd/migrate/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ func TestTransformManagedTransformsState(t *testing.T) {
}`

// Transform the state
result, err := transformStateJSON([]byte(testState))
result, err := transformStateJSON([]byte(testState), nil)
if err != nil {
t.Fatalf("Failed to transform state: %v", err)
}
Expand Down Expand Up @@ -533,7 +533,7 @@ func TestTransformSnippetStateJSON(t *testing.T) {
}

// Transform the state
result, err := transformStateJSON([]byte(tt.input))
result, err := transformStateJSON([]byte(tt.input), nil)
if err != nil {
t.Fatalf("transformStateJSON failed: %v", err)
}
Expand Down
Loading
Loading