feat/pm-298: Modified tests and provider to run tests in ci/cd pipeline (#123)

Author: xyuria-zededa

Makefile

@@ -43,16 +43,16 @@ build:
 
 # acceptance tests
 .PHONY: test
-test: build
+test:
 	cd v2 && \
-	TF_ACC=1 go test -v ./... && \
+	TF_ACC=1 TF_CLI_CONFIG_FILE="${PWD}/dev.tfrc" go test -v ./... && \
 	cd -
 
 .PHONY: test-run
-test-run: build
+test-run:
 	cd v2 && \
 	go vet ./... && \
-	TF_ACC=1 go test -v ./... -run $(case) && \
+	TF_ACC=1 TF_CLI_CONFIG_FILE="${PWD}/dev.tfrc" go test -v ./... -run $(case) && \
 	cd -
 
 .PHONY: udpatedeps

v2/resources/provider.go

@@ -18,6 +18,7 @@ import (
 
 var (
 	version   string = "dev"
+	defaultURL string = "zedcontrol.local.zededa.net"
 )
 
 func Provider() *schema.Provider {
@@ -28,8 +29,7 @@ func Provider() *schema.Provider {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "ZEDCloud url. Ex: https://zedcontrol.zededa.net",
-				Default:     "zedcontrol.local.zededa.net",
-				DefaultFunc: schema.EnvDefaultFunc("TF_VAR_zedcloud_url", nil),
+				DefaultFunc: schema.EnvDefaultFunc("TF_VAR_zedcloud_url", defaultURL),
 			},
 			"zedcloud_token": {
 				Type:        schema.TypeString,
@@ -87,16 +87,21 @@ func NewHttpTransportWrapper(rt http.RoundTripper) *HttpTransportWrapper {
 	if err != nil {
 		wrapper.providerVersion = "v0.0.0"
 	} else {
-		execNameParts := strings.Split(execName, "_")
-		if len(execNameParts) != 2 {
-			if version != "dev" {
-				wrapper.providerVersion = fmt.Sprintf("v%s", version)
+		if !strings.Contains(execName, "resources.test") {
+			execNameParts := strings.Split(execName, "_")
+			if len(execNameParts) != 2 {
+				if version != "dev" {
+					wrapper.providerVersion = fmt.Sprintf("v%s", version)
+				} else {
+					wrapper.providerVersion = "v0.0.0"
+				}
 			} else {
-				wrapper.providerVersion = "v0.0.0"
+				wrapper.providerVersion = execNameParts[1]
 			}
 		} else {
-			wrapper.providerVersion = execNameParts[1]
+			wrapper.providerVersion = "testbuild"
 		}
+
 	}
 
 	return wrapper
@@ -110,7 +115,10 @@ func (h *HttpTransportWrapper) RoundTrip(req *http.Request) (*http.Response, err
 }
 
 func ProviderConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-	zedCloudURL := d.Get("zedcloud_url").(string)
+	zedCloudURL, urlIsSet := d.Get("zedcloud_url").(string)
+	if !urlIsSet || zedCloudURL == "" {
+		return nil, diag.FromErr(errors.New("zedcloud URL must be set"))
+	}
 
 	token, tokenIsSet := d.Get("zedcloud_token").(string)
 	if !tokenIsSet || token == "" {

v2/resources/testdata/application/create.tf

@@ -21,9 +21,9 @@ resource "zedcloud_application" "test_tf_provider" {
 	depends_on = [
 		zedcloud_project.test_tf_provider
 	]
-	name = "ubuntu-all-ip"
-	title = "ubuntu-all-ip"
-	description = "ubuntu-all-ip"
+	name = "test_tf_provider-ubuntu-all-ip"
+	title = "test_tf_provider-ubuntu-all-ip"
+	description = "test_tf_provider-ubuntu-all-ip"
 	user_defined_version = "1.1"
 	origin_type = "ORIGIN_LOCAL"
 	project_access_list = [zedcloud_project.test_tf_provider.id]

v2/resources/testdata/application/create.yaml

@@ -1,5 +1,5 @@
 cpus: 2
-description: ubuntu-all-ip
+description: test_tf_provider-ubuntu-all-ip
 drives: 1
 id: 5ff2ba22-827c-427f-92b9-93673569eeab
 isimported: false
@@ -100,7 +100,7 @@ manifest:
       value: "1024000"
   vmmode: HV_HVM
 memory: 1024000
-name: ubuntu-all-ip
+name: test_tf_provider-ubuntu-all-ip
 networks: 1
 origintype: ORIGIN_LOCAL
 parentdetail:
@@ -116,5 +116,5 @@ revision:
   updatedat: "2023-02-12T14:45:49.847Z"
   updatedby: us.root@zededa.com
 storage: 0
-title: ubuntu-all-ip
+title: test_tf_provider-ubuntu-all-ip
 userdefinedversion: "1.1"

v2/resources/testdata/application/create_from_file.tf

@@ -1,7 +1,7 @@
 resource "zedcloud_application" "test_tf_provider" {
-    name = "ubuntu-all-ip"
-    title = "ubuntu-all-ip"
-    description = "ubuntu-all-ip"
+    name = "test_tf_provider-ubuntu-all-ip"
+    title = "test_tf_provider-ubuntu-all-ip"
+    description = "test_tf_provider-ubuntu-all-ip"
     manifest_file = "./testdata/application/create_manifest.json"
     user_defined_version = "1.1"
     origin_type = "ORIGIN_LOCAL"

v2/resources/testdata/application/create_from_file.yaml

@@ -1,5 +1,5 @@
 cpus: 2
-description: ubuntu-all-ip
+description: test_tf_provider-ubuntu-all-ip
 drives: 1
 id: 179a7fda-eadd-4047-95a2-cd936fffa4e6
 isimported: false
@@ -83,7 +83,7 @@ manifest:
       value: "1024000"
   vmmode: ""
 memory: 1024000
-name: ubuntu-all-ip
+name: test_tf_provider-ubuntu-all-ip
 networks: 1
 origintype: ORIGIN_LOCAL
 parentdetail:
@@ -100,5 +100,5 @@ revision:
   updatedat: "2023-02-12T14:45:19.575Z"
   updatedby: us.root@zededa.com
 storage: 0
-title: ubuntu-all-ip
+title: test_tf_provider-ubuntu-all-ip
 userdefinedversion: "1.1"

v2/resources/testdata/application_instance/create.tf

@@ -25,8 +25,8 @@ resource "zedcloud_datastore"  "test_tf_provider" {
   ds_fqdn = "my-datastore.my-company.com"
   ds_path = "download/AMD64"
   ds_type = "DATASTORE_TYPE_AZUREBLOB"
-  name = "test"
-  title = "title"
+  name = "test_tf_provider-test-datastore"
+  title = "test_tf_provider-title"
   description = "description"
   region = "eu"
   project_access_list = [zedcloud_project.test_tf_provider.id]
@@ -145,8 +145,8 @@ data "zedcloud_edgenode" "test_tf_provider" {
 
 resource "zedcloud_application" "test_tf_provider" {
   name = "test_tf_provider"
-  title = "ubuntu-all-ip"
-  description = "ubuntu-all-ip"
+  title = "test_tf_provider-ubuntu-all-ip"
+  description = "test_tf_provider-ubuntu-all-ip"
   user_defined_version = "1.1"
   origin_type = "ORIGIN_LOCAL"
   manifest {

v2/resources/testdata/iam/user.create.tf

@@ -1,7 +1,7 @@
 resource "zedcloud_role" "test_tf_provider" {
-  name = "test-role"
-  title = "test-role"
-  type = "USER_ROLE_SYSTEM_DEFINED"
+  name = "test_tf_provider-test-role"
+  title = "test_tf_provider-test-role"
+  type = "USER_ROLE_USER_DEFINED"
   state = "ROLE_STATE_ACTIVE"
   scopes {
     enterprise_filter = []