Added - Support for DataConnectivity Service

Author: sahilg11

internal/client/data_connectivity_clients.go

@@ -0,0 +1,55 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package client
+
+import (
+	oci_data_connectivity "github.com/oracle/oci-go-sdk/v58/dataconnectivity"
+
+	oci_common "github.com/oracle/oci-go-sdk/v58/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_data_connectivity.DataConnectivityManagementClient", &OracleClient{InitClientFn: initDataconnectivityDataConnectivityManagementClient})
+	RegisterOracleClient("oci_data_connectivity.NetworkValidationClient", &OracleClient{InitClientFn: initDataconnectivityNetworkValidationClient})
+}
+
+func initDataconnectivityDataConnectivityManagementClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_data_connectivity.NewDataConnectivityManagementClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.HostUrlOverride != "" {
+		client.Host = serviceClientOverrides.HostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) DataConnectivityManagementClient() *oci_data_connectivity.DataConnectivityManagementClient {
+	return m.GetClient("oci_data_connectivity.DataConnectivityManagementClient").(*oci_data_connectivity.DataConnectivityManagementClient)
+}
+
+func initDataconnectivityNetworkValidationClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_data_connectivity.NewNetworkValidationClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.HostUrlOverride != "" {
+		client.Host = serviceClientOverrides.HostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) NetworkValidationClient() *oci_data_connectivity.NetworkValidationClient {
+	return m.GetClient("oci_data_connectivity.NetworkValidationClient").(*oci_data_connectivity.NetworkValidationClient)
+}

internal/integrationtest/data_connectivity_registry_connection_test.go

@@ -0,0 +1,73 @@
+// 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/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 (
+	registryTypeSingularDataSourceRepresentation = map[string]interface{}{
+		"registry_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_data_connectivity_registry.test_registry.id}`},
+		"type_key":    acctest.Representation{RepType: acctest.Required, Create: `${data.oci_data_connectivity_registry_types.test_registry_types.types_summary_collection.0.items.0.key}`},
+		"fields":      acctest.Representation{RepType: acctest.Optional, Create: []string{}},
+	}
+
+	registryTypeDataSourceRepresentation = map[string]interface{}{
+		"registry_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_data_connectivity_registry.test_registry.id}`},
+	}
+
+	RegistryTypeResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_data_connectivity_registry", "test_registry", acctest.Required, acctest.Create, registryRepresentation)
+)
+
+// issue-routing-tag: data_connectivity/default
+func TestDataConnectivityRegistryTypeResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestDataConnectivityRegistryTypeResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_data_connectivity_registry_types.test_registry_types"
+	singularDatasourceName := "data.oci_data_connectivity_registry_type.test_registry_type"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_data_connectivity_registry_types", "test_registry_types", acctest.Required, acctest.Create, registryTypeDataSourceRepresentation) +
+				compartmentIdVariableStr + RegistryTypeResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(datasourceName, "registry_id"),
+				resource.TestCheckResourceAttrSet(datasourceName, "types_summary_collection.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "types_summary_collection.0.items.0.name"),
+				resource.TestCheckResourceAttrSet(datasourceName, "types_summary_collection.0.items.0.description"),
+				resource.TestCheckResourceAttrSet(datasourceName, "types_summary_collection.0.items.0.key"),
+			),
+		},
+		// verify singular datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_data_connectivity_registry_types", "test_registry_types", acctest.Optional, acctest.Create, acctest.RepresentationCopyWithNewProperties(registryTypeDataSourceRepresentation, map[string]interface{}{})) +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_data_connectivity_registry_type", "test_registry_type", acctest.Required, acctest.Create, registryTypeSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + RegistryTypeResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "registry_id"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "type_key"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "data_asset_attributes.#"),
+			),
+		},
+	})
+}

internal/integrationtest/data_connectivity_registry_data_asset_test.go

@@ -24,6 +24,7 @@ import (
 	tf_computeinstanceagent "github.com/terraform-providers/terraform-provider-oci/internal/service/computeinstanceagent"
 	tf_containerengine "github.com/terraform-providers/terraform-provider-oci/internal/service/containerengine"
 	tf_core "github.com/terraform-providers/terraform-provider-oci/internal/service/core"
+	tf_data_connectivity "github.com/terraform-providers/terraform-provider-oci/internal/service/data_connectivity"
 	tf_data_labeling_service "github.com/terraform-providers/terraform-provider-oci/internal/service/data_labeling_service"
 	tf_data_safe "github.com/terraform-providers/terraform-provider-oci/internal/service/data_safe"
 	tf_database "github.com/terraform-providers/terraform-provider-oci/internal/service/database"
@@ -335,6 +336,17 @@ func init() {
 	RegisterDatasource("oci_core_vnic", tf_core.CoreVnicDataSource())
 	RegisterDatasource("oci_core_vnic_attachments", tf_core.CoreVnicAttachmentsDataSource())
 	RegisterDatasource("oci_core_volume", tf_core.CoreVolumeDataSource())
+	// data_connectivity service
+	RegisterDatasource("oci_data_connectivity_registry", tf_data_connectivity.DataConnectivityRegistryDataSource())
+	RegisterDatasource("oci_data_connectivity_registries", tf_data_connectivity.DataConnectivityRegistriesDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_connection", tf_data_connectivity.DataConnectivityRegistryConnectionDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_connections", tf_data_connectivity.DataConnectivityRegistryConnectionsDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_data_asset", tf_data_connectivity.DataConnectivityRegistryDataAssetDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_data_assets", tf_data_connectivity.DataConnectivityRegistryDataAssetsDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_folder", tf_data_connectivity.DataConnectivityRegistryFolderDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_folders", tf_data_connectivity.DataConnectivityRegistryFoldersDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_type", tf_data_connectivity.DataConnectivityRegistryTypeDataSource())
+	RegisterDatasource("oci_data_connectivity_registry_types", tf_data_connectivity.DataConnectivityRegistryTypesDataSource())
 	RegisterDatasource("oci_core_volume_attachments", tf_core.CoreVolumeAttachmentsDataSource())
 	RegisterDatasource("oci_core_volume_backup_policies", tf_core.CoreVolumeBackupPoliciesDataSource())
 	RegisterDatasource("oci_core_volume_backup_policy_assignments", tf_core.CoreVolumeBackupPolicyAssignmentsDataSource())

internal/integrationtest/data_connectivity_registry_folder_test.go

@@ -23,6 +23,7 @@ import (
 	tf_cloud_guard "github.com/terraform-providers/terraform-provider-oci/internal/service/cloud_guard"
 	tf_containerengine "github.com/terraform-providers/terraform-provider-oci/internal/service/containerengine"
 	tf_core "github.com/terraform-providers/terraform-provider-oci/internal/service/core"
+	tf_data_connectivity "github.com/terraform-providers/terraform-provider-oci/internal/service/data_connectivity"
 	tf_data_labeling_service "github.com/terraform-providers/terraform-provider-oci/internal/service/data_labeling_service"
 	tf_data_safe "github.com/terraform-providers/terraform-provider-oci/internal/service/data_safe"
 	tf_database "github.com/terraform-providers/terraform-provider-oci/internal/service/database"
@@ -205,6 +206,11 @@ func init() {
 	RegisterResource("oci_core_volume_backup_policy_assignment", tf_core.CoreVolumeBackupPolicyAssignmentResource())
 	RegisterResource("oci_core_volume_group", tf_core.CoreVolumeGroupResource())
 	RegisterResource("oci_core_volume_group_backup", tf_core.CoreVolumeGroupBackupResource())
+	// data_connectivity service
+	RegisterResource("oci_data_connectivity_registry", tf_data_connectivity.DataConnectivityRegistryResource())
+	RegisterResource("oci_data_connectivity_registry_connection", tf_data_connectivity.DataConnectivityRegistryConnectionResource())
+	RegisterResource("oci_data_connectivity_registry_data_asset", tf_data_connectivity.DataConnectivityRegistryDataAssetResource())
+	RegisterResource("oci_data_connectivity_registry_folder", tf_data_connectivity.DataConnectivityRegistryFolderResource())
 	// data_labeling_service service
 	RegisterResource("oci_data_labeling_service_dataset", tf_data_labeling_service.DataLabelingServiceDatasetResource())
 	// data_safe service

internal/integrationtest/data_connectivity_registry_test.go

@@ -15,6 +15,7 @@ import (
 	oci_containerengine "github.com/oracle/oci-go-sdk/v58/containerengine"
 	oci_database_migration "github.com/oracle/oci-go-sdk/v58/databasemigration"
 	oci_datacatalog "github.com/oracle/oci-go-sdk/v58/datacatalog"
+	oci_data_connectivity "github.com/oracle/oci-go-sdk/v58/dataconnectivity"
 	oci_dataflow "github.com/oracle/oci-go-sdk/v58/dataflow"
 	oci_dataintegration "github.com/oracle/oci-go-sdk/v58/dataintegration"
 	oci_data_labeling_service "github.com/oracle/oci-go-sdk/v58/datalabelingservice"
@@ -1011,6 +1012,45 @@ var exportCoreDrgRouteTableRouteRuleHints = &TerraformResourceHints{
 	resourceAbbreviation: "drg_route_table_route_rule",
 }
 
+var exportDataConnectivityRegistryHints = &TerraformResourceHints{
+	resourceClass:          "oci_data_connectivity_registry",
+	datasourceClass:        "oci_data_connectivity_registries",
+	datasourceItemsAttr:    "registry_summary_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "registry",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_data_connectivity.RegistryLifecycleStateActive),
+	},
+}
+
+var exportDataConnectivityRegistryConnectionHints = &TerraformResourceHints{
+	resourceClass:          "oci_data_connectivity_registry_connection",
+	datasourceClass:        "oci_data_connectivity_registry_connections",
+	datasourceItemsAttr:    "connection_summary_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "registry_connection",
+	requireResourceRefresh: true,
+}
+
+var exportDataConnectivityRegistryDataAssetHints = &TerraformResourceHints{
+	resourceClass:          "oci_data_connectivity_registry_data_asset",
+	datasourceClass:        "oci_data_connectivity_registry_data_assets",
+	datasourceItemsAttr:    "data_asset_summary_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "registry_data_asset",
+	requireResourceRefresh: true,
+}
+
+var exportDataConnectivityRegistryFolderHints = &TerraformResourceHints{
+	resourceClass:          "oci_data_connectivity_registry_folder",
+	datasourceClass:        "oci_data_connectivity_registry_folders",
+	datasourceItemsAttr:    "folder_summary_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "registry_folder",
+	requireResourceRefresh: true,
+}
+
 var exportDataSafeDataSafePrivateEndpointHints = &TerraformResourceHints{
 	resourceClass:          "oci_data_safe_data_safe_private_endpoint",
 	datasourceClass:        "oci_data_safe_data_safe_private_endpoints",

internal/integrationtest/data_connectivity_registry_type_test.go

@@ -31,6 +31,7 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
 	"cloud_guard":             cloudGuardResourceGraph,
 	"containerengine":         containerengineResourceGraph,
 	"core":                    coreResourceGraph,
+	"data_connectivity":       dataConnectivityResourceGraph,
 	"data_labeling_service":   dataLabelingServiceResourceGraph,
 	"data_safe":               dataSafeResourceGraph,
 	"database":                databaseResourceGraph,
@@ -444,6 +445,42 @@ var coreResourceGraph = TerraformResourceGraph{
 	},
 }
 
+var dataConnectivityResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportDataConnectivityRegistryHints},
+	},
+	"oci_data_connectivity_registry": {
+		{
+			TerraformResourceHints: exportDataConnectivityRegistryConnectionHints,
+			datasourceQueryParams: map[string]string{
+				"data_asset_key": "data_asset_key",
+				"registry_id":    "id",
+			},
+		},
+		{
+			TerraformResourceHints: exportDataConnectivityRegistryDataAssetHints,
+			datasourceQueryParams: map[string]string{
+				"registry_id": "id",
+			},
+		},
+		{
+			TerraformResourceHints: exportDataConnectivityRegistryFolderHints,
+			datasourceQueryParams: map[string]string{
+				"registry_id": "id",
+			},
+		},
+	},
+	"oci_data_connectivity_registry_data_asset": {
+		{
+			TerraformResourceHints: exportDataConnectivityRegistryConnectionHints,
+			datasourceQueryParams: map[string]string{
+				"data_asset_key": "key",
+				"registry_id":    "registry_id",
+			},
+		},
+	},
+}
+
 var dataLabelingServiceResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportDataLabelingServiceDatasetHints},