Exempted - LA feature Private Access support for RMS

Author: vsin12

internal/globalvar/constants.go

@@ -23,6 +23,7 @@ const (
 	ClientHostOverridesEnv                = "CLIENT_HOST_OVERRIDES"
 	CustomCertLocationEnv                 = "custom_cert_location"
 	AcceptLocalCerts                      = "accept_local_certs"
+	JobOCID                               = "job-ocid"
 
 	AuthAttrName                 = "auth"
 	TenancyOcidAttrName          = "tenancy_ocid"

internal/integrationtest/resourcemanager_private_endpoint_reachable_ip_test.go

@@ -0,0 +1,57 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+	"github.com/terraform-providers/terraform-provider-oci/internal/acctest"
+
+	"github.com/terraform-providers/terraform-provider-oci/internal/utils"
+)
+
+var (
+	privateEndpointReachableIpSingularDataSourceRepresentation = map[string]interface{}{
+		"private_endpoint_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_resourcemanager_private_endpoint.test_private_endpoint.id}`},
+		"private_ip":          acctest.Representation{RepType: acctest.Required, Create: `privateIp`},
+	}
+
+	PrivateEndpointReachableIpResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, subnetRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, vcnRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_resourcemanager_private_endpoint", "test_private_endpoint", acctest.Required, acctest.Create, resourceManagerprivateEndpointRepresentation)
+)
+
+// issue-routing-tag: resourcemanager/default
+func TestResourcemanagerPrivateEndpointReachableIpResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestResourcemanagerPrivateEndpointReachableIpResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	singularDatasourceName := "data.oci_resourcemanager_private_endpoint_reachable_ip.test_private_endpoint_reachable_ip"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify singular datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_resourcemanager_private_endpoint_reachable_ip", "test_private_endpoint_reachable_ip", acctest.Required, acctest.Create, privateEndpointReachableIpSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + PrivateEndpointReachableIpResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint_id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "private_ip", "privateIp"),
+
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "reachable_ip"),
+			),
+		},
+	})
+}

internal/integrationtest/resourcemanager_private_endpoint_test.go

@@ -624,6 +624,11 @@ func BuildConfigureClientFn(configProvider oci_common.ConfigurationProvider, htt
 				}
 			}
 
+			if strings.Contains(r.URL.Path, "/reachableIp") {
+				log.Printf("[DEBUG] Setting JOB_ID for Terraformer: %v ", os.Getenv("JOB_ID"))
+				r.Header.Set(globalvar.JobOCID, os.Getenv("JOB_ID"))
+			}
+
 			if simulateDbForDbSystemUpgrade {
 				if r.Method == http.MethodPost && (strings.Contains(r.URL.Path, "/dbSystems")) {
 					r.Header.Set(globalvar.RequestHeaderOpcHostSerial, "FAKEHOSTSERIALFAKEOL6")

internal/provider/provider.go

@@ -1082,6 +1082,8 @@ func init() {
 	RegisterDatasource("oci_osub_usage_computed_usage_aggregateds", tf_osub_usage.OsubUsageComputedUsageAggregatedsDataSource())
 	RegisterDatasource("oci_osub_usage_computed_usages", tf_osub_usage.OsubUsageComputedUsagesDataSource())
 	// resourcemanager service
+	RegisterDatasource("oci_resourcemanager_private_endpoint", tf_resourcemanager.ResourcemanagerPrivateEndpointDataSource())
+	RegisterDatasource("oci_resourcemanager_private_endpoint_reachable_ip", tf_resourcemanager.ResourcemanagerPrivateEndpointReachableIpDataSource())
 	RegisterDatasource("oci_resourcemanager_stack", tf_resourcemanager.ResourcemanagerStackDataSource())
 	RegisterDatasource("oci_resourcemanager_stack_tf_state", tf_resourcemanager.ResourcemanagerStackTfStateDataSource())
 	RegisterDatasource("oci_resourcemanager_stacks", tf_resourcemanager.ResourcemanagerStacksDataSource())

internal/provider/register_datasource.go

@@ -70,6 +70,7 @@ import (
 	tf_optimizer "github.com/terraform-providers/terraform-provider-oci/internal/service/optimizer"
 	tf_osmanagement "github.com/terraform-providers/terraform-provider-oci/internal/service/osmanagement"
 	tf_osp_gateway "github.com/terraform-providers/terraform-provider-oci/internal/service/osp_gateway"
+	tf_resourcemanager "github.com/terraform-providers/terraform-provider-oci/internal/service/resourcemanager"
 	tf_sch "github.com/terraform-providers/terraform-provider-oci/internal/service/sch"
 	tf_service_catalog "github.com/terraform-providers/terraform-provider-oci/internal/service/service_catalog"
 	tf_stack_monitoring "github.com/terraform-providers/terraform-provider-oci/internal/service/stack_monitoring"
@@ -543,6 +544,7 @@ func init() {
 	// osub_organization_subscription service
 	// osub_billing_schedule service
 	// resourcemanager service
+	RegisterResource("oci_resourcemanager_private_endpoint", tf_resourcemanager.ResourcemanagerPrivateEndpointResource())
 	// sch service
 	RegisterResource("oci_sch_service_connector", tf_sch.SchServiceConnectorResource())
 	// secrets service

internal/provider/register_resource.go

@@ -37,6 +37,7 @@ import (
 	oci_oce "github.com/oracle/oci-go-sdk/v65/oce"
 	oci_ons "github.com/oracle/oci-go-sdk/v65/ons"
 	oci_opsi "github.com/oracle/oci-go-sdk/v65/opsi"
+	oci_resourcemanager "github.com/oracle/oci-go-sdk/v65/resourcemanager"
 	oci_sch "github.com/oracle/oci-go-sdk/v65/sch"
 	oci_stack_monitoring "github.com/oracle/oci-go-sdk/v65/stackmonitoring"
 	oci_streaming "github.com/oracle/oci-go-sdk/v65/streaming"
@@ -3081,6 +3082,18 @@ var exportOspGatewaySubscriptionHints = &TerraformResourceHints{
 	resourceAbbreviation:   "subscription",
 }
 
+var exportResourcemanagerPrivateEndpointHints = &TerraformResourceHints{
+	resourceClass:          "oci_resourcemanager_private_endpoint",
+	datasourceClass:        "oci_resourcemanager_private_endpoints",
+	datasourceItemsAttr:    "private_endpoint_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "private_endpoint",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_resourcemanager.PrivateEndpointLifecycleStateActive),
+	},
+}
+
 var exportSchServiceConnectorHints = &TerraformResourceHints{
 	resourceClass:          "oci_sch_service_connector",
 	datasourceClass:        "oci_sch_service_connectors",

internal/resourcediscovery/export_definitions.go

@@ -69,6 +69,7 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
 	"opsi":                    opsiResourceGraph,
 	"osmanagement":            osmanagementResourceGraph,
 	"osp_gateway":             ospGatewayResourceGraph,
+	"resourcemanager":         resourcemanagerResourceGraph,
 	"sch":                     schResourceGraph,
 	"stack_monitoring":        stackMonitoringResourceGraph,
 	"vault":                   vaultResourceGraph,
@@ -1198,6 +1199,12 @@ var ospGatewayResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {},
 }
 
+var resourcemanagerResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportResourcemanagerPrivateEndpointHints},
+	},
+}
+
 var schResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportSchServiceConnectorHints},

internal/resourcediscovery/export_graphs.go

@@ -0,0 +1,108 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package resourcemanager
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_resourcemanager "github.com/oracle/oci-go-sdk/v65/resourcemanager"
+
+	"github.com/terraform-providers/terraform-provider-oci/internal/client"
+	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
+)
+
+func ResourcemanagerPrivateEndpointDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["private_endpoint_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return tfresource.GetSingularDataSourceItemSchema(ResourcemanagerPrivateEndpointResource(), fieldMap, readSingularResourcemanagerPrivateEndpoint)
+}
+
+func readSingularResourcemanagerPrivateEndpoint(d *schema.ResourceData, m interface{}) error {
+	sync := &ResourcemanagerPrivateEndpointDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).ResourceManagerClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type ResourcemanagerPrivateEndpointDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_resourcemanager.ResourceManagerClient
+	Res    *oci_resourcemanager.GetPrivateEndpointResponse
+}
+
+func (s *ResourcemanagerPrivateEndpointDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *ResourcemanagerPrivateEndpointDataSourceCrud) Get() error {
+	request := oci_resourcemanager.GetPrivateEndpointRequest{}
+
+	if privateEndpointId, ok := s.D.GetOkExists("private_endpoint_id"); ok {
+		tmp := privateEndpointId.(string)
+		request.PrivateEndpointId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "resourcemanager")
+
+	response, err := s.Client.GetPrivateEndpoint(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *ResourcemanagerPrivateEndpointDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.Description != nil {
+		s.D.Set("description", *s.Res.Description)
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("dns_zones", s.Res.DnsZones)
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	s.D.Set("nsg_id_list", s.Res.NsgIdList)
+
+	s.D.Set("source_ips", s.Res.SourceIps)
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.SubnetId != nil {
+		s.D.Set("subnet_id", *s.Res.SubnetId)
+	}
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	if s.Res.VcnId != nil {
+		s.D.Set("vcn_id", *s.Res.VcnId)
+	}
+
+	return nil
+}

internal/service/resourcemanager/resourcemanager_private_endpoint_data_source.go

@@ -0,0 +1,92 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package resourcemanager
+
+import (
+	"context"
+
+	"github.com/terraform-providers/terraform-provider-oci/internal/client"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_resourcemanager "github.com/oracle/oci-go-sdk/v65/resourcemanager"
+
+	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
+)
+
+func ResourcemanagerPrivateEndpointReachableIpDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularResourcemanagerPrivateEndpointReachableIp,
+		Schema: map[string]*schema.Schema{
+			"private_endpoint_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"private_ip": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			// Computed
+			"reachable_ip": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func readSingularResourcemanagerPrivateEndpointReachableIp(d *schema.ResourceData, m interface{}) error {
+	sync := &ResourcemanagerPrivateEndpointReachableIpDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).ResourceManagerClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type ResourcemanagerPrivateEndpointReachableIpDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_resourcemanager.ResourceManagerClient
+	Res    *oci_resourcemanager.GetReachableIpResponse
+}
+
+func (s *ResourcemanagerPrivateEndpointReachableIpDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *ResourcemanagerPrivateEndpointReachableIpDataSourceCrud) Get() error {
+	request := oci_resourcemanager.GetReachableIpRequest{}
+
+	if privateEndpointId, ok := s.D.GetOkExists("private_endpoint_id"); ok {
+		tmp := privateEndpointId.(string)
+		request.PrivateEndpointId = &tmp
+	}
+
+	if privateIp, ok := s.D.GetOkExists("private_ip"); ok {
+		tmp := privateIp.(string)
+		request.PrivateIp = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "resourcemanager")
+
+	response, err := s.Client.GetReachableIp(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *ResourcemanagerPrivateEndpointReachableIpDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(tfresource.GenerateDataSourceHashID("ResourcemanagerPrivateEndpointReachableIpDataSource-", ResourcemanagerPrivateEndpointReachableIpDataSource(), s.D))
+
+	if s.Res.ReachableIp.ReachableIp != nil {
+		s.D.Set("reachable_ip", *s.Res.ReachableIp.ReachableIp)
+	}
+
+	return nil
+}