Last few PR comment updates

anupama2501 · Nov 6, 2024 · 131be91 · 131be91
1 parent be414df
commit 131be91
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/tests/v2/actions/observability/config.go b/tests/v2/actions/observability/config.go
@@ -1,8 +1,8 @@
 package observability
 
 type StackStateConfig struct {
-	ServiceToken             string `json:"serviceToken" yaml:"serviceToken"`
-	Url                      string `json:"url" yaml:"url"`
-	ClusterApiKey            string `json:"clusterApiKey" yaml:"clusterApiKey"`
-	StackstateUpgradeVersion string `json:"stackstateUpgradeVersion" yaml:"stackstateUpgradeVersion"`
+	ServiceToken   string `json:"serviceToken" yaml:"serviceToken"`
+	Url            string `json:"url" yaml:"url"`
+	ClusterApiKey  string `json:"clusterApiKey" yaml:"clusterApiKey"`
+	UpgradeVersion string `json:"upgradeVersion" yaml:"upgradeVersion"`
 }
diff --git a/tests/v2/actions/observability/stackstate.go b/tests/v2/actions/observability/stackstate.go
@@ -14,10 +14,16 @@ import (
 )
 
 const (
+	// Public Constants
 	StackstateName         = "stackstate"
 	ObservabilitySteveType = "configurations.observability.rancher.io"
 	CrdGroup               = "observability.rancher.io"
 	ApiExtenisonsCRD       = "apiextensions.k8s.io.customresourcedefinition"
+
+	// Private Constants
+	localURL      = "local://"
+	inactiveState = "inactive"
+	activeState   = "active"
 )
 
 // NewStackstateCRDConfiguration is a constructor that takes in the configuration and creates an unstructured type to install the CRD
@@ -46,8 +52,8 @@ func WhitelistStackstateDomains(client *rancher.Client, whitelistDomains []strin
 		Name:             StackstateName,
 		Active:           false,
 		WhitelistDomains: whitelistDomains,
-		URL:              "local://",
-		State:            "inactive",
+		URL:              localURL,
+		State:            inactiveState,
 	}
 
 	stackstateNodeDriver, err := client.Management.NodeDriver.Create(nodedriver)
@@ -61,7 +67,7 @@ func WhitelistStackstateDomains(client *rancher.Client, whitelistDomains []strin
 			return false, err
 		}
 
-		if resp.State == "inactive" {
+		if resp.State == inactiveState {
 			return true, nil
 		}
 		return false, nil
@@ -140,7 +146,7 @@ func InstallStackstateCRD(client *rancher.Client) error {
 			return false, err
 		}
 
-		if resp.ObjectMeta.State.Name == "active" {
+		if resp.ObjectMeta.State.Name == activeState {
 			return true, nil
 		}
 		return false, nil

diff --git a/tests/v2/validation/observability/README.md b/tests/v2/validation/observability/README.md
@@ -26,5 +26,5 @@ stackstateConfigs:
   url: "stackstate_ui_server_address"
   serviceToken: "stackstate_user_service_token"
   clusterApiKey: "stackstate_cluster_apikey"
-  StackstateUpgradeVersion: "Stackstate_agent_version" #optional
+  upgradeVersion: "Stackstate_agent_version" #optional
 ```
diff --git a/tests/v2/validation/observability/rbac/stackstate_rbac_test.go b/tests/v2/validation/observability/rbac/stackstate_rbac_test.go
@@ -31,13 +31,10 @@ import (
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	uiExtensionsRepo = "https://github.com/rancher/ui-plugin-charts"
-	uiGitBranch      = "main"
-	rancherUIPlugins = "rancher-ui-plugins"
-)
-
 const (
+	uiExtensionsRepo        = "https://github.com/rancher/ui-plugin-charts"
+	uiGitBranch             = "main"
+	rancherUIPlugins        = "rancher-ui-plugins"
 	project                 = "management.cattle.io.project"
 	rancherPartnerCharts    = "rancher-partner-charts"
 	systemProject           = "System"
@@ -75,7 +72,6 @@ func (rb *StackStateRBACTestSuite) SetupSuite() {
 	rb.cluster, err = rb.client.Management.Cluster.ByID(cluster.ID)
 	require.NoError(rb.T(), err)
 
-
 	projectTemplate := kubeprojects.NewProjectTemplate(cluster.ID)
 	projectTemplate.Name = charts.StackstateNamespace
 	project, err := client.Steve.SteveType(project).Create(projectTemplate)

diff --git a/tests/v2/validation/observability/stackstate_test.go b/tests/v2/validation/observability/stackstate_test.go
@@ -77,7 +77,10 @@ func (ss *StackStateTestSuite) SetupSuite() {
 	require.NoError(ss.T(), err)
 	ss.projectID = project.ID
 
-	_, err = namespaces.CreateNamespace(client, cluster.ID, project.Name, charts.StackstateNamespace, "", map[string]string{}, map[string]string{})
+	ssNamespaceExists, err := namespaces.GetNamespaceByName(client, cluster.ID, charts.StackstateNamespace)
+	if ssNamespaceExists == nil && k8sErrors.IsNotFound(err) {
+		_, err = namespaces.CreateNamespace(client, cluster.ID, project.Name, charts.StackstateNamespace, "", map[string]string{}, map[string]string{})
+	}
 	require.NoError(ss.T(), err)
 
 	_, err = ss.client.Catalog.ClusterRepos().Get(context.TODO(), rancherUIPlugins, meta.GetOptions{})
@@ -286,7 +289,7 @@ func (ss *StackStateTestSuite) TestDynamicUpgradeStackstateAgentChart() {
 	client, err := ss.client.WithSession(subSession)
 	require.NoError(ss.T(), err)
 
-	versionToUpgrade := ss.stackstateConfigs.StackstateUpgradeVersion
+	versionToUpgrade := ss.stackstateConfigs.UpgradeVersion
 	if versionToUpgrade == "" {
 		ss.T().Skip("Skipping the test as no user version provided")
 	}
@@ -299,7 +302,7 @@ func (ss *StackStateTestSuite) TestDynamicUpgradeStackstateAgentChart() {
 		ss.T().Skip("Skipping the test, as stackstate agent chart is already installed with the provided version or stackstate agent is not installed.")
 	}
 
-	ss.stackstateAgentInstallOptions.Version = ss.stackstateConfigs.StackstateUpgradeVersion
+	ss.stackstateAgentInstallOptions.Version = ss.stackstateConfigs.UpgradeVersion
 	require.NoError(ss.T(), err)
 
 	ss.T().Log("Upgrading stackstate agent chart to the user provided version")