Added Support for alloy support (PLC)

Author: ravinitp

coverage/coverage_test.go

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

examples/object_storage/alloy/main.tf

@@ -0,0 +1,42 @@
+#variable "compartment_ocid" {
+#  default = "ocid1.tenancy.oc17..aaaaaaaa5u4pwayzuvledyxkajssb77kpotf3jyew6tuolmhgss4abwpo4ea"
+#}
+
+provider "oci" {
+
+}
+
+#data "oci_identity_compartments" "test_compartments" {
+#  #Required
+#  compartment_id = "ocid1.tenancy.oc17..aaaaaaaa5u4pwayzuvledyxkajssb77kpotf3jyew6tuolmhgss4abwpo4ea"
+#}
+#data "oci_objectstorage_namespace" "ns" {
+#  #Optional
+#  compartment_id = "ocid1.tenancy.oc17..aaaaaaaa5u4pwayzuvledyxkajssb77kpotf3jyew6tuolmhgss4abwpo4ea" #data.oci_identity_compartments.test_compartments.compartments.0.compartment_id
+#}
+resource "oci_objectstorage_bucket" "bucket1" {
+  compartment_id = "ocid1.tenancy.oc17..aaaaaaaa5u4pwayzuvledyxkajssb77kpotf3jyew6tuolmhgss4abwpo4ea"# data.oci_identity_compartments.test_compartments.compartments.0.compartment_id
+  namespace      = "axefgkprufno"
+  name           = "tf-example-alloy"
+  access_type    = "NoPublicAccess"
+  auto_tiering = "Disabled"
+}
+
+resource "oci_objectstorage_preauthrequest" "bucket_par" {
+  namespace    =  "axefgkprufno"
+  bucket       = oci_objectstorage_bucket.bucket1.name
+  name         = "parOnBucket"
+  access_type  = "AnyObjectWrite" //Other configurations accepted are ObjectWrite, ObjectRead, ObjectReadWrite, AnyObjectRead, AnyObjectReadWrite,
+  time_expires = "2025-12-10T23:00:00Z"
+}
+/*
+resource "oci_apm_apm_domain" "test_apm_domain" {
+  #Required
+  compartment_id = "ocid1.tenancy.oc17..aaaaaaaa5u4pwayzuvledyxkajssb77kpotf3jyew6tuolmhgss4abwpo4ea"
+  display_name   = "var.apm_domain_display_name"
+
+}
+*/
+output "par_request_url" {
+  value = "https://objectstorage.us-dcc-phoenix-1.oraclecloud17.com${oci_objectstorage_preauthrequest.bucket_par.access_uri}"
+}

internal/client/provider_clients.go

@@ -142,7 +142,9 @@ func CreateSDKClients(clients *OracleClients, configProvider oci_common.Configur
 			if host, ok := clientHostOverrides[serviceName]; ok {
 				serviceClientOverrides.HostUrlOverride = host
 			}
-
+			if !common.CheckForEnabledServices(utils.GetSDKServiceName(serviceName)) {
+				continue
+			}
 			clients.SdkClientMap[serviceName], err = clientRegistration.InitClientFn(configProvider, configureClient, serviceClientOverrides)
 			if err != nil {
 				return err
@@ -151,18 +153,18 @@ func CreateSDKClients(clients *OracleClients, configProvider oci_common.Configur
 			return fmt.Errorf("unable to initialize '%s' client", serviceName)
 		}
 	}
-
-	workRequestClient, err := oci_work_requests.NewWorkRequestClientWithConfigurationProvider(configProvider)
-	if err != nil {
-		return
-	}
-	err = configureClient(&workRequestClient.BaseClient)
-	if err != nil {
-		return
+	if common.CheckForEnabledServices(globalvar.WorkRequest) {
+		workRequestClient, err := oci_work_requests.NewWorkRequestClientWithConfigurationProvider(configProvider)
+		if err != nil {
+			return err
+		}
+		err = configureClient(&workRequestClient.BaseClient)
+		if err != nil {
+			return err
+		}
+		clients.WorkRequestClient = &workRequestClient
 	}
-	clients.WorkRequestClient = &workRequestClient
-
-	return
+	return nil
 }
 func setCustomConfiguration(oClient interface {
 	SetCustomClientConfiguration(config common.CustomClientConfiguration)

internal/commonexport/commonexport_functions.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_common "github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/terraform-provider-oci/internal/globalvar"
 	"github.com/oracle/terraform-provider-oci/internal/utils"
 )
@@ -780,11 +781,15 @@ func getNotFoundChildren(parent string, resourceGraph *TerraformResourceGraph, c
 }
 
 func RegisterCompartmentGraphs(servicename string, graph TerraformResourceGraph) {
-	CompartmentResourceGraphs[servicename] = graph
+	if oci_common.CheckForEnabledServices(utils.GetSDKServiceName(servicename)) {
+		CompartmentResourceGraphs[servicename] = graph
+	}
 }
 
 func RegisterTenancyGraphs(servicename string, graph TerraformResourceGraph) {
-	TenancyResourceGraphs[servicename] = graph
+	if oci_common.CheckForEnabledServices(utils.GetSDKServiceName(servicename)) {
+		TenancyResourceGraphs[servicename] = graph
+	}
 }
 
 func RegisterRelatedResourcesGraph(resourceName string, association []TerraformResourceAssociation) {

internal/globalvar/constants.go

@@ -72,11 +72,13 @@ These missing attributes are also added to the lifecycle ignore_changes.
 )
 
 const (
-	SubnetService  = "subnet"
-	CoreService    = "core"
-	DeleteResource = "delete"
-	TfEnvPrefix    = "TF_VAR_"
-	OciEnvPrefix   = "OCI_"
+	SubnetService       = "subnet"
+	CoreService         = "core"
+	LoadBalancerService = "loadbalancer"
+	WorkRequest         = "workrequests"
+	DeleteResource      = "delete"
+	TfEnvPrefix         = "TF_VAR_"
+	OciEnvPrefix        = "OCI_"
 )
 const (
 	DebugTestSteps               = "DEBUG_TEST_STEPS"

internal/provider/provider.go

@@ -212,22 +212,30 @@ func SchemaMap() map[string]*schema.Schema {
 // 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.
-	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())
+	if oci_common.CheckForEnabledServices(globalvar.CoreService) {
+		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())
+	}
+	if oci_common.CheckForEnabledServices(globalvar.LoadBalancerService) {
+		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.
-	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())
+	if oci_common.CheckForEnabledServices(globalvar.CoreService) {
+		tf_resource.RegisterResource("oci_core_virtual_network", tf_core.CoreVcnResource())
+	}
+	if oci_common.CheckForEnabledServices(globalvar.LoadBalancerService) {
+		tf_resource.RegisterResource("oci_load_balancer", tf_load_balancer.LoadBalancerLoadBalancerResource())
+		tf_resource.RegisterResource("oci_load_balancer_backendset", tf_load_balancer.LoadBalancerBackendSetResource())
+	}
 	return globalvar.OciResources
 }