fix test

Author: jiangpengcheng

.gitignore

@@ -33,6 +33,7 @@ index_build_*/
 
 *.bak
 .DS_Store
+.cache/
 config/crd/bases/vpa-v1-crd.yaml
 Listeners
 .tool-versions

Makefile

@@ -47,6 +47,8 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 BUILD_DATETIME := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+GOCACHE ?= $(shell pwd)/.cache/go-build
+export GOCACHE
 
 ## Location to install dependencies to
 LOCALBIN ?= $(shell pwd)/bin
@@ -65,7 +67,21 @@ all: manager
 # Run tests
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
 test: generate fmt vet manifests envtest
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn go test ./... -coverprofile cover.out
+	@assets="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)"; \
+	echo "mode: set" > cover.out; \
+	for pkg in $$(go list ./...); do \
+		gocache=$$(mktemp -d); \
+		has_tests=$$(go list -f '{{if or .TestGoFiles .XTestGoFiles}}yes{{end}}' "$$pkg"); \
+		if [ -n "$$has_tests" ]; then \
+			profile=$$(mktemp); \
+			KUBEBUILDER_ASSETS="$$assets" GOCACHE="$$gocache" GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn go test "$$pkg" -coverprofile "$$profile" || { rm -rf "$$gocache" "$$profile"; exit 1; }; \
+			tail -n +2 "$$profile" >> cover.out; \
+			rm -f "$$profile"; \
+		else \
+			KUBEBUILDER_ASSETS="$$assets" GOCACHE="$$gocache" GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn go test "$$pkg" || { rm -rf "$$gocache"; exit 1; }; \
+		fi; \
+		rm -rf "$$gocache"; \
+	done
 
 test-ginkgo: generate fmt vet manifests envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn go test ./controllers/ -v -ginkgo.v
@@ -302,4 +318,4 @@ redhat-certificated-image-push: ## Push the bundle image.
 .PHONY: generate-metricsdocs
 generate-metricsdocs:
 	mkdir -p $(shell pwd)/docs/monitoring
-	go run -ldflags="${LDFLAGS}" ./pkg/monitoring/metricsdocs > docs/monitoring/metrics.md
+	go run -ldflags="${LDFLAGS}" ./pkg/monitoring/metricsdocs > docs/monitoring/metrics.md

controllers/suite_test.go

@@ -18,7 +18,10 @@
 package controllers
 
 import (
+	"os"
+	"os/exec"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 
@@ -48,6 +51,7 @@ var sourceReconciler *SourceReconciler
 var sinkReconciler *SinkReconciler
 var funcReconciler *FunctionReconciler
 var testEnv *envtest.Environment
+var testVpaCRDDir string
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -59,12 +63,17 @@ var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
+	vpaCRDDir, err := vpaCRDDirectory()
+	Expect(err).ToNot(HaveOccurred())
+	testVpaCRDDir = vpaCRDDir
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{
+			filepath.Join("..", "config", "crd", "bases"),
+			vpaCRDDir,
+		},
 		ErrorIfCRDPathMissing: true,
 	}
 
-	var err error
 	cfg, err = testEnv.Start()
 	Expect(err).ToNot(HaveOccurred())
 	Expect(cfg).ToNot(BeNil())
@@ -137,10 +146,39 @@ var _ = BeforeSuite(func(done Done) {
 		// kube-apiserver to return
 		err := testEnv.Stop()
 		Expect(err).ToNot(HaveOccurred())
+		if testVpaCRDDir != "" {
+			Expect(os.RemoveAll(testVpaCRDDir)).To(Succeed())
+		}
 	}()
 
 	k8sClient = k8sManager.GetClient()
 	Expect(k8sClient).ToNot(BeNil())
 
 	close(done)
 }, 60)
+
+func vpaCRDDirectory() (string, error) {
+	cmd := exec.Command("go", "list", "-m", "-f", "{{.Dir}}", "k8s.io/autoscaler/vertical-pod-autoscaler")
+	output, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+
+	sourcePath := filepath.Join(strings.TrimSpace(string(output)), "deploy", "vpa-v1-crd-gen.yaml")
+	crdContents, err := os.ReadFile(sourcePath)
+	if err != nil {
+		return "", err
+	}
+
+	tempDir, err := os.MkdirTemp("", "function-mesh-vpa-crd-*")
+	if err != nil {
+		return "", err
+	}
+
+	if err := os.WriteFile(filepath.Join(tempDir, filepath.Base(sourcePath)), crdContents, 0o600); err != nil {
+		_ = os.RemoveAll(tempDir)
+		return "", err
+	}
+
+	return tempDir, nil
+}

license_test.go

@@ -19,6 +19,7 @@ package main
 
 import (
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -75,6 +76,8 @@ var skip = map[string]bool{
 }
 
 func TestLicense(t *testing.T) {
+	trackedFiles, trackedDirs := gitTrackedPaths()
+
 	err := filepath.Walk(".", func(path string, fi os.FileInfo, err error) error {
 		if skip[path] {
 			return nil
@@ -84,6 +87,25 @@ func TestLicense(t *testing.T) {
 			return err
 		}
 
+		cleanPath := filepath.Clean(path)
+		if fi.IsDir() {
+			if cleanPath == "vendor" || cleanPath == ".git" {
+				return filepath.SkipDir
+			}
+			if len(trackedDirs) > 0 && cleanPath != "." {
+				if _, ok := trackedDirs[cleanPath]; !ok {
+					return filepath.SkipDir
+				}
+			}
+			return nil
+		}
+
+		if len(trackedFiles) > 0 {
+			if _, ok := trackedFiles[cleanPath]; !ok {
+				return nil
+			}
+		}
+
 		switch filepath.Ext(path) {
 		case ".go":
 			if strings.Contains(path, "zz_generated") {
@@ -133,3 +155,37 @@ func TestLicense(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func gitTrackedPaths() (map[string]struct{}, map[string]struct{}) {
+	cmd := exec.Command("git", "ls-files", "-z")
+	output, err := cmd.Output()
+	if err != nil {
+		return nil, nil
+	}
+
+	files := make(map[string]struct{})
+	dirs := map[string]struct{}{
+		".": {},
+	}
+
+	for _, file := range strings.Split(string(output), "\x00") {
+		if file == "" {
+			continue
+		}
+
+		cleanFile := filepath.Clean(file)
+		files[cleanFile] = struct{}{}
+
+		dir := filepath.Dir(cleanFile)
+		for dir != "." && dir != string(filepath.Separator) {
+			dirs[dir] = struct{}{}
+			next := filepath.Dir(dir)
+			if next == dir {
+				break
+			}
+			dir = next
+		}
+	}
+
+	return files, dirs
+}