test(e2e): Restore idempotency of e2e tests (#557)

Signed-off-by: jannfis <[email protected]>

Author: jannfis

test/e2e/fixture/argoclient.go

@@ -432,6 +432,7 @@ func (c *ArgoRestClient) ListApplications() (*v1alpha1.ApplicationList, error) {
 func (c *ArgoRestClient) DeleteApplication(name string) error {
 	reqURL := c.url()
 	reqURL.Path = fmt.Sprintf("/api/v1/applications/%s", name)
+	reqURL.RawQuery = "cascade=false"
 
 	req, err := http.NewRequest(http.MethodDelete, reqURL.String(), nil)
 	if err != nil {

test/e2e/fixture/fixture.go

@@ -90,9 +90,6 @@ func (suite *BaseSuite) SetupTest() {
 		project := &argoapp.AppProject{}
 		key := types.NamespacedName{Name: "agent-autonomous-default", Namespace: "argocd"}
 		err := suite.PrincipalClient.Get(suite.Ctx, key, project, metav1.GetOptions{})
-		if err != nil {
-			suite.T().Log(err)
-		}
 		return err == nil && len(project.Annotations) > 0 && project.Annotations["created"] == now
 	}, 30*time.Second, 1*time.Second)
 
@@ -107,19 +104,19 @@ func (suite *BaseSuite) TearDownTest() {
 
 // EnsureDeletion will issue a delete for a namespace-scoped K8s resource, then wait for it to no longer exist
 func EnsureDeletion(ctx context.Context, kclient KubeClient, obj KubeObject) error {
-	err := kclient.Delete(ctx, obj, metav1.DeleteOptions{})
-	if errors.IsNotFound(err) {
-		// object is already deleted
-		return nil
-	} else if err != nil {
-		return err
-	}
-
 	// Wait for the object to be deleted  for 60 seconds
 	// - Primarily this will be waiting for the finalizer to be removed, so that the object is deleted
 	key := types.NamespacedName{Name: obj.GetName(), Namespace: obj.GetNamespace()}
 	for count := 0; count < 60; count++ {
-		err := kclient.Get(ctx, key, obj, metav1.GetOptions{})
+		err := kclient.Delete(ctx, obj, metav1.DeleteOptions{})
+		if errors.IsNotFound(err) {
+			// object is already deleted
+			return nil
+		} else if err != nil {
+			return err
+		}
+
+		err = kclient.Get(ctx, key, obj, metav1.GetOptions{})
 		if errors.IsNotFound(err) {
 			return nil
 		} else if err == nil {
@@ -161,27 +158,27 @@ func CleanUp(ctx context.Context, principalClient KubeClient, managedAgentClient
 	// Remove any previously configured env variables from the config file
 	os.Remove(EnvVariablesFromE2EFile)
 
-	// Delete all managed applications from the principal
+	// Delete all applications from the autonomous agent
 	list = argoapp.ApplicationList{}
-	err = principalClient.List(ctx, "agent-managed", &list, metav1.ListOptions{})
+	err = autonomousAgentClient.List(ctx, "argocd", &list, metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
 	for _, app := range list.Items {
-		err = EnsureDeletion(ctx, principalClient, &app)
+		err = EnsureDeletion(ctx, autonomousAgentClient, &app)
 		if err != nil {
 			return err
 		}
 	}
 
-	// Delete all applications from the autonomous agent
+	// Delete all managed applications from the principal
 	list = argoapp.ApplicationList{}
-	err = autonomousAgentClient.List(ctx, "argocd", &list, metav1.ListOptions{})
+	err = principalClient.List(ctx, "agent-managed", &list, metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
 	for _, app := range list.Items {
-		err = EnsureDeletion(ctx, autonomousAgentClient, &app)
+		err = EnsureDeletion(ctx, principalClient, &app)
 		if err != nil {
 			return err
 		}
@@ -213,33 +210,33 @@ func CleanUp(ctx context.Context, principalClient KubeClient, managedAgentClient
 		}
 	}
 
-	// Delete all appProjects from the principal
+	// Delete all appProjects from the autonomous agent
 	appProjectList := argoapp.AppProjectList{}
-	err = principalClient.List(ctx, "argocd", &appProjectList, metav1.ListOptions{})
+	err = autonomousAgentClient.List(ctx, "argocd", &appProjectList, metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
 	for _, appProject := range appProjectList.Items {
 		if appProject.Name == appproject.DefaultAppProjectName {
 			continue
 		}
-		err = EnsureDeletion(ctx, principalClient, &appProject)
+		err = EnsureDeletion(ctx, autonomousAgentClient, &appProject)
 		if err != nil {
 			return err
 		}
 	}
 
-	// Delete all appProjects from the autonomous agent
+	// Delete all appProjects from the principal
 	appProjectList = argoapp.AppProjectList{}
-	err = autonomousAgentClient.List(ctx, "argocd", &appProjectList, metav1.ListOptions{})
+	err = principalClient.List(ctx, "argocd", &appProjectList, metav1.ListOptions{})
 	if err != nil {
 		return err
 	}
 	for _, appProject := range appProjectList.Items {
 		if appProject.Name == appproject.DefaultAppProjectName {
 			continue
 		}
-		err = EnsureDeletion(ctx, autonomousAgentClient, &appProject)
+		err = EnsureDeletion(ctx, principalClient, &appProject)
 		if err != nil {
 			return err
 		}