Use newlines in config/generated.lst to prevent git conflicts (#1245)

crossplane-contrib · Jun 6, 2024 · bda86c9 · bda86c9
1 parent cde0ffc
commit bda86c9
Show file tree

Hide file tree

Showing 2 changed files with 942 additions and 2 deletions.
diff --git a/cmd/generator/main.go b/cmd/generator/main.go
@@ -49,7 +49,9 @@ func dumpGeneratedResourceList(p *ujconfig.Provider, targetPath *string) {
 		generatedResources = append(generatedResources, name)
 	}
 	sort.Strings(generatedResources)
-	buff, err := json.Marshal(generatedResources)
+	// Indentation is not necessary, as it's a flat JSON array, but newlines prevent git conflicts from concurrent PRs
+	// adding new resources that are not alphabetically adjacent.
+	buff, err := json.MarshalIndent(generatedResources, "", "")
 	if err != nil {
 		panic(fmt.Sprintf("Cannot marshal native schema versions to JSON: %s", err.Error()))
 	}