Add application violations tests for leaf cluster (#1807)

* add tests for leaf cluster and fix some lines in managmenet cluster tests * restructure the leaf cluster creation section * fix Functions docstrings * prepare the branch to merge the main changes * add some fixes after merge the main * fix some lines in create leaf cluster section * leaf cluster application violation test * change the leaf cluster name and type * change the patSecret name * add wait for leaf clauster availability method * Tweaks creating leaf cluster * Fixed leaf-cluster application violation test * fix typo errors * re-structure the code by creating shared methods * enhance the shared methods for app violations * fix the review comments * change the violatedPolicy object name to appViolations Co-authored-by: Saeed Fazal <saeed@weave.works> Co-authored-by: serboctor <boctor.sarah@gmail.com>
weaveworks · Nov 2, 2022 · 508b957 · 508b957
1 parent 330490c
commit 508b957
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 115 deletions.
diff --git a/test/acceptance/test/pages/applications_page.go b/test/acceptance/test/pages/applications_page.go
@@ -94,10 +94,12 @@ type ApplicationViolationsList struct {
 	SearchResult              *agouti.Selection
 }
 
+// AppViolationsMsgInList contains the violation's message element
 type AppViolationsMsgInList struct {
 	AppViolationsMsg *agouti.Selection
 }
 
+// ApplicationViolationsDetailsPage contains all the fields in the app violations details page
 type ApplicationViolationsDetailsPage struct {
 	ViolationHeader      *agouti.Selection
 	PolicyName           *agouti.Selection
@@ -256,13 +258,14 @@ func GetApplicationViolationsList(webDriver *agouti.Page) *ApplicationViolations
 	return &applicationViolationsList
 }
 
+// GetAppViolationsMsgInList returns the violation's message field which we need to press it to open the app violations detail page
 func GetAppViolationsMsgInList(webDriver *agouti.Page) *AppViolationsMsgInList {
 	return &AppViolationsMsgInList{
 		AppViolationsMsg: webDriver.FirstByXPath(`//td[1]//a`),
 	}
 }
 
-// GetApplicationViolationsDetailsPage will have all the locators for App Violations Details page.
+// GetApplicationViolationsDetailsPage returns all the locators for the app violations details page
 func GetApplicationViolationsDetailsPage(webDriver *agouti.Page) *ApplicationViolationsDetailsPage {
 	return &ApplicationViolationsDetailsPage{
 		ViolationHeader:      webDriver.FindByXPath(`//div[@role="heading"]/a[@href="/applications"]/parent::node()/parent::node()/following-sibling::div[2]`),

diff --git a/test/acceptance/test/ui_applications.go b/test/acceptance/test/ui_applications.go
diff --git a/test/acceptance/test/ui_clusters.go b/test/acceptance/test/ui_clusters.go
@@ -202,7 +202,7 @@ func DescribeClusters(gitopsTestRunner GitopsTestRunner) {
 				createNamespace([]string{leafCluster.Namespace})
 				createPATSecret(leafCluster.Namespace, patSecret)
 				clusterBootstrapCopnfig = createClusterBootstrapConfig(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, patSecret)
-				gitopsCluster = connectGitopsCuster(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, leafClusterkubeconfig)
+				gitopsCluster = connectGitopsCluster(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, leafClusterkubeconfig)
 
 				ginkgo.By("And wait for GitopsCluster to be visibe on the dashboard", func() {
 					gomega.Eventually(clustersPage.ClusterHeader).Should(matchers.BeVisible())

diff --git a/test/acceptance/test/ui_policies.go b/test/acceptance/test/ui_policies.go
@@ -206,7 +206,7 @@ func DescribePolicies(gitopsTestRunner GitopsTestRunner) {
 				useClusterContext(mgmtClusterContext)
 				createPATSecret(leafClusterNamespace, patSecret)
 				clusterBootstrapCopnfig = createClusterBootstrapConfig(leafClusterName, leafClusterNamespace, bootstrapLabel, patSecret)
-				gitopsCluster = connectGitopsCuster(leafClusterName, leafClusterNamespace, bootstrapLabel, leafClusterkubeconfig)
+				gitopsCluster = connectGitopsCluster(leafClusterName, leafClusterNamespace, bootstrapLabel, leafClusterkubeconfig)
 				createLeafClusterSecret(leafClusterNamespace, leafClusterkubeconfig)
 
 				waitForLeafClusterAvailability(leafClusterName, "Ready")

diff --git a/test/acceptance/test/ui_tenant.go b/test/acceptance/test/ui_tenant.go
@@ -357,7 +357,7 @@ func DescribeTenants(gitopsTestRunner GitopsTestRunner) {
 				useClusterContext(mgmtClusterContext)
 				createPATSecret(leafCluster.Namespace, patSecret)
 				clusterBootstrapCopnfig = createClusterBootstrapConfig(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, patSecret)
-				gitopsCluster = connectGitopsCuster(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, leafClusterkubeconfig)
+				gitopsCluster = connectGitopsCluster(leafCluster.Name, leafCluster.Namespace, bootstrapLabel, leafClusterkubeconfig)
 				createLeafClusterSecret(leafCluster.Namespace, leafClusterkubeconfig)
 
 				ginkgo.By(fmt.Sprintf("And I verify %s GitopsCluster/leafCluster is bootstraped)", leafCluster.Name), func() {

diff --git a/test/acceptance/test/ui_violations.go b/test/acceptance/test/ui_violations.go
@@ -174,7 +174,7 @@ func DescribeViolations(gitopsTestRunner GitopsTestRunner) {
 				useClusterContext(mgmtClusterContext)
 				createPATSecret(leafClusterNamespace, patSecret)
 				clusterBootstrapCopnfig = createClusterBootstrapConfig(leafClusterName, leafClusterNamespace, bootstrapLabel, patSecret)
-				gitopsCluster = connectGitopsCuster(leafClusterName, leafClusterNamespace, bootstrapLabel, leafClusterkubeconfig)
+				gitopsCluster = connectGitopsCluster(leafClusterName, leafClusterNamespace, bootstrapLabel, leafClusterkubeconfig)
 				createLeafClusterSecret(leafClusterNamespace, leafClusterkubeconfig)
 
 				waitForLeafClusterAvailability(leafClusterName, "Ready")

diff --git a/test/acceptance/test/utils_gitops.go b/test/acceptance/test/utils_gitops.go
@@ -464,7 +464,7 @@ func createClusterBootstrapConfig(clusterName string, nameSpace string, bootstra
 	return bootstrapConfig
 }
 
-func connectGitopsCuster(clusterName string, nameSpace string, bootstrapLabel string, kubeconfigSecret string) (gitopsCluster string) {
+func connectGitopsCluster(clusterName string, nameSpace string, bootstrapLabel string, kubeconfigSecret string) (gitopsCluster string) {
 	ginkgo.By(fmt.Sprintf("Add GitopsCluster resource for %s cluster to management cluster", clusterName), func() {
 		contents, err := ioutil.ReadFile(path.Join(getCheckoutRepoPath(), "test/utils/data/gitops-cluster.yaml"))
 		gomega.Expect(err).To(gomega.BeNil(), "Failed to read GitopsCluster template yaml")
@@ -520,7 +520,7 @@ func deleteSource(sourceType, sourceName, namespace, kubeconfig string) {
 }
 
 func addKustomizationBases(clusterType, clusterName, clusterNamespace string) {
-	ginkgo.By("And add kustomization bases for common resources for leaf cluster)", func() {
+	ginkgo.By("And add kustomization bases for common resources for leaf cluster", func() {
 		repoAbsolutePath := path.Join(configRepoAbsolutePath(gitProviderEnv))
 		checkoutTestDataPath := path.Join(getCheckoutRepoPath(), "test", "utils", "data")
 		leafClusterPath := path.Join(repoAbsolutePath, "clusters", clusterNamespace, clusterName)