chore: fix kubernetes-configuration CRD installation in integration tests (#7659)

Author: pmalek

test/util/crds.go

@@ -23,16 +23,16 @@ func DeployCRDsForCluster(ctx context.Context, cluster clusters.Cluster) error {
 		return err
 	}
 
-	fmt.Printf("INFO: deploying Kong CRDs to cluster\n")
+	fmt.Printf("INFO: deploying Kong CRDs (%s) to cluster\n", kongCRDsKustomize)
 	if err := clusters.KustomizeDeployForCluster(ctx, cluster, kongCRDsKustomize); err != nil {
 		return err
 	}
-	fmt.Printf("INFO: deploying Kong incubator CRDs to cluster\n")
+	fmt.Printf("INFO: deploying Kong incubator CRDs (%s) to cluster\n", kongIncubatorCRDsKustomize)
 	if err := clusters.KustomizeDeployForCluster(ctx, cluster, kongIncubatorCRDsKustomize); err != nil {
 		return err
 	}
 
-	fmt.Printf("INFO: deploying Gateway CRDs to cluster\n")
+	fmt.Printf("INFO: deploying Gateway CRDs (%s) to cluster\n", consts.GatewayExperimentalCRDsKustomizeURL)
 	if err := clusters.KustomizeDeployForCluster(ctx, cluster, consts.GatewayExperimentalCRDsKustomizeURL); err != nil {
 		return err
 	}

test/util/gomod.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/blang/semver/v4"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/samber/lo"
 	"golang.org/x/mod/modfile"
@@ -49,13 +50,17 @@ func DependencyModuleVersionGit(dep string) (string, error) {
 		return "", err
 	}
 
+	// NOTE: When we rely on a pseudo-version (e.g. `v1.1.1-0.20250217181409-44e5ddce290d`),
+	// we need to extract the commit hash from it to use it in the GitHub API.
+	// When version is set to a tag (e.g. `v1.1.1`), we could use it against the /commits
+	// endpoint as well but there's no need for that as we can use the tag directly.
+
 	// The same logic as in scripts/generate-crd-kustomize.sh:11:18
-	if versionParts := strings.Split(version, "-"); len(versionParts) >= 2 {
-		// If there are 2 or more hyphens, extract the part after the last hyphen as
-		// that's a git commit hash (e.g. `v1.1.1-0.20250217181409-44e5ddce290d`).
-		version = versionParts[len(versionParts)-1]
 
-		resp, err := retryablehttp.Get("https://api.github.com/repos/Kong/kubernetes-configuration/commits/" + version)
+	// If there are 2 or more hyphens, extract the part after the last hyphen as
+	// that's a git commit hash (e.g. `v1.1.1-0.20250217181409-44e5ddce290d`).
+	if hash, ok := GetHashFromPseudoVersion(version); ok {
+		resp, err := retryablehttp.Get("https://api.github.com/repos/Kong/kubernetes-configuration/commits/" + hash)
 		if err != nil {
 			return "", fmt.Errorf("failed to fetch commit data: %w", err)
 		}
@@ -72,3 +77,24 @@ func DependencyModuleVersionGit(dep string) (string, error) {
 
 	return version, nil
 }
+
+// GetHashFromPseudoVersion extracts the commit hash from a pseudo version string.
+// It returns the hash and a boolean indicating whether the provided string
+// is a valid pseudo version.
+func GetHashFromPseudoVersion(pseudoVersion string) (string, bool) {
+	pseudoVersion = strings.TrimSpace(pseudoVersion)
+	pseudoVersion = strings.TrimPrefix(pseudoVersion, "v") // Remove leading 'v' if present
+
+	// The pseudo version is expected to be in the format:
+	// v1.1.1-0.20250217181409-44e5ddce290d
+	// We need to extract the last part after the last hyphen.
+	parts := strings.Split(pseudoVersion, "-")
+	if len(parts) <= 2 {
+		return "", false
+	}
+
+	if _, err := semver.Parse(parts[0]); err != nil {
+		return "", false
+	}
+	return parts[len(parts)-1], true
+}

test/util/gomod_test.go

@@ -0,0 +1,67 @@
+package util
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetHashFromPseudoVersion(t *testing.T) {
+	tests := []struct {
+		name          string
+		pseudoVersion string
+		expectedHash  string
+		expectedOK    bool
+	}{
+		{
+			name:          "valid pseudo version",
+			pseudoVersion: "v1.1.1-20250217181409-44e5ddce290d",
+			expectedHash:  "44e5ddce290d",
+			expectedOK:    true,
+		},
+		{
+			name:          "valid pseudo version with different format",
+			pseudoVersion: "v0.2.3-20210101120000-abcdef123456",
+			expectedHash:  "abcdef123456",
+			expectedOK:    true,
+		},
+		{
+			name:          "regular version tag",
+			pseudoVersion: "v1.2.3",
+			expectedHash:  "",
+			expectedOK:    false,
+		},
+		{
+			name:          "invalid version format",
+			pseudoVersion: "invalid-version",
+			expectedHash:  "",
+			expectedOK:    false,
+		},
+		{
+			name:          "empty string",
+			pseudoVersion: "",
+			expectedHash:  "",
+			expectedOK:    false,
+		},
+		{
+			name:          "pseudo version with multiple hyphens",
+			pseudoVersion: "v1.0.0-rc1-0.20250101000000-abc123def456",
+			expectedHash:  "abc123def456",
+			expectedOK:    true,
+		},
+		{
+			name:          "semver alpha",
+			pseudoVersion: "v1.0.0-alpha.0",
+			expectedHash:  "",
+			expectedOK:    false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			hash, ok := GetHashFromPseudoVersion(tt.pseudoVersion)
+			require.Equal(t, tt.expectedOK, ok)
+			require.Equal(t, tt.expectedHash, hash)
+		})
+	}
+}