Fix examples.

.gitignore

@@ -9,4 +9,6 @@ tests/
 
 .idea
 **/*.lock.hcl
-**/*.backup
+**/*.backup
+
+.DS_Store

GNUmakefile

@@ -5,7 +5,7 @@ HOSTNAME=codefresh.io
 PKG_NAME=codefresh
 NAMESPACE=app
 BINARY=terraform-provider-${PKG_NAME}
-OS_ARCH=darwin_amd64
+OS_ARCH=$$(go env GOOS)_$$(go env GOARCH)
 TFPLUGINDOCS_VERSION=v0.14.1
 
 default: build
@@ -22,13 +22,36 @@ build: fmtcheck
 install: build
 	mv ${BINARY} $(HOME)/go/bin/
 
+equivalence: build
+	@echo "==> Preparing equivalence tests"
+	mkdir -p testing/equivalence/.plugins/registry.terraform.io/codefresh-io/codefresh/0.6.0/${OS_ARCH}/
+	cp terraform-provider-codefresh testing/equivalence/.plugins/registry.terraform.io/codefresh-io/codefresh/0.6.0/${OS_ARCH}/
+
+	cd testing/equivalence;\
+	./update-test-cases.sh;\
+
+	@echo "==> Running equivalence tests for terraform"
+	cd testing/equivalence;\
+	equivalence-testing update --binary=$$(which terraform) --goldens=results/terraform --tests=test_cases --rewrites=rewrites.jsonc
+
+	@echo "==> Running equivalence tests for opentofu"
+	cd testing/equivalence;\
+	equivalence-testing update --binary=$$(which tofu) --goldens=results/opentofu --tests=test_cases --rewrites=rewrites.jsonc
 fmt:
 	@echo "==> Fixing source code with gofmt..."
 	gofmt -s -w $(GOFMT_FILES)
 
+fmtcheck: SHELL:=/bin/bash
 fmtcheck:
-	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
+	@echo "==> Checking that code complies with gofmt requirements..."
 
+	@gofmt_files=$$(find . -name '*.go' | grep -v vendor | xargs gofmt -l -s); \
+	if [[ -n $${gofmt_files} ]]; then\
+	    echo 'gofmt needs running on the following files:';\
+	    echo "$${gofmt_files}";\
+	    echo "You can use the command: \`make fmt\` to reformat code.";\
+	    exit 1;\
+	fi;
 lint:
 	@echo "==> Checking source code against linters..."
 	golangci-lint run ./...

codefresh/internal/schemautil/validation.go

@@ -89,4 +89,4 @@ func (o *ValidationOptions) setSummary(summary string) *ValidationOptions {
 func (o *ValidationOptions) setDetailFormat(detailFormat string) *ValidationOptions {
 	o.detailFormat = detailFormat
 	return o
-}
+}

codefresh/resource_pipeline_test.go

@@ -532,8 +532,8 @@ func TestAccCodefreshPipeline_CronTriggersInvalid(t *testing.T) {
 	var pipeline cfclient.Pipeline
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCodefreshPipelineBasicConfigCronTriggers(

codefresh/resource_step_types_test.go

@@ -2,7 +2,6 @@ package codefresh
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -48,8 +47,8 @@ func TestCleanUpStepFromTransientValues(t *testing.T) {
 }
 
 func TestNormalizeYamlStringStepTypes(t *testing.T) {
-	testFile := "../test_data/step_types/testStepWithRuntimeData.yaml"
-	yamlString, err := ioutil.ReadFile(testFile)
+	testFile := "../testing/fixtures/testStepWithRuntimeData.yaml"
+	yamlString, err := os.ReadFile(testFile)
 	if err != nil {
 		t.Errorf("Unable to open test file  %s. Err: #%v ", testFile, err)
 	}
@@ -84,8 +83,8 @@ func TestSortVersions(t *testing.T) {
 }
 
 func TestExtractSteps(t *testing.T) {
-	testFile := "../test_data/step_types/testStepTypesOrder.yaml"
-	yamlString, err := ioutil.ReadFile(testFile)
+	testFile := "../testing/fixtures/testStepTypesOrder.yaml"
+	yamlString, err := os.ReadFile(testFile)
 	if err != nil {
 		t.Errorf("Unable to read file %s", testFile)
 	}
@@ -112,11 +111,11 @@ func TestAccCodefreshStepTypes(t *testing.T) {
 		}
 		name := accountName + "/" + stepTypesNamePrefix + acctest.RandString(10)
 		resourceName := "codefresh_step_types.test"
-		contentStepsV1, err := ioutil.ReadFile("../test_data/step_types/testSteps.yaml")
+		contentStepsV1, err := os.ReadFile("../testing/fixtures/testSteps.yaml")
 		if err != nil {
 			log.Fatal(err)
 		}
-		contentStepsV2, err := ioutil.ReadFile("../test_data/step_types/testStepsTemplate.yaml")
+		contentStepsV2, err := os.ReadFile("../testing/fixtures/testStepsTemplate.yaml")
 		if err != nil {
 			log.Fatal(err)
 		}

examples/abac_rules/main.tf

@@ -1,7 +1,3 @@
-data "codefresh_team" "admins" {
-  name = "admins"
-}
-
 data "codefresh_team" "users" {
   name = "users"
 }

examples/accounts_users/terraform.tfvars

@@ -1,6 +1,3 @@
-api_url = "https://my-codefresh.example.com/api"
-token   = "cfAdmin-token"
-
 default_idps = {
   local = {
     display_name = "local"

examples/accounts_users/vars.tf

@@ -1,5 +1,3 @@
-variable "api_url" {}
-
 variable "default_acccount_limits" {
   type = map(any)
   default = {

examples/pipelines/main.tf

@@ -1,8 +1,3 @@
-provider "codefresh" {
-  api_url = var.api_url
-  token   = var.token
-}
-
 resource "codefresh_project" "test" {
   name = "myproject"
 

examples/registries/main.tf

@@ -1,23 +1,8 @@
-
-variable "api_url" {
-  type = string
-}
-
-variable "token" {
-  type    = string
-  default = ""
-}
-
 variable "test_password" {
   type    = string
   default = ""
 }
 
-provider "codefresh" {
-  api_url = var.api_url
-  token   = var.token
-}
-
 resource "codefresh_registry" "acr" {
   name    = "acr"
   default = true

examples/teams/main.tf

@@ -1,16 +1,3 @@
-variable "api_url" {
-  type = string
-}
-
-variable "token" {
-  type    = string
-  default = ""
-}
-provider "codefresh" {
-  api_url = var.api_url
-  token   = var.token
-}
-
 variable "teams" {
   type = map(any)
 }

examples/teams/terraform.tfvars

@@ -1,6 +1,3 @@
-api_url = "https://my-codefresh.example.com/api"
-token   = ""
-
 teams = {
   developers = ["user1", "user3"]
   managers   = ["user3", "user2"]

examples/triggers/main.tf

@@ -1,12 +1,5 @@
-provider "codefresh" {
-  api_url = var.api_url
-  token   = var.token
-}
-
 module "pipeline" {
   source  = "../pipelines"
-  api_url = var.api_url
-  token   = var.token
 }
 
 resource "codefresh_pipeline_cron_trigger" "default" {

testing/equivalence/README.md

@@ -0,0 +1,15 @@
+# Equivalence Tests
+
+This directory contains equivalence tests for the provider.
+
+See: https://github.com/opentofu/equivalence-testing
+
+## Updating Equivalence Test Cases
+
+When additional examples are added to [examples/](../../../examples), the equivalence test cases should be updated as well.
+
+```bash
+$ ./update-test-cases.sh
+```
+
+Then, 

testing/equivalence/compare-results.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+source $(realpath $(dirname $0))/lib.sh
+
+for i in $(find $(realpath $(dirname $0))/results/terraform -mindepth 1 -not -path '**/*/.*' -type d); do
+    test_case_name=$(basename ${i})
+    print_style "Test case "
+    print_style "${test_case_name}" "info"
+    print_style ":\n"
+    for f in $(find ${i} -type f); do
+        print_style "  * comparing "
+        print_style "results/terraform/$(basename ${f})" "info"
+        print_style " and "
+        print_style "results/opentofu/$(basename ${f})" "info"
+        print_style ": "
+        diff \
+            $(realpath $(dirname $0))/results/terraform/$(basename ${i})/$(basename ${f}) \
+            $(realpath $(dirname $0))/results/opentofu/$(basename ${i})/$(basename ${f}) \
+            || print_style "FAILED\n" "danger" \
+            && print_style "PASS\n" "success"
+    done
+done

testing/equivalence/lib.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# prints colored text
+print_style () {
+
+    if [ "$2" == "info" ] ; then
+        COLOR="96m";
+    elif [ "$2" == "success" ] ; then
+        COLOR="92m";
+    elif [ "$2" == "warning" ] ; then
+        COLOR="93m";
+    elif [ "$2" == "danger" ] ; then
+        COLOR="91m";
+    else #default color
+        COLOR="0m";
+    fi
+
+    STARTCOLOR="\e[$COLOR";
+    ENDCOLOR="\e[0m";
+
+    printf "$STARTCOLOR%b$ENDCOLOR" "$1";
+}