Added output flags for controller and translation layers

Author: igor-karpukhin

tools/scaffolder/cmd/main.go

@@ -9,9 +9,11 @@ import (
 )
 
 var (
-	inputPath string
-	crdKind   string
-	listCRDs  bool
+	inputPath        string
+	crdKind          string
+	listCRDs         bool
+	controllerOutDir string
+	translationOutDir string
 )
 
 func main() {
@@ -27,13 +29,15 @@ func main() {
 				return generate.PrintCRDs(inputPath)
 			}
 
-			return generate.FromConfig(inputPath, crdKind)
+			return generate.FromConfig(inputPath, crdKind, controllerOutDir, translationOutDir)
 		},
 	}
 
 	rootCmd.Flags().StringVar(&inputPath, "input", "", "Path to openapi2crd result.yaml file (required)")
 	rootCmd.Flags().StringVar(&crdKind, "crd", "", "CRD kind to generate controller for")
 	rootCmd.Flags().BoolVar(&listCRDs, "list", false, "List available CRDs from result file")
+	rootCmd.Flags().StringVar(&controllerOutDir, "controller-out", "", "Output directory for controller files (default: ../mongodb-atlas-kubernetes/internal/controller)")
+	rootCmd.Flags().StringVar(&translationOutDir, "translation-out", "", "Output directory for translation files (default: ../mongodb-atlas-kubernetes/internal/translation)")
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)

tools/scaffolder/go.mod

@@ -9,7 +9,7 @@ require (
 	// github.com/josvazg/crd2go v0.0.0-00010101000000-000000000000
 	github.com/spf13/cobra v1.10.1
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/apimachinery v0.34.1
+	k8s.io/apimachinery v0.34.1 // indirect
 )
 
 require k8s.io/apiextensions-apiserver v0.34.1

tools/scaffolder/internal/generate/controller.go

@@ -28,17 +28,26 @@ const (
 )
 
 // FromConfig generates controllers and handlers based on the parsed CRD result file
-func FromConfig(resultPath, crdKind string) error {
+func FromConfig(resultPath, crdKind, controllerOutDir, translationOutDir string) error {
 	parsedConfig, err := ParseCRDConfig(resultPath, crdKind)
 	if err != nil {
 		return err
 	}
 
 	resourceName := parsedConfig.ResourceName
-	baseControllerDir := filepath.Join("..", "mongodb-atlas-kubernetes", "internal", "controller", strings.ToLower(resourceName))
+	
+	// Set default directories if not provided
+	if controllerOutDir == "" {
+		controllerOutDir = filepath.Join("..", "mongodb-atlas-kubernetes", "internal", "controller")
+	}
+	if translationOutDir == "" {
+		translationOutDir = filepath.Join("..", "mongodb-atlas-kubernetes", "internal", "translation")
+	}
+	
+	baseControllerDir := filepath.Join(controllerOutDir, strings.ToLower(resourceName))
 
 	// Generate translation layers for all mappings
-	if err := GenerateTranslationLayers(resourceName, parsedConfig.Mappings); err != nil {
+	if err := GenerateTranslationLayers(resourceName, parsedConfig.Mappings, translationOutDir); err != nil {
 		return fmt.Errorf("failed to generate translation layers: %w", err)
 	}
 

tools/scaffolder/internal/generate/translation.go

@@ -24,19 +24,19 @@ import (
 )
 
 // GenerateTranslationLayers generates translation layers for all mappings
-func GenerateTranslationLayers(resourceName string, mappings []MappingWithConfig) error {
+func GenerateTranslationLayers(resourceName string, mappings []MappingWithConfig, translationOutDir string) error {
 	for _, mapping := range mappings {
 		versionSuffix := mapping.Version
-		if err := generateTranslationLayerWithVersion(resourceName, versionSuffix, mapping.OpenAPIConfig.Package); err != nil {
+		if err := generateTranslationLayerWithVersion(resourceName, versionSuffix, mapping.OpenAPIConfig.Package, translationOutDir); err != nil {
 			return fmt.Errorf("failed to generate translation layer for version %s: %w", versionSuffix, err)
 		}
 	}
 	return nil
 }
 
-func generateTranslationLayerWithVersion(resourceName, versionSuffix, sdkPackage string) error {
+func generateTranslationLayerWithVersion(resourceName, versionSuffix, sdkPackage, translationOutDir string) error {
 	packageName := strings.ToLower(resourceName) + versionSuffix
-	translationDir := filepath.Join("..", "mongodb-atlas-kubernetes", "internal", "translation", packageName)
+	translationDir := filepath.Join(translationOutDir, packageName)
 
 	if err := os.MkdirAll(translationDir, 0755); err != nil {
 		return fmt.Errorf("failed to create translation directory: %w", err)
@@ -201,6 +201,7 @@ func GetAtlasAPIForCRD(crdKind string) (string, error) {
 		"StreamInstance":         "StreamsApi",
 		"PrivateEndpoint":        "PrivateEndpointServicesApi",
 		"NetworkPeering":         "NetworkPeeringApi",
+		"NetworkPeeringConnection": "NetworkPeeringApi",
 		"NetworkContainer":       "NetworkPeeringApi",
 		"IPAccessList":           "ProjectIPAccessListApi",
 		"CustomRole":             "CustomDatabaseRolesApi",