rewrite the e2e test to adhere to project style

Author: wazery

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

@@ -19,7 +19,7 @@ package scaffolds
 import (
 	"errors"
 	"fmt"
-	log "log/slog"
+	"log/slog"
 	"path/filepath"
 
 	"github.com/spf13/afero"
@@ -65,13 +65,13 @@ func (s *apiScaffolder) InjectFS(fs machinery.Filesystem) {
 
 // Scaffold implements cmdutil.Scaffolder
 func (s *apiScaffolder) Scaffold() error {
-	log.Info("Writing scaffold for you to edit...")
+	slog.Info("Writing scaffold for you to edit...")
 
 	// Load the boilerplate
 	boilerplate, err := afero.ReadFile(s.fs.FS, hack.DefaultBoilerplatePath)
 	if err != nil {
 		if errors.Is(err, afero.ErrFileNotFound) {
-			log.Warn("Unable to find boilerplate file."+
+			slog.Warn("Unable to find boilerplate file."+
 				"This file is used to generate the license header in the project.\n"+
 				"Note that controller-gen will also use this. Therefore, ensure that you "+
 				"add the license file or configure your project accordingly.",
@@ -143,24 +143,25 @@ func (s *apiScaffolder) discoverFeatureGates() []string {
 	apiDir := "api"
 	if s.config.IsMultiGroup() && s.resource.Group != "" {
 		apiDir = filepath.Join("api", s.resource.Group)
+	}
 
 	// Check if the directory exists before trying to parse it
 	if _, err := s.fs.FS.Stat(apiDir); err != nil {
-		log.Debugf("API directory %s does not exist yet, skipping feature gate discovery", apiDir)
+		slog.Debug("API directory does not exist yet, skipping feature gate discovery", "apiDir", apiDir)
 		return []string{}
 	}
 
 	markers, err := parser.ParseDirectory(apiDir)
 	if err != nil {
-		log.Debugf("Failed to parse feature gates from %s: %v", apiDir, err)
+		slog.Debug("Failed to parse feature gates from directory", "apiDir", apiDir, "error", err)
 		return []string{}
 	}
 
 	featureGates := machinery.ExtractFeatureGates(markers)
 	if len(featureGates) > 0 {
-		log.Infof("Discovered feature gates: %v", featureGates)
+		slog.Info("Discovered feature gates", "featureGates", featureGates)
 	} else {
-		log.Debugf("No feature gates found in %s", apiDir)
+		slog.Debug("No feature gates found in directory", "apiDir", apiDir)
 	}
 
 	return featureGates

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

@@ -23,8 +23,10 @@ import (
 
 	. "github.com/onsi/gomega"
 
+	"github.com/spf13/afero"
 	"sigs.k8s.io/kubebuilder/v4/pkg/config"
 	v3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3"
+	"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v4/pkg/model/resource"
 )
 
@@ -68,6 +70,8 @@ func (m *mockConfig) MarshalYAML() ([]byte, error) { return nil, nil }
 func (m *mockConfig) UnmarshalYAML([]byte) error   { return nil }
 
 func TestAPIScaffolder_discoverFeatureGates(t *testing.T) {
+	RegisterTestingT(t)
+
 	tests := []struct {
 		name          string
 		config        config.Config
@@ -112,6 +116,9 @@ func TestAPIScaffolder_discoverFeatureGates(t *testing.T) {
 				t.Fatal("Expected apiScaffolder type")
 			}
 
+			// Initialize filesystem to prevent nil pointer dereference
+			apiScaffolder.fs = machinery.Filesystem{FS: afero.NewMemMapFs()}
+
 			gates := apiScaffolder.discoverFeatureGates()
 
 			// In a real test environment, we'd create test files with feature gates
@@ -123,6 +130,8 @@ func TestAPIScaffolder_discoverFeatureGates(t *testing.T) {
 }
 
 func TestAPIScaffolder_NewAPIScaffolder(t *testing.T) {
+	RegisterTestingT(t)
+
 	cfg := v3.New()
 	res := resource.Resource{
 		GVK: resource.GVK{
@@ -151,8 +160,8 @@ func TestAPIScaffolder_discoverFeatureGates_Testdata(t *testing.T) {
 	}
 	defer os.Chdir(oldDir)
 
-	// Change to testdata/project-v4 directory
-	testdataDir := filepath.Join("testdata", "project-v4")
+	// Change to testdata/project-v4 directory (from pkg/plugins/golang/v4/scaffolds/ to ../../../../../testdata/project-v4)
+	testdataDir := filepath.Join("../../../../../testdata", "project-v4")
 	if err := os.Chdir(testdataDir); err != nil {
 		t.Fatalf("Failed to change to testdata directory: %v", err)
 	}
@@ -172,6 +181,9 @@ func TestAPIScaffolder_discoverFeatureGates_Testdata(t *testing.T) {
 		t.Fatal("Expected apiScaffolder type")
 	}
 
+	// Initialize filesystem to prevent nil pointer dereference
+	apiScaffolder.fs = machinery.Filesystem{FS: afero.NewOsFs()}
+
 	featureGates := apiScaffolder.discoverFeatureGates()
 	if len(featureGates) > 0 {
 		t.Errorf("Expected no feature gates from testdata, but found %d: %v", len(featureGates), featureGates)