revert: use shorter funcs

qernal · Jul 29, 2024 · 212e369 · 212e369
1 parent 0294162
commit 212e369
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/tests/helpers.go b/tests/helpers.go
@@ -80,24 +80,6 @@ func createOrg() (string, string, error) {
 	return resp.Id, resp.Name, nil
 }
 
-func createProject(orgid string) (string, string, error) {
-
-	client := qernalClient()
-
-	projectbody := *openapi_chaos_client.NewProjectBody(orgid, uuid.NewString())
-
-	resp, r, err := client.ProjectsAPI.ProjectsCreate(context.Background()).ProjectBody(projectbody).Execute()
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error when calling `ProjectsAPI.ProjectsCreate`: %v\n", err)
-		fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
-
-		return "", "", err
-	}
-
-	return resp.Id, resp.Name, nil
-}
-
 func deleteOrg(orgid string) {
 	client := qernalClient()
 	_, r, err := client.OrganisationsAPI.OrganisationsDelete(context.Background(), orgid).Execute()
@@ -151,19 +133,6 @@ func getDefaultHost(projid string) (string, error) {
 	return "", errors.New("no default host on project")
 }
 
-func deleteProject(projectid string) {
-	client := qernalClient()
-
-	_, r, err := client.ProjectsAPI.ProjectsDelete(context.Background(), projectid).Execute()
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error when calling `ProjectsAPI.ProjectsDelete`: %v\n", err)
-		fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
-
-	}
-
-}
-
 func cleanupTerraformFiles(modulePath string) error {
 
 	// List of files/directories to remove

diff --git a/tests/qernal_project_test.go b/tests/qernal_project_test.go
@@ -64,7 +64,7 @@ func TestProjectDataSource(t *testing.T) {
 		t.Fatal("Failed to create org")
 	}
 
-	projectId, projectName, err := createProject(orgId)
+	projectId, projectName, err := createProj(orgId)
 	if err != nil {
 		t.Fatal("Failed to create test org")
 	}
@@ -85,7 +85,7 @@ func TestProjectDataSource(t *testing.T) {
 		},
 	})
 
-	defer deleteProject(projectId)
+	defer deleteProj(projectId)
 	defer deleteOrg(orgId)
 
 	defer terraform.Destroy(t, terraformOptions)

diff --git a/tests/qernal_secret_test.go b/tests/qernal_secret_test.go
@@ -20,7 +20,7 @@ func TestEnvironmentSecret(t *testing.T) {
 		t.Fatal("Failed to create org")
 	}
 
-	projectId, _, err := createProject(orgId)
+	projectId, _, err := createProj(orgId)
 	if err != nil {
 		t.Fatal("Failed to create project")
 	}
@@ -52,7 +52,7 @@ func TestEnvironmentSecret(t *testing.T) {
 		},
 	})
 
-	defer deleteProject(projectId)
+	defer deleteProj(projectId)
 	defer deleteOrg(orgId)
 	defer terraform.Destroy(t, terraformOptions)