Feat: Schema Validation Overhaul

client/account.go → codefresh/cfclient/account.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"errors"

client/api_key.go → codefresh/cfclient/api_key.go

@@ -1,10 +1,11 @@
-package client
+package cfclient
 
 import (
 	"errors"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 )
 
 type ApiKeySubject struct {

client/client.go → codefresh/cfclient/client.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"bytes"

client/context.go → codefresh/cfclient/context.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/current_account.go → codefresh/cfclient/current_account.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"encoding/json"

client/gitops_abac_rules.go → codefresh/cfclient/gitops_abac_rules.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/gql_client.go → codefresh/cfclient/gql_client.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"bytes"

client/hermes_trigger.go → codefresh/cfclient/hermes_trigger.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/hermes_trigger_event.go → codefresh/cfclient/hermes_trigger_event.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/idp.go → codefresh/cfclient/idp.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"errors"

client/permission.go → codefresh/cfclient/permission.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/pipeline.go → codefresh/cfclient/pipeline.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"errors"

client/project.go → codefresh/cfclient/project.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"errors"

client/registry.go → codefresh/cfclient/registry.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/step_types.go → codefresh/cfclient/step_types.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/team.go → codefresh/cfclient/team.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/user.go → codefresh/cfclient/user.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"fmt"

client/utils.go → codefresh/cfclient/utils.go

@@ -1,4 +1,4 @@
-package client
+package cfclient
 
 import (
 	"net/url"

codefresh/context/storage.go

@@ -1,7 +1,7 @@
 package context
 
 import (
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -30,7 +30,7 @@ func ConvertAzureStorageContext(context []interface{}) map[string]interface{} {
 	return convertStorageContext(context, auth)
 }
 
-func flattenStorageContextConfig(spec cfClient.ContextSpec, auth map[string]interface{}) []interface{} {
+func flattenStorageContextConfig(spec cfclient.ContextSpec, auth map[string]interface{}) []interface{} {
 
 	var res = make([]interface{}, 0)
 	m := make(map[string]interface{})
@@ -51,14 +51,14 @@ func flattenStorageContextConfig(spec cfClient.ContextSpec, auth map[string]inte
 
 }
 
-func FlattenJsonConfigStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
+func FlattenJsonConfigStorageContextConfig(spec cfclient.ContextSpec) []interface{} {
 	auth := make(map[string]interface{})
 	auth["json_config"] = spec.Data["auth"].(map[string]interface{})["jsonConfig"]
 	auth["type"] = spec.Data["type"]
 	return flattenStorageContextConfig(spec, auth)
 }
 
-func FlattenAzureStorageContextConfig(spec cfClient.ContextSpec) []interface{} {
+func FlattenAzureStorageContextConfig(spec cfclient.ContextSpec) []interface{} {
 	auth := make(map[string]interface{})
 	authParams := spec.Data["auth"].(map[string]interface{})
 	auth["account_name"] = authParams["accountName"]

codefresh/data_account.go

@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -33,8 +33,8 @@ func dataSourceAccount() *schema.Resource {
 
 func dataSourceAccountRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
-	var account *cfClient.Account
+	client := meta.(*cfclient.Client)
+	var account *cfclient.Account
 	var err error
 
 	if _id, _idOk := d.GetOk("_id"); _idOk {
@@ -55,7 +55,7 @@ func dataSourceAccountRead(d *schema.ResourceData, meta interface{}) error {
 	return mapDataAccountToResource(account, d)
 }
 
-func mapDataAccountToResource(account *cfClient.Account, d *schema.ResourceData) error {
+func mapDataAccountToResource(account *cfclient.Account, d *schema.ResourceData) error {
 
 	if account == nil || account.ID == "" {
 		return fmt.Errorf("data.codefresh_account - failed to mapDataAccountToResource")

codefresh/data_context.go

@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/ghodss/yaml"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -31,8 +31,8 @@ func dataSourceContext() *schema.Resource {
 
 func dataSourceContextRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
-	var context *cfClient.Context
+	client := meta.(*cfclient.Client)
+	var context *cfclient.Context
 	var err error
 
 	if name, nameOk := d.GetOk("name"); nameOk {
@@ -51,7 +51,7 @@ func dataSourceContextRead(d *schema.ResourceData, meta interface{}) error {
 	return mapDataContextToResource(context, d)
 }
 
-func mapDataContextToResource(context *cfClient.Context, d *schema.ResourceData) error {
+func mapDataContextToResource(context *cfclient.Context, d *schema.ResourceData) error {
 
 	if context == nil || context.Metadata.Name == "" {
 		return fmt.Errorf("data.codefresh_context - failed to mapDataContextToResource")

codefresh/data_current_account.go

@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -45,8 +45,8 @@ func dataSourceCurrentAccount() *schema.Resource {
 }
 
 func dataSourceCurrentAccountRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*cfClient.Client)
-	var currentAccount *cfClient.CurrentAccount
+	client := meta.(*cfclient.Client)
+	var currentAccount *cfclient.CurrentAccount
 	var err error
 
 	currentAccount, err = client.GetCurrentAccount()
@@ -62,7 +62,7 @@ func dataSourceCurrentAccountRead(d *schema.ResourceData, meta interface{}) erro
 
 }
 
-func mapDataCurrentAccountToResource(currentAccount *cfClient.CurrentAccount, d *schema.ResourceData) error {
+func mapDataCurrentAccountToResource(currentAccount *cfclient.CurrentAccount, d *schema.ResourceData) error {
 
 	if currentAccount == nil || currentAccount.ID == "" {
 		return fmt.Errorf("data.codefresh_current_account - failed to mapDataCurrentAccountToResource")

codefresh/data_idps.go

@@ -3,7 +3,8 @@ package codefresh
 import (
 	"fmt"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/internal/datautil"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -85,7 +86,7 @@ func IdpSchema() map[string]*schema.Schema {
 
 func dataSourceIdpRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
+	client := meta.(*cfclient.Client)
 
 	idps, err := client.GetIDPs()
 	if err != nil {
@@ -126,13 +127,13 @@ func dataSourceIdpRead(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func mapDataIdpToResource(idp cfClient.IDP, d *schema.ResourceData) error {
+func mapDataIdpToResource(idp cfclient.IDP, d *schema.ResourceData) error {
 
 	d.SetId(idp.ID)
 
 	d.Set("access_token", idp.Access_token) //    string   `json:"access_token,omitempty"`
 
-	d.Set("accounts", flattenStringArr(idp.Accounts)) //
+	d.Set("accounts", datautil.FlattenStringArr(idp.Accounts)) //
 	//d.Set("apiHost", idp.ApiHost) //         string   `json:"apiHost,omitempty"`
 	//d.Set("apiPathPrefix", idp.ApiPathPrefix) //   string   `json:"apiPathPrefix,omitempty"`
 	//d.Set("apiURL", idp.ApiURL) //          string   `json:"apiURL,omitempty"`
@@ -152,8 +153,8 @@ func mapDataIdpToResource(idp cfClient.IDP, d *schema.ResourceData) error {
 	//d.Set("redirectUiUrl", idp.RedirectUiUrl) //   string   `json:"redirectUiUrl,omitempty"`
 	//d.Set("redirectUrl", idp.RedirectUrl) //     string   `json:"redirectUrl,omitempty"`
 	//d.Set("refreshTokenURL", idp.RefreshTokenURL) // string   `json:"refreshTokenURL,omitempty"`
-	d.Set("scopes", flattenStringArr(idp.Scopes)) //          []string `json:"scopes,omitempty"`
-	d.Set("tenant", idp.Tenant)                   //          string   `json:"tenant,omitempty"`
+	d.Set("scopes", datautil.FlattenStringArr(idp.Scopes)) //          []string `json:"scopes,omitempty"`
+	d.Set("tenant", idp.Tenant)                            //          string   `json:"tenant,omitempty"`
 	//d.Set("tokenSecret", idp.TokenSecret) //     string   `json:"tokenSecret,omitempty"`
 	//d.Set("tokenURL", idp.TokenURL) //        string   `json:"tokenURL,omitempty"`
 	//d.Set("userProfileURL", idp.UserProfileURL) //  string   `json:"userProfileURL,omitempty"`

codefresh/data_pipelines.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"time"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -59,7 +59,7 @@ func dataSourcePipelines() *schema.Resource {
 
 func dataSourcePipelinesRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
+	client := meta.(*cfclient.Client)
 
 	pipelines, err := client.GetPipelines()
 	if err != nil {
@@ -76,7 +76,7 @@ func dataSourcePipelinesRead(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func mapDataPipelinesToResource(pipelines []cfClient.Pipeline, d *schema.ResourceData) error {
+func mapDataPipelinesToResource(pipelines []cfclient.Pipeline, d *schema.ResourceData) error {
 	var res = make([]map[string]interface{}, len(pipelines))
 	for i, p := range pipelines {
 		m := make(map[string]interface{})

codefresh/data_registry.go

@@ -3,7 +3,7 @@ package codefresh
 import (
 	"fmt"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -50,8 +50,8 @@ func dataSourceRegistry() *schema.Resource {
 
 func dataSourceRegistryRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
-	var registry *cfClient.Registry
+	client := meta.(*cfclient.Client)
+	var registry *cfclient.Registry
 	var err error
 
 	if name, nameOk := d.GetOk("name"); nameOk {
@@ -70,7 +70,7 @@ func dataSourceRegistryRead(d *schema.ResourceData, meta interface{}) error {
 	return mapDataRegistryToResource(registry, d)
 }
 
-func mapDataRegistryToResource(registry *cfClient.Registry, d *schema.ResourceData) error {
+func mapDataRegistryToResource(registry *cfclient.Registry, d *schema.ResourceData) error {
 
 	if registry == nil || registry.Name == "" {
 		return fmt.Errorf("data.codefresh_registry - failed to mapDataRegistryToResource")

codefresh/data_step_types.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
+	"github.com/codefresh-io/terraform-provider-codefresh/codefresh/cfclient"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -39,22 +39,22 @@ func dataSourceStepTypes() *schema.Resource {
 
 func dataSourceStepTypesRead(d *schema.ResourceData, meta interface{}) error {
 
-	client := meta.(*cfClient.Client)
+	client := meta.(*cfclient.Client)
 	var err error
 	var versions []string
 	stepTypesIdentifier := d.Get("name").(string)
 
 	d.SetId(stepTypesIdentifier)
 	if versions, err = client.GetStepTypesVersions(stepTypesIdentifier); err == nil {
-		var stepVersions cfClient.StepTypesVersions
+		var stepVersions cfclient.StepTypesVersions
 		stepVersions.Name = stepTypesIdentifier
 		d.Set("versions", versions)
 		for _, version := range versions {
 			stepTypes, err := client.GetStepTypes(stepTypesIdentifier + ":" + version)
 			if err != nil {
 				log.Printf("[DEBUG] Skipping version %v due to error %v", version, err)
 			} else {
-				stepVersion := cfClient.StepTypesVersion{
+				stepVersion := cfclient.StepTypesVersion{
 					VersionNumber: version,
 					StepTypes:     *stepTypes,
 				}
@@ -68,7 +68,7 @@ func dataSourceStepTypesRead(d *schema.ResourceData, meta interface{}) error {
 
 }
 
-func mapDataSetTypesToResource(stepTypesVersions cfClient.StepTypesVersions, d *schema.ResourceData) error {
+func mapDataSetTypesToResource(stepTypesVersions cfclient.StepTypesVersions, d *schema.ResourceData) error {
 	err := d.Set("name", stepTypesVersions.Name)
 	if err != nil {
 		return err