refactor for go-gitlab

terraform-google-modules · Nov 1, 2024 · c633526 · c633526
1 parent a9c161a
commit c633526
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/test/integration/cloudbuild_repo_connection_gitlab/cloudbuild_repo_connection_gitlab_test.go b/test/integration/cloudbuild_repo_connection_gitlab/cloudbuild_repo_connection_gitlab_test.go
@@ -93,7 +93,7 @@ func (gl *GitLabClient) AddFileToProject(file []byte) {
 }
 
 func (gl *GitLabClient) DeleteProject() {
-	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName())
+	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName(), utils.GetDeleteProjectOptions())
 	if resp.StatusCode != 404 && err != nil {
 		gl.t.Errorf("error deleting project with status %s and error %s", resp.Status, err.Error())
 	}

diff --git a/test/integration/im_cloudbuild_workspace_gitlab/im_cloudbuild_workspace_gitlab_test.go b/test/integration/im_cloudbuild_workspace_gitlab/im_cloudbuild_workspace_gitlab_test.go
@@ -95,7 +95,7 @@ func (gl *GitLabClient) AddFileToProject(file []byte) {
 }
 
 func (gl *GitLabClient) DeleteProject() {
-	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName())
+	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName(), utils.GetDeleteProjectOptions())
 	if err != nil {
 		gl.t.Errorf("error deleting project with status %s and error %s", resp.Status, err.Error())
 	}

diff --git a/...tegration/tf_cloudbuild_builder_simple_gitlab/tf_cloudbuild_builder_simple_gitlab_test.go b/...tegration/tf_cloudbuild_builder_simple_gitlab/tf_cloudbuild_builder_simple_gitlab_test.go
@@ -83,7 +83,7 @@ func (gl *GitLabClient) CreateProject() {
 }
 
 func (gl *GitLabClient) DeleteProject() {
-	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName())
+	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName(), utils.GetDeleteProjectOptions())
 	if resp.StatusCode != 404 && err != nil {
 		gl.t.Errorf("error deleting project with status %s and error %s", resp.Status, err.Error())
 	}

diff --git a/...ation/tf_cloudbuild_workspace_simple_gitlab/tf_cloudbuild_workspace_simple_gitlab_test.go b/...ation/tf_cloudbuild_workspace_simple_gitlab/tf_cloudbuild_workspace_simple_gitlab_test.go
@@ -95,7 +95,7 @@ func (gl *GitLabClient) AddFileToProject(file []byte) {
 }
 
 func (gl *GitLabClient) DeleteProject() {
-	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName())
+	resp, err := gl.client.Projects.DeleteProject(gl.ProjectName(), utils.GetDeleteProjectOptions())
 	if resp.StatusCode != 404 && err != nil {
 		gl.t.Errorf("error deleting project with status %s and error %s", resp.Status, err.Error())
 	}

diff --git a/test/integration/utils/utils.go b/test/integration/utils/utils.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
+	"github.com/xanzy/go-gitlab"
 )
 
 // GetRandomStringFromSetup gets a random string output variable setup.
@@ -44,3 +45,11 @@ func GetFileContents(t *testing.T, path string) []byte {
 func LastElement(str, sep string) string {
 	return strings.Split(str, sep)[len(strings.Split(str, sep))-1]
 }
+
+// GetDeleteProjectOptions returns default DeleteProjectOptions
+func GetDeleteProjectOptions() *gitlab.DeleteProjectOptions {
+	return &gitlab.DeleteProjectOptions{
+		FullPath:          gitlab.Ptr("group/project"),
+		PermanentlyRemove: gitlab.Ptr(true),
+	}
+}