Fix project context for component tests with VEN

Author: guptagunjan

.github/workflows/common-comp-tests.yml

@@ -206,6 +206,10 @@ jobs:
         working-directory: app-orch-deployment/${{ inputs.component }}
         env:
           COMPONENT: ${{ inputs.component }}
+          ORCH_DEFAULT_PASSWORD: ${{ secrets.ORCH_DEFAULT_PASSWORD }}
+          TEST_ORG_NAME: org-2
+          TEST_PROJECT_NAME: project-2
+          TEST_USERNAME: p-edge-manager-2
         run: |
           echo "Running component tests for $COMPONENT"
           make component-test

test-common-utils/pkg/auth/auth.go

@@ -37,7 +37,7 @@ func SetUpAccessToken(server string) (string, error) {
 	}
 	data := url.Values{}
 	data.Set("client_id", "system-client")
-	data.Set("username", fmt.Sprintf("%s-edge-mgr", types.SampleProject))
+	data.Set("username", types.SampleUsername)
 	data.Set("password", types.KCPass)
 	data.Set("grant_type", "password")
 	url := "https://" + server + "/realms/master/protocol/openid-connect/token"

test-common-utils/pkg/deployment/deploy.go

@@ -8,6 +8,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"os/exec"
+	"strings"
 	"time"
 
 	deploymentv1 "github.com/open-edge-platform/app-orch-deployment/app-deployment-manager/api/nbi/v2/deployment/v1"
@@ -164,8 +166,13 @@ func StartDeployment(opts StartDeploymentRequest) (string, int, error) {
 	if opts.DeploymentType == DeploymentTypeTargeted {
 		clusterID, err = GetFirstClusterID(opts.AdmClient)
 		if err != nil {
-			fmt.Printf("Warning: failed to get cluster ID from API: %v, falling back to env var\n", err)
-			clusterID = types.GetTestClusterID()
+			fmt.Printf("Warning: failed to get cluster ID from API: %v\n", err)
+			// Try kubectl fallback
+			clusterID, err = GetClusterIDFromKubectl()
+			if err != nil {
+				fmt.Printf("Warning: kubectl fallback also failed: %v, using env var\n", err)
+				clusterID = types.GetTestClusterID()
+			}
 		}
 	}
 	fmt.Printf("Using cluster ID: %s (type: %s)\n", clusterID, opts.DeploymentType)
@@ -630,3 +637,31 @@ func GetFirstClusterID(client *restClient.ClientWithResponses) (string, error) {
 
 	return "", fmt.Errorf("no clusters found after %d retries", maxRetries)
 }
+
+// GetClusterIDFromKubectl retrieves the cluster ID using kubectl as a fallback.
+// This queries the nexus CRD directly to get the cluster UID.
+func GetClusterIDFromKubectl() (string, error) {
+	// First, get the list of cluster names
+	// #nosec G204 -- Arguments are controlled within application context.
+	cmd := exec.Command("kubectl", "get", "clusterinfos.nexus.api.resourcemanager.orchestrator.apis",
+		"-n", "nexus", "-o", "jsonpath={.items[0].metadata.uid}")
+	output, err := cmd.Output()
+	if err != nil {
+		// Try alternative CRD names
+		// #nosec G204 -- Arguments are controlled within application context.
+		cmd = exec.Command("kubectl", "get", "clusters.cluster.orchestrator.apis",
+			"-A", "-o", "jsonpath={.items[0].metadata.uid}")
+		output, err = cmd.Output()
+		if err != nil {
+			return "", fmt.Errorf("failed to get cluster ID via kubectl: %w", err)
+		}
+	}
+
+	clusterID := strings.TrimSpace(string(output))
+	if clusterID == "" {
+		return "", fmt.Errorf("kubectl returned empty cluster ID")
+	}
+
+	fmt.Printf("Got cluster ID from kubectl: %s\n", clusterID)
+	return clusterID, nil
+}

test-common-utils/pkg/types/common_types.go

@@ -26,11 +26,46 @@ const (
 	RetryCount = 20
 )
 
+// Default values for org and project names
 const (
-	SampleOrg     = "sample-org"
-	SampleProject = "sample-project"
+	DefaultSampleOrg     = "sample-org"
+	DefaultSampleProject = "sample-project"
 )
 
+// SampleOrg returns the organization name from environment variable or default.
+var SampleOrg = getSampleOrg()
+
+// SampleProject returns the project name from environment variable or default.
+var SampleProject = getSampleProject()
+
+// SampleUsername returns the test username from environment variable or default.
+var SampleUsername = getSampleUsername()
+
+func getSampleOrg() string {
+	org := os.Getenv("TEST_ORG_NAME")
+	if org == "" {
+		return DefaultSampleOrg
+	}
+	return org
+}
+
+func getSampleProject() string {
+	project := os.Getenv("TEST_PROJECT_NAME")
+	if project == "" {
+		return DefaultSampleProject
+	}
+	return project
+}
+
+func getSampleUsername() string {
+	username := os.Getenv("TEST_USERNAME")
+	if username == "" {
+		// Default format: {project}-edge-mgr
+		return getSampleProject() + "-edge-mgr"
+	}
+	return username
+}
+
 // TestClusterID is the cluster ID used for testing.
 // It reads from TEST_CLUSTER_ID environment variable, defaults to "demo-cluster".
 var TestClusterID = getTestClusterID()