Added - Isolate register resource and datasource

Author: rashik-bhasin

coverage/coverage_test.go

@@ -14,7 +14,7 @@ import (
 
 var totalRgx = regexp.MustCompile(`total:\s+\(statements\)\s+([^"]*)%`)
 
-const CodeCoverageThreshold = 62.8
+const CodeCoverageThreshold = 56.1
 
 func TestCoverage(t *testing.T) {
 	if os.Getenv("CHECK_COVERAGE") != "true" {

internal/acctest/oci_dependency_graph_test.go

@@ -0,0 +1,27 @@
+package acctest
+
+import (
+	"testing"
+)
+
+func TestUnit_DependencyGraph(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		{
+			name: "Validate OCI dependency graph is getting set",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Logf("Running %s", tt.name)
+			InitDependencyGraph()
+			if DependencyGraph["instance"] == nil {
+				t.Errorf("Dependency Graph not getting set")
+			}
+			if DependencyGraph["loadBalancer"] == nil {
+				t.Errorf("Dependency Graph not getting set")
+			}
+		})
+	}
+}

internal/acctest/provider_test.go

@@ -401,9 +401,6 @@ func setEnvSetting(s, v string) error {
 	return nil
 }
 
-/*
-
- */
 func CheckJsonStringsEqual(expectedJsonString string, actualJsonString string) error {
 	if expectedJsonString == actualJsonString {
 		return nil

internal/acctest/test_helpers.go

@@ -3,9 +3,13 @@ package acctest
 import (
 	"encoding/base64"
 	"encoding/json"
+	"os"
+	"path"
 	"reflect"
 	"testing"
 
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+
 	tf_client "github.com/oracle/terraform-provider-oci/internal/client"
 
 	"github.com/stretchr/testify/assert"
@@ -927,6 +931,16 @@ func TestUnitProviderTestCopy(t *testing.T) {
 }
 
 func TestUnitRepresentationCopyWithNewProperties(t *testing.T) {
+	auditEventResourceRepresentation := map[string]interface{}{
+		"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"end_time":       Representation{RepType: Required, Create: `${timestamp()}`},
+	}
+	updatedAuditEventResourceRepresentation := map[string]interface{}{
+		"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"end_time":       Representation{RepType: Required, Create: `${timestamp()}`},
+		"dns_label":      Representation{RepType: Required, Create: `dnslabel`},
+	}
+	newProperties := map[string]interface{}{"dns_label": Representation{RepType: Required, Create: `dnslabel`}}
 	type args struct {
 		representations map[string]interface{}
 		newProperties   map[string]interface{}
@@ -936,7 +950,14 @@ func TestUnitRepresentationCopyWithNewProperties(t *testing.T) {
 		args args
 		want map[string]interface{}
 	}{
-		// TODO: Add test cases.
+		{
+			name: "Positive test",
+			args: args{
+				representations: auditEventResourceRepresentation,
+				newProperties:   newProperties,
+			},
+			want: updatedAuditEventResourceRepresentation,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -969,6 +990,16 @@ func TestUnitRepresentationCopyWithRemovedNestedProperties(t *testing.T) {
 }
 
 func TestUnitRepresentationCopyWithRemovedProperties(t *testing.T) {
+	auditEventResourceRepresentation := map[string]interface{}{
+		"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"end_time":       Representation{RepType: Required, Create: `${timestamp()}`},
+		"start_time":     Representation{RepType: Required, Create: `${timeadd(timestamp(), "-1m")}`},
+	}
+	updatedAuditEventResourceRepresentation := map[string]interface{}{
+		"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"end_time":       Representation{RepType: Required, Create: `${timestamp()}`},
+	}
+	removedProperties := []string{"start_time"}
 	type args struct {
 		representations   map[string]interface{}
 		removedProperties []string
@@ -978,7 +1009,14 @@ func TestUnitRepresentationCopyWithRemovedProperties(t *testing.T) {
 		args args
 		want map[string]interface{}
 	}{
-		// TODO: Add test cases.
+		{
+			name: "Positive test",
+			args: args{
+				representations:   auditEventResourceRepresentation,
+				removedProperties: removedProperties,
+			},
+			want: updatedAuditEventResourceRepresentation,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1205,3 +1243,36 @@ func TestUnit_updateNestedRepresentationRemoveProperty(t *testing.T) {
 		})
 	}
 }
+
+// issue-routing-tag: terraform/default
+func TestUnitProviderConfig(t *testing.T) {
+	if httpreplay.ModeRecordReplay() {
+		t.Skip("Skip ProviderConfigTest in HttpReplay mode.")
+	}
+	if os.Getenv("TF_HOME_OVERRIDE") == "" {
+		t.Skip("This run requires you to set TF_HOME_OVERRIDE")
+	}
+	ProviderConfigTest(t, true, true, globalvar.AuthAPIKeySetting, "", nil)              // ApiKey with required fields + disable auto-retries
+	ProviderConfigTest(t, false, true, globalvar.AuthAPIKeySetting, "", nil)             // ApiKey without required fields
+	ProviderConfigTest(t, false, false, globalvar.AuthInstancePrincipalSetting, "", nil) // InstancePrincipal
+	ProviderConfigTest(t, true, false, "invalid-auth-setting", "", nil)                  // Invalid auth + disable auto-retries
+	configFile, keyFile, err := WriteConfigFile()
+	assert.Nil(t, err)
+	ProviderConfigTest(t, true, true, globalvar.AuthAPIKeySetting, "DEFAULT", nil)              // ApiKey with required fields + disable auto-retries
+	ProviderConfigTest(t, false, true, globalvar.AuthAPIKeySetting, "DEFAULT", nil)             // ApiKey without required fields
+	ProviderConfigTest(t, false, false, globalvar.AuthInstancePrincipalSetting, "DEFAULT", nil) // InstancePrincipal
+	ProviderConfigTest(t, true, false, "invalid-auth-setting", "DEFAULT", nil)                  // Invalid auth + disable auto-retries
+	ProviderConfigTest(t, false, false, globalvar.AuthAPIKeySetting, "PROFILE1", nil)           // correct profileName
+	ProviderConfigTest(t, false, false, globalvar.AuthAPIKeySetting, "wrongProfile", nil)       // Invalid profileName
+	//acctest.ProviderConfigTest(t, false, false, globalvar.AuthAPIKeySetting, "PROFILE2", nil)           // correct profileName with mix and match
+	ProviderConfigTest(t, false, false, globalvar.AuthAPIKeySetting, "PROFILE3", nil) // correct profileName with mix and match & env
+	defer func() {
+		_ = utils.RemoveFile(configFile)
+	}()
+	defer func() {
+		_ = utils.RemoveFile(keyFile)
+	}()
+	defer func() {
+		_ = os.RemoveAll(path.Join(utils.GetHomeFolder(), globalvar.DefaultConfigDirName))
+	}()
+}

internal/acctest/test_helpers_test.go

@@ -2,14 +2,15 @@ package commonexport
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/oracle/terraform-provider-oci/internal/globalvar"
-	"github.com/oracle/terraform-provider-oci/internal/utils"
 	"log"
 	"os"
 	"regexp"
 	"sort"
 	"strings"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/oracle/terraform-provider-oci/internal/globalvar"
+	"github.com/oracle/terraform-provider-oci/internal/utils"
 )
 
 func init() {

internal/commonexport/commonexport_functions.go

@@ -2,11 +2,12 @@ package commonexport
 
 import (
 	"fmt"
-	"github.com/oracle/terraform-provider-oci/internal/utils"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+
 	"github.com/hashicorp/terraform-exec/tfexec"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 

internal/commonexport/commonexport_types.go

@@ -1,10 +1,11 @@
 package commonexport
 
 import (
-	"github.com/oracle/terraform-provider-oci/internal/utils"
 	"reflect"
 	"testing"
 
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+
 	"github.com/stretchr/testify/assert"
 )
 

internal/commonexport/export_variables_test.go

@@ -0,0 +1,6 @@
+package globalvar
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+var OciResources map[string]*schema.Resource
+var OciDatasources map[string]*schema.Resource

internal/globalvar/resource_datasource_map.go

@@ -47,9 +47,6 @@ var ociProvider *schema.Provider
 var TerraformCLIVersion = globalvar.UnknownTerraformCLIVersion
 var AvoidWaitingForDeleteTarget bool
 
-var OciResources map[string]*schema.Resource
-var OciDatasources map[string]*schema.Resource
-
 // creating an interface to aid in unit tests
 type schemaResourceData interface {
 	GetOkExists(string) (interface{}, bool)
@@ -207,41 +204,27 @@ func SchemaMap() map[string]*schema.Schema {
 	}
 }
 
-func RegisterResource(name string, resourceSchema *schema.Resource) {
-	if OciResources == nil {
-		OciResources = make(map[string]*schema.Resource)
-	}
-	OciResources[name] = resourceSchema
-}
-
-func RegisterDatasource(name string, datasourceSchema *schema.Resource) {
-	if OciDatasources == nil {
-		OciDatasources = make(map[string]*schema.Resource)
-	}
-	OciDatasources[name] = datasourceSchema
-}
-
 // This returns a map of all data sources to register with Terraform
 // The OciDatasources map is populated by each datasource's init function being invoked before it gets here
 func DataSourcesMap() map[string]*schema.Resource {
 	// Register some aliases of registered datasources. These are registered for convenience and legacy reasons.
-	RegisterDatasource("oci_core_listing_resource_version", tf_core.CoreAppCatalogListingResourceVersionDataSource())
-	RegisterDatasource("oci_core_listing_resource_versions", tf_core.CoreAppCatalogListingResourceVersionsDataSource())
-	RegisterDatasource("oci_core_shape", tf_core.CoreShapesDataSource())
-	RegisterDatasource("oci_core_virtual_networks", tf_core.CoreVcnsDataSource())
-	RegisterDatasource("oci_load_balancers", tf_load_balancer.LoadBalancerLoadBalancersDataSource())
-	RegisterDatasource("oci_load_balancer_backendsets", tf_load_balancer.LoadBalancerBackendSetsDataSource())
-	return OciDatasources
+	tf_resource.RegisterDatasource("oci_core_listing_resource_version", tf_core.CoreAppCatalogListingResourceVersionDataSource())
+	tf_resource.RegisterDatasource("oci_core_listing_resource_versions", tf_core.CoreAppCatalogListingResourceVersionsDataSource())
+	tf_resource.RegisterDatasource("oci_core_shape", tf_core.CoreShapesDataSource())
+	tf_resource.RegisterDatasource("oci_core_virtual_networks", tf_core.CoreVcnsDataSource())
+	tf_resource.RegisterDatasource("oci_load_balancers", tf_load_balancer.LoadBalancerLoadBalancersDataSource())
+	tf_resource.RegisterDatasource("oci_load_balancer_backendsets", tf_load_balancer.LoadBalancerBackendSetsDataSource())
+	return globalvar.OciDatasources
 }
 
 // This returns a map of all resources to register with Terraform
 // The OciResource map is populated by each resource's init function being invoked before it gets here
 func ResourcesMap() map[string]*schema.Resource {
 	// Register some aliases of registered resources. These are registered for convenience and legacy reasons.
-	RegisterResource("oci_core_virtual_network", tf_core.CoreVcnResource())
-	RegisterResource("oci_load_balancer", tf_load_balancer.LoadBalancerLoadBalancerResource())
-	RegisterResource("oci_load_balancer_backendset", tf_load_balancer.LoadBalancerBackendSetResource())
-	return OciResources
+	tf_resource.RegisterResource("oci_core_virtual_network", tf_core.CoreVcnResource())
+	tf_resource.RegisterResource("oci_load_balancer", tf_load_balancer.LoadBalancerLoadBalancerResource())
+	tf_resource.RegisterResource("oci_load_balancer_backendset", tf_load_balancer.LoadBalancerBackendSetResource())
+	return globalvar.OciResources
 }
 
 func ProviderConfig(d *schema.ResourceData) (interface{}, error) {