fix: address PR feedback and clean up testdata files

- Remove manual feature gate additions from testdata files (auto-generated)
- Fix unit test expectations to not expect markers in clean testdata
- Update documentation to clarify testdata file handling
- Ensure tests properly validate clean vs. modified testdata scenarios

Author: wazery

docs/book/src/reference/markers/feature-gates.md

@@ -176,10 +176,10 @@ Bar *string `json:"bar,omitempty"`
 
 2. **Beta**: Feature available but can be disabled
    ```go
-   // +feature-gate beta-feature  
+   // +feature-gate beta-feature
    BetaField *string `json:"betaField,omitempty"`
    ```
-   
+
 3. **Stable**: Remove feature gate, feature always available
    ```go
    // No feature gate marker - always available
@@ -194,7 +194,7 @@ Test your controller with different feature gate configurations:
 # Test with all features disabled (default)
 make test
 
-# Test with specific features enabled  
+# Test with specific features enabled
 FEATURE_GATES="experimental-bar=true" make test
 
 # Test with all features enabled
@@ -225,7 +225,7 @@ spec:
 
 ```yaml
 # Production - only stable features
-apiVersion: apps/v1  
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
@@ -244,7 +244,7 @@ spec:
 ```yaml
 # Canary deployment with experimental features
 apiVersion: apps/v1
-kind: Deployment  
+kind: Deployment
 metadata:
   name: controller-manager-canary
 spec:
@@ -316,7 +316,7 @@ grep -A 5 -B 5 "feature-gates" cmd/main.go
 ### ✅ Production Ready
 
 - Feature gate discovery from API type markers
-- CLI flag `--feature-gates` for runtime control  
+- CLI flag `--feature-gates` for runtime control
 - Automatic scaffolding integration
 - Validation and error handling
 - Controller runtime integration
@@ -390,7 +390,7 @@ func (r *WebAppReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
         }
     }
 
-    // Handle advanced routing if enabled  
+    // Handle advanced routing if enabled
     if featureGates.IsEnabled("advanced-routing") && webapp.Spec.AdvancedRouting != nil {
         log.Info("Configuring advanced routing")
         if err := r.reconcileAdvancedRouting(ctx, &webapp); err != nil {

go.mod

@@ -11,9 +11,9 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/mod v0.26.0
-	golang.org/x/text v0.27.0
-	golang.org/x/tools v0.35.0
+	golang.org/x/mod v0.27.0
+	golang.org/x/text v0.28.0
+	golang.org/x/tools v0.36.0
 	helm.sh/helm/v3 v3.18.4
 	sigs.k8s.io/yaml v1.6.0
 )

pkg/machinery/featuregate.go

@@ -19,6 +19,7 @@ package machinery
 import (
 	"fmt"
 	"regexp"
+	"sort"
 	"strings"
 )
 
@@ -63,8 +64,7 @@ func ParseFeatureGates(featureGates string) (FeatureGates, error) {
 	for _, part := range parts {
 		part = strings.TrimSpace(part)
 		if part == "" {
-			// Skip empty parts (e.g., trailing commas)
-			continue
+			return nil, fmt.Errorf("empty feature gate name in input")
 		}
 
 		// Parse the feature gate name and value
@@ -141,8 +141,16 @@ func (fg FeatureGates) String() string {
 		return ""
 	}
 
+	// Get feature gate names and sort them for consistent output
+	names := make([]string, 0, len(fg))
+	for name := range fg {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+
 	var parts []string
-	for name, enabled := range fg {
+	for _, name := range names {
+		enabled := fg[name]
 		if enabled {
 			parts = append(parts, name)
 		} else {

pkg/plugins/golang/v4/scaffolds/api_test.go

@@ -186,22 +186,10 @@ func TestAPIScaffolder_discoverFeatureGates_Testdata(t *testing.T) {
 
 	featureGates := apiScaffolder.discoverFeatureGates()
 
-	// The testdata contains a feature gate marker for "experimental-bar"
-	expectedGates := []string{"experimental-bar"}
+	// The testdata should not contain any feature gate markers by default
+	// since testdata files are auto-generated
+	expectedGates := []string{}
 	if len(featureGates) != len(expectedGates) {
 		t.Errorf("Expected %d feature gates from testdata, but found %d: %v", len(expectedGates), len(featureGates), featureGates)
 	}
-
-	for _, expectedGate := range expectedGates {
-		found := false
-		for _, gate := range featureGates {
-			if gate == expectedGate {
-				found = true
-				break
-			}
-		}
-		if !found {
-			t.Errorf("Expected to find feature gate %s, but it was not discovered", expectedGate)
-		}
-	}
 }

test/e2e/v4/featuregates_discovery_test.go

@@ -45,27 +45,15 @@ var _ = Describe("Feature Gates Discovery", func() {
 	})
 
 	Context("when parsing testdata project", func() {
-		It("should discover feature gate markers from captain_types.go", func() {
+		It("should NOT discover feature gate markers from captain_types.go by default", func() {
 			By("parsing the testdata project API types")
 			parser := machinery.NewFeatureGateMarkerParser()
 			markers, err := parser.ParseFile("../../../testdata/project-v4/api/v1/captain_types.go")
 			Expect(err).NotTo(HaveOccurred())
-			Expect(markers).NotTo(BeEmpty(), "Should discover feature gate markers")
-
-			By("extracting feature gate names")
-			featureGates := machinery.ExtractFeatureGates(markers)
-
-			By("verifying expected feature gates are found")
-			expectedGates := []string{
-				"experimental-bar",
-			}
-
-			for _, expectedGate := range expectedGates {
-				Expect(featureGates).To(ContainElement(expectedGate),
-					"Should discover feature gate: %s", expectedGate)
-			}
-
-			GinkgoWriter.Printf("Discovered feature gates: %v\n", featureGates)
+			
+			By("verifying no feature gates are found in clean testdata")
+			// Testdata files are auto-generated and should not contain feature gate markers by default
+			Expect(markers).To(BeEmpty(), "Clean testdata should not contain feature gate markers")
 		})
 	})
 

testdata/project-v4/api/v1/captain_types.go

@@ -33,11 +33,6 @@ type CaptainSpec struct {
 	// foo is an example field of Captain. Edit captain_types.go to remove/update
 	// +optional
 	Foo *string `json:"foo,omitempty"`
-
-	// Bar is an experimental field that requires the "experimental-bar" feature gate to be enabled
-	// +feature-gate experimental-bar
-	// +optional
-	Bar *string `json:"bar,omitempty"`
 }
 
 // CaptainStatus defines the observed state of Captain.