test: refactored tests, added specific names

tests/helpers.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/google/uuid"
-	openapi_chaos_client "github.com/qernal/openapi-chaos-go-client"
-	"golang.org/x/oauth2/clientcredentials"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/google/uuid"
+	openapi_chaos_client "github.com/qernal/openapi-chaos-go-client"
+	"golang.org/x/oauth2/clientcredentials"
 )
 
 var (

tests/modules/environment_secret/main.tf

@@ -11,4 +11,3 @@ output "secret_name" {
 output "secret_value" {
   value = qernal_secret_environment.example.value
 }
-

tests/modules/environment_secret/vars.tf

@@ -1,6 +1,11 @@
+variable "project_id" {
+  type = string
+}
 
-variable "project_id" {}
+variable "secret_name" {
+  type = string
+}
 
-variable "secret_name" {}
-
-variable "secret_value" {}
+variable "secret_value" {
+  type = string
+}

tests/modules/org_datasource_by_name/main.tf

@@ -0,0 +1,11 @@
+data "qernal_organisation" "org" {
+  name = var.org_name
+}
+
+output "organisation_id" {
+  value = data.qernal_organisation.org.id
+}
+
+output "organisation_name" {
+  value = data.qernal_organisation.org.name
+}

tests/modules/org_datasource_by_name/vars.tf

@@ -0,0 +1,3 @@
+variable "org_name" {
+  type = string
+}

tests/modules/project_datasource_by_name/main.tf

@@ -0,0 +1,11 @@
+data "qernal_project" "project" {
+  name = var.project_name
+}
+
+output "project_name" {
+  value = data.qernal_project.project.name
+}
+
+output "project_id" {
+  value = data.qernal_project.project.id
+}

tests/modules/project_datasource_by_name/vars.tf

@@ -0,0 +1,3 @@
+variable "project_id" {
+  type = string
+}

tests/qernal_organisation_test.go

@@ -49,12 +49,12 @@ func TestValidOrg(t *testing.T) {
 func TestOrganisationDataSource(t *testing.T) {
 	t.Parallel()
 
-	orgId, _, err := createOrg()
+	orgId, orgName, err := createOrg()
 	if err != nil {
 		t.Fatal("Failed to create org")
 	}
 
-	moduleName := "./modules/org_datasource"
+	moduleName := "./modules/org_datasource_by_name"
 
 	// Copy provider.tf
 	defer os.Remove(fmt.Sprintf("%s/provider.tf", moduleName))
@@ -72,7 +72,7 @@ func TestOrganisationDataSource(t *testing.T) {
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
 		TerraformDir: moduleName,
 		Vars: map[string]interface{}{
-			"org_id": orgId,
+			"org_name": orgName,
 		},
 	})
 
@@ -85,4 +85,6 @@ func TestOrganisationDataSource(t *testing.T) {
 	tfOrgID := terraform.Output(t, terraformOptions, "organisation_id")
 	assert.Equal(t, orgId, tfOrgID)
 
+	tfOrgName := terraform.Output(t, terraformOptions, "organisation_name")
+	assert.Equal(t, orgName, tfOrgName)
 }

tests/qernal_project_test.go

@@ -56,7 +56,6 @@ func TestValidProject(t *testing.T) {
 }
 
 func TestProjectDataSource(t *testing.T) {
-
 	t.Parallel()
 
 	orgId, _, err := createOrg()
@@ -69,7 +68,7 @@ func TestProjectDataSource(t *testing.T) {
 		t.Fatal("Failed to create test org")
 	}
 	// define a project name and validate it in the response
-	moduleName := "./modules/project_datasource/"
+	moduleName := "./modules/project_datasource_by_name"
 
 	// copy provider.tf
 	defer os.Remove(fmt.Sprintf("%s/provider.tf", moduleName))
@@ -85,14 +84,16 @@ func TestProjectDataSource(t *testing.T) {
 		},
 	})
 
-	defer deleteProj(projectId)
 	defer deleteOrg(orgId)
-
+	defer deleteProj(projectId)
 	defer terraform.Destroy(t, terraformOptions)
 
 	terraform.InitAndApply(t, terraformOptions)
 
 	// validate output
 	tfProjectName := terraform.Output(t, terraformOptions, "project_name")
 	assert.Equal(t, projectName, tfProjectName)
+
+	tfProjectId := terraform.Output(t, terraformOptions, "project_id")
+	assert.Equal(t, projectId, tfProjectId)
 }