Merge pull request #1783 from oracle/release_gh

Releasing version 4.110.0
oracle · Mar 1, 2023 · 9134721 · 9134721
2 parents 483146a + 2f08b6b
commit 9134721
Show file tree

Hide file tree

Showing 131 changed files with 617 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 4.110.0 (March 01, 2023)
+
+### Added
+- adding examples for ADG and CADG, fixing is_dataguard_enabled appearing twice
+### Bug Fix
+- Added Resource discovery support for datascience model resource
+- fix list repositories failure
+- Enabling resource discovery for core - Compute Imaging CP resources
+
 ## 4.109.0 (February 22, 2023)
 
 ### Added

diff --git a/examples/database/adb/adb_dataguard/adb_cross_region_dataguard.tf b/examples/database/adb/adb_dataguard/adb_cross_region_dataguard.tf
@@ -0,0 +1,64 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "random_string" "autonomous_database_admin_password" {
+  length      = 16
+  min_numeric = 1
+  min_lower   = 1
+  min_upper   = 1
+  min_special = 1
+}
+resource "time_sleep" "wait_300_seconds" {
+  destroy_duration = "5m"
+  depends_on = [oci_database_autonomous_database.autonomous_database_cross_region_dataguard_primary]
+}
+
+resource "oci_database_autonomous_database" "autonomous_database_cross_region_dataguard_primary" {
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_id
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbdb11ff2"
+  db_version               = "19c"
+  license_model            = "LICENSE_INCLUDED"
+  is_free_tier             = "false"
+}
+
+resource "oci_database_autonomous_database" "autonomous_database_cross_region_dataguard_standby" {
+  #Note: this should be provisioned in another region as the source database.
+  provider = oci.peer_region
+
+  #Required for cross-region standby
+  compartment_id           = var.compartment_id
+  source    = "CROSS_REGION_DATAGUARD"
+  source_id = oci_database_autonomous_database.autonomous_database_cross_region_dataguard_primary.id
+  db_name = oci_database_autonomous_database.autonomous_database_cross_region_dataguard_primary.db_name
+}
+
+data "oci_database_autonomous_databases" "autonomous_databases" {
+  filter {
+    name   = "id"
+    values = [oci_database_autonomous_database.autonomous_database_cross_region_dataguard_standby.id]
+  }
+
+  filter {
+    name   = "peer_db_ids"
+    values = [oci_database_autonomous_database.autonomous_database_cross_region_dataguard_primary.id]
+  }
+
+  filter {
+    name   = "role"
+    values = ["STANDBY"]
+  }
+
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = oci_database_autonomous_database.autonomous_database_cross_region_dataguard_standby.display_name
+}
+
+output "autonomous_databases" {
+  value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
+}
+
diff --git a/examples/database/adb/adb_dataguard/provider.tf b/examples/database/adb/adb_dataguard/provider.tf
@@ -0,0 +1,42 @@
+// Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+  default = "us-phoenix-1"
+}
+
+variable "peer_region" {
+  default = "us-ashburn-1"
+}
+
+variable "compartment_id" {
+}
+
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+provider "oci" {
+  alias            = "peer_region"
+  region           = var.peer_region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
diff --git a/examples/zips/adm.zip b/examples/zips/adm.zip
diff --git a/examples/zips/aiAnomalyDetection.zip b/examples/zips/aiAnomalyDetection.zip
diff --git a/examples/zips/aiVision.zip b/examples/zips/aiVision.zip
diff --git a/examples/zips/always_free.zip b/examples/zips/always_free.zip
diff --git a/examples/zips/analytics.zip b/examples/zips/analytics.zip
diff --git a/examples/zips/announcements_service.zip b/examples/zips/announcements_service.zip
diff --git a/examples/zips/api_gateway.zip b/examples/zips/api_gateway.zip
diff --git a/examples/zips/apm.zip b/examples/zips/apm.zip
diff --git a/examples/zips/appmgmt_control.zip b/examples/zips/appmgmt_control.zip
diff --git a/examples/zips/artifacts.zip b/examples/zips/artifacts.zip
diff --git a/examples/zips/audit.zip b/examples/zips/audit.zip
diff --git a/examples/zips/autoscaling.zip b/examples/zips/autoscaling.zip
diff --git a/examples/zips/bastion.zip b/examples/zips/bastion.zip
diff --git a/examples/zips/big_data_service.zip b/examples/zips/big_data_service.zip
diff --git a/examples/zips/blockchain.zip b/examples/zips/blockchain.zip
diff --git a/examples/zips/budget.zip b/examples/zips/budget.zip
diff --git a/examples/zips/certificatesManagement.zip b/examples/zips/certificatesManagement.zip
diff --git a/examples/zips/cloudBridge.zip b/examples/zips/cloudBridge.zip
diff --git a/examples/zips/cloudMigrations.zip b/examples/zips/cloudMigrations.zip
diff --git a/examples/zips/cloudguard.zip b/examples/zips/cloudguard.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computeinstanceagent.zip b/examples/zips/computeinstanceagent.zip
diff --git a/examples/zips/concepts.zip b/examples/zips/concepts.zip
diff --git a/examples/zips/container_engine.zip b/examples/zips/container_engine.zip
diff --git a/examples/zips/container_instances.zip b/examples/zips/container_instances.zip
diff --git a/examples/zips/dataConnectivity.zip b/examples/zips/dataConnectivity.zip
diff --git a/examples/zips/database.zip b/examples/zips/database.zip
diff --git a/examples/zips/databaseTools.zip b/examples/zips/databaseTools.zip
diff --git a/examples/zips/databasemanagement.zip b/examples/zips/databasemanagement.zip
diff --git a/examples/zips/databasemigration.zip b/examples/zips/databasemigration.zip
diff --git a/examples/zips/datacatalog.zip b/examples/zips/datacatalog.zip
diff --git a/examples/zips/dataflow.zip b/examples/zips/dataflow.zip
diff --git a/examples/zips/dataintegration.zip b/examples/zips/dataintegration.zip
diff --git a/examples/zips/datalabeling.zip b/examples/zips/datalabeling.zip
diff --git a/examples/zips/datasafe.zip b/examples/zips/datasafe.zip
diff --git a/examples/zips/datascience.zip b/examples/zips/datascience.zip
diff --git a/examples/zips/devops.zip b/examples/zips/devops.zip
diff --git a/examples/zips/disaster_recovery.zip b/examples/zips/disaster_recovery.zip
diff --git a/examples/zips/dns.zip b/examples/zips/dns.zip
diff --git a/examples/zips/em_warehouse.zip b/examples/zips/em_warehouse.zip
diff --git a/examples/zips/email.zip b/examples/zips/email.zip
diff --git a/examples/zips/events.zip b/examples/zips/events.zip
diff --git a/examples/zips/fast_connect.zip b/examples/zips/fast_connect.zip
diff --git a/examples/zips/functions.zip b/examples/zips/functions.zip
diff --git a/examples/zips/fusionapps.zip b/examples/zips/fusionapps.zip
diff --git a/examples/zips/goldengate.zip b/examples/zips/goldengate.zip
diff --git a/examples/zips/health_checks.zip b/examples/zips/health_checks.zip
diff --git a/examples/zips/id6.zip b/examples/zips/id6.zip
diff --git a/examples/zips/identity.zip b/examples/zips/identity.zip
diff --git a/examples/zips/identity_data_plane.zip b/examples/zips/identity_data_plane.zip
diff --git a/examples/zips/integration.zip b/examples/zips/integration.zip
diff --git a/examples/zips/jms.zip b/examples/zips/jms.zip
diff --git a/examples/zips/kms.zip b/examples/zips/kms.zip
diff --git a/examples/zips/license_manager.zip b/examples/zips/license_manager.zip
diff --git a/examples/zips/limits.zip b/examples/zips/limits.zip
diff --git a/examples/zips/load_balancer.zip b/examples/zips/load_balancer.zip
diff --git a/examples/zips/log_analytics.zip b/examples/zips/log_analytics.zip
diff --git a/examples/zips/logging.zip b/examples/zips/logging.zip
diff --git a/examples/zips/management_agent.zip b/examples/zips/management_agent.zip
diff --git a/examples/zips/management_dashboard.zip b/examples/zips/management_dashboard.zip
diff --git a/examples/zips/marketplace.zip b/examples/zips/marketplace.zip
diff --git a/examples/zips/media_services.zip b/examples/zips/media_services.zip
diff --git a/examples/zips/metering_computation.zip b/examples/zips/metering_computation.zip
diff --git a/examples/zips/monitoring.zip b/examples/zips/monitoring.zip
diff --git a/examples/zips/mysql.zip b/examples/zips/mysql.zip
diff --git a/examples/zips/network_firewall.zip b/examples/zips/network_firewall.zip
diff --git a/examples/zips/network_load_balancer.zip b/examples/zips/network_load_balancer.zip
diff --git a/examples/zips/networking.zip b/examples/zips/networking.zip
diff --git a/examples/zips/nosql.zip b/examples/zips/nosql.zip
diff --git a/examples/zips/notifications.zip b/examples/zips/notifications.zip
diff --git a/examples/zips/object_storage.zip b/examples/zips/object_storage.zip
diff --git a/examples/zips/ocvp.zip b/examples/zips/ocvp.zip
diff --git a/examples/zips/onesubscription.zip b/examples/zips/onesubscription.zip
diff --git a/examples/zips/opa.zip b/examples/zips/opa.zip
diff --git a/examples/zips/opensearch.zip b/examples/zips/opensearch.zip
diff --git a/examples/zips/operator_access_control.zip b/examples/zips/operator_access_control.zip
diff --git a/examples/zips/opsi.zip b/examples/zips/opsi.zip
diff --git a/examples/zips/optimizer.zip b/examples/zips/optimizer.zip
diff --git a/examples/zips/oracle_cloud_vmware_solution.zip b/examples/zips/oracle_cloud_vmware_solution.zip
diff --git a/examples/zips/oracle_content_experience.zip b/examples/zips/oracle_content_experience.zip
diff --git a/examples/zips/oracle_digital_assistant.zip b/examples/zips/oracle_digital_assistant.zip
diff --git a/examples/zips/osmanagement.zip b/examples/zips/osmanagement.zip
diff --git a/examples/zips/osp_gateway.zip b/examples/zips/osp_gateway.zip
diff --git a/examples/zips/osub_billing_schedule.zip b/examples/zips/osub_billing_schedule.zip
diff --git a/examples/zips/osub_organization_subscription.zip b/examples/zips/osub_organization_subscription.zip
diff --git a/examples/zips/osub_subscription.zip b/examples/zips/osub_subscription.zip
diff --git a/examples/zips/osub_usage.zip b/examples/zips/osub_usage.zip
diff --git a/examples/zips/pic.zip b/examples/zips/pic.zip
diff --git a/examples/zips/queue.zip b/examples/zips/queue.zip
diff --git a/examples/zips/recovery.zip b/examples/zips/recovery.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/serviceManagerProxy.zip b/examples/zips/serviceManagerProxy.zip
diff --git a/examples/zips/service_catalog.zip b/examples/zips/service_catalog.zip
diff --git a/examples/zips/service_connector_hub.zip b/examples/zips/service_connector_hub.zip
diff --git a/examples/zips/service_mesh.zip b/examples/zips/service_mesh.zip
diff --git a/examples/zips/stack_monitoring.zip b/examples/zips/stack_monitoring.zip
diff --git a/examples/zips/storage.zip b/examples/zips/storage.zip
diff --git a/examples/zips/streaming.zip b/examples/zips/streaming.zip
diff --git a/examples/zips/usage_proxy.zip b/examples/zips/usage_proxy.zip
diff --git a/examples/zips/vault_secret.zip b/examples/zips/vault_secret.zip
diff --git a/examples/zips/vbs_inst.zip b/examples/zips/vbs_inst.zip
diff --git a/examples/zips/visual_builder.zip b/examples/zips/visual_builder.zip
diff --git a/examples/zips/vn_monitoring.zip b/examples/zips/vn_monitoring.zip
diff --git a/examples/zips/vulnerability_scanning_service.zip b/examples/zips/vulnerability_scanning_service.zip
diff --git a/examples/zips/web_app_acceleration.zip b/examples/zips/web_app_acceleration.zip
diff --git a/examples/zips/web_app_firewall.zip b/examples/zips/web_app_firewall.zip
diff --git a/examples/zips/web_application_acceleration_and_security.zip b/examples/zips/web_application_acceleration_and_security.zip
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.31.0
+	github.com/oracle/oci-go-sdk/v65 v65.31.1
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect

diff --git a/go.sum b/go.sum
@@ -289,8 +289,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v65 v65.31.0 h1:lDm6L3+/30+tKYHx9RCwsYxJEZUWJ/KEOU4egTQDi+0=
-github.com/oracle/oci-go-sdk/v65 v65.31.0/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE=
+github.com/oracle/oci-go-sdk/v65 v65.31.1 h1:GcVydzh3M4IbH4Y1XienA3W/bR02SMag0stfw9UbjtQ=
+github.com/oracle/oci-go-sdk/v65 v65.31.1/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "4.108.1"
-const ReleaseDate = "2023-02-21"
+const Version = "4.110.0"
+const ReleaseDate = "2023-03-01"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

diff --git a/internal/integrationtest/core_compute_global_image_capability_schema_test.go b/internal/integrationtest/core_compute_global_image_capability_schema_test.go
@@ -16,6 +16,7 @@ import (
 
 var (
 	CoreCoreComputeGlobalImageCapabilitySchemaSingularDataSourceRepresentation = map[string]interface{}{
+
 		"compute_global_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
 	}
 
@@ -26,7 +27,9 @@ var (
 
 // issue-routing-tag: core/computeImaging
 func TestCoreComputeGlobalImageCapabilitySchemaResource_basic(t *testing.T) {
+
 	httpreplay.SetScenario("TestCoreComputeGlobalImageCapabilitySchemaResource_basic")
+
 	defer httpreplay.SaveScenario()
 
 	config := acctest.ProviderTestConfig()

diff --git a/internal/integrationtest/core_compute_global_image_capability_schemas_version_test.go b/internal/integrationtest/core_compute_global_image_capability_schemas_version_test.go
@@ -16,11 +16,13 @@ import (
 
 var (
 	CoreCoreComputeGlobalImageCapabilitySchemasVersionSingularDataSourceRepresentation = map[string]interface{}{
+
 		"compute_global_image_capability_schema_id":           acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
 		"compute_global_image_capability_schema_version_name": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas_versions.test_compute_global_image_capability_schemas_versions.compute_global_image_capability_schema_versions.0.name}`},
 	}
 
 	CoreCoreComputeGlobalImageCapabilitySchemasVersionDataSourceRepresentation = map[string]interface{}{
+
 		"compute_global_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_core_compute_global_image_capability_schemas.test_compute_global_image_capability_schemas.compute_global_image_capability_schemas.0.id}`},
 		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`},
 	}

diff --git a/internal/integrationtest/core_compute_image_capability_schema_test.go b/internal/integrationtest/core_compute_image_capability_schema_test.go
@@ -32,14 +32,16 @@ var (
 
 	CoreCoreComputeImageCapabilitySchemaSingularDataSourceRepresentation = map[string]interface{}{
 		"compute_image_capability_schema_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.id}`},
-		"is_merge_enabled":                   acctest.Representation{RepType: acctest.Required, Create: `false`},
+
+		"is_merge_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`},
 	}
 
 	CoreCoreComputeImageCapabilitySchemaDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`},
-		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
-		"image_id":       acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.image_id}`},
-		"filter":         acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation}}
+
+		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+		"image_id":     acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.image_id}`},
+		"filter":       acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation}}
 	CoreComputeImageCapabilitySchemaDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   acctest.Representation{RepType: acctest.Required, Create: `id`},
 		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_core_compute_image_capability_schema.test_compute_image_capability_schema.id}`}},
@@ -92,6 +94,7 @@ resource "oci_core_image" "custom_image" {
 
 // issue-routing-tag: core/computeImaging
 func TestCoreComputeImageCapabilitySchemaResource_basic(t *testing.T) {
+
 	t.Skip("Skip test for Windows image")
 	httpreplay.SetScenario("TestCoreComputeImageCapabilitySchemaResource_basic")
 	defer httpreplay.SaveScenario()

diff --git a/internal/integrationtest/datascience_model_test.go b/internal/integrationtest/datascience_model_test.go
@@ -37,12 +37,14 @@ var (
 	}
 
 	DatascienceDatascienceModelDataSourceRepresentation = map[string]interface{}{
-		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
-		"id":             acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_model.test_model.id}`},
-		"project_id":     acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_project.test_project.id}`},
-		"state":          acctest.Representation{RepType: acctest.Optional, Create: `ACTIVE`},
-		"filter":         acctest.RepresentationGroup{RepType: acctest.Required, Group: DatascienceModelDataSourceFilterRepresentation}}
+		"compartment_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"display_name":           acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+		"id":                     acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_model.test_model.id}`},
+		"model_version_set_name": acctest.Representation{RepType: acctest.Optional, Create: ``},
+		"project_id":             acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_project.test_project.id}`},
+		"state":                  acctest.Representation{RepType: acctest.Optional, Create: `ACTIVE`},
+		"version_label":          acctest.Representation{RepType: acctest.Optional, Create: ``, Update: ``},
+		"filter":                 acctest.RepresentationGroup{RepType: acctest.Required, Group: DatascienceModelDataSourceFilterRepresentation}}
 	DatascienceModelDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   acctest.Representation{RepType: acctest.Required, Create: `id`},
 		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_datascience_model.test_model.id}`}},
@@ -76,6 +78,10 @@ var (
 
 	DatascienceModelResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
 		DefinedTagsDependencies
+
+	DatascienceModelResourceModelVersionSetDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_model_version_set", "test_model_version_set", acctest.Required, acctest.Create, DatascienceModelVersionSetRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
+		DefinedTagsDependencies
 )
 
 // issue-routing-tag: datascience/default
@@ -241,11 +247,12 @@ func TestDatascienceModelResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_datascience_models", "test_models", acctest.Optional, acctest.Update, DatascienceDatascienceModelDataSourceRepresentation) +
-				compartmentIdVariableStr + DatascienceModelResourceDependencies +
+				compartmentIdVariableStr + DatascienceModelResourceModelVersionSetDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_datascience_model", "test_model", acctest.Optional, acctest.Update, DatascienceModelRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
+				resource.TestCheckResourceAttrSet(datasourceName, "id"),
 				resource.TestCheckResourceAttrSet(datasourceName, "project_id"),
 				resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
 

diff --git a/internal/integrationtest/devops_repository_test.go b/internal/integrationtest/devops_repository_test.go
@@ -57,7 +57,6 @@ var (
 	}
 
 	DevopsRepositoryResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_devops_project", "test_project", acctest.Required, acctest.Create, DevopsProjectRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_devops_connection", "test_connection", acctest.Required, acctest.Create, DevopsConnectionRepresentation) +
 		DefinedTagsDependencies +
 		acctest.GenerateResourceFromRepresentationMap("oci_ons_notification_topic", "test_notification_topic", acctest.Required, acctest.Create, OnsNotificationTopicRepresentation)
 )
@@ -72,22 +71,19 @@ func TestDevopsRepositoryResource_basic(t *testing.T) {
 	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
-	githubAccessTokenVaultId := utils.GetEnvSettingWithBlankDefault("github_access_token_vault_id")
-	githubAccessTokenVaultIdStr := fmt.Sprintf("variable \"github_access_token_vault_id\" { default = \"%s\" }\n", githubAccessTokenVaultId)
-
 	resourceName := "oci_devops_repository.test_repository"
 	datasourceName := "data.oci_devops_repositories.test_repositories"
 	singularDatasourceName := "data.oci_devops_repository.test_repository"
 
 	var resId, resId2 string
 	// Save TF content to Create resource with optional properties. This has to be exactly the same as the config part in the "create with optionals" step in the test.
-	acctest.SaveConfigContent(config+compartmentIdVariableStr+githubAccessTokenVaultIdStr+DevopsRepositoryResourceDependencies+
+	acctest.SaveConfigContent(config+compartmentIdVariableStr+DevopsRepositoryResourceDependencies+
 		acctest.GenerateResourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Optional, acctest.Create, DevopsRepositoryRepresentation), "devops", "repository", t)
 
 	acctest.ResourceTest(t, testAccCheckDevopsRepositoryDestroy, []resource.TestStep{
 		// verify Create
 		{
-			Config: config + compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceDependencies +
+			Config: config + compartmentIdVariableStr + DevopsRepositoryResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Required, acctest.Create, DevopsRepositoryRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "name", "name"),
@@ -103,11 +99,11 @@ func TestDevopsRepositoryResource_basic(t *testing.T) {
 
 		// delete before next Create
 		{
-			Config: config + compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceDependencies,
+			Config: config + compartmentIdVariableStr + DevopsRepositoryResourceDependencies,
 		},
 		//verify Create with optionals
 		{
-			Config: config + compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceDependencies +
+			Config: config + compartmentIdVariableStr + DevopsRepositoryResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Optional, acctest.Create, DevopsRepositoryRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
@@ -133,7 +129,7 @@ func TestDevopsRepositoryResource_basic(t *testing.T) {
 
 		// verify updates to updatable parameters
 		{
-			Config: config + compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceDependencies +
+			Config: config + compartmentIdVariableStr + DevopsRepositoryResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Optional, acctest.Update, DevopsRepositoryRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
@@ -158,7 +154,7 @@ func TestDevopsRepositoryResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_devops_repositories", "test_repositories", acctest.Optional, acctest.Update, DevopsDevopsRepositoryDataSourceRepresentation) +
-				compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceDependencies +
+				compartmentIdVariableStr + DevopsRepositoryResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Optional, acctest.Update, DevopsRepositoryRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(datasourceName, "repository_collection.#", "1"),
@@ -169,7 +165,7 @@ func TestDevopsRepositoryResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_devops_repository", "test_repository", acctest.Required, acctest.Create, DevopsDevopsRepositorySingularDataSourceRepresentation) +
-				compartmentIdVariableStr + githubAccessTokenVaultIdStr + DevopsRepositoryResourceConfig,
+				compartmentIdVariableStr + DevopsRepositoryResourceConfig,
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "repository_id"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "branch_count"),

diff --git a/internal/service/core/core_compute_image_capability_schemas_data_source.go b/internal/service/core/core_compute_image_capability_schemas_data_source.go
@@ -135,7 +135,7 @@ func (s *CoreComputeImageCapabilitySchemasDataSourceCrud) SetData() error {
 			computeImageCapabilitySchema["image_id"] = *r.ImageId
 		}
 
-		computeImageCapabilitySchema["schema_data"] = r.SchemaData
+		computeImageCapabilitySchema["schema_data"] = schemaDataToMap(r.SchemaData)
 
 		if r.TimeCreated != nil {
 			computeImageCapabilitySchema["time_created"] = r.TimeCreated.String()

diff --git a/internal/service/datascience/datascience_export.go b/internal/service/datascience/datascience_export.go
@@ -95,6 +95,17 @@ var exportDatascienceJobRunHints = &tf_export.TerraformResourceHints{
 	},
 }
 
+var exportDatascienceModelVersionSetHints = &tf_export.TerraformResourceHints{
+	ResourceClass:          "oci_datascience_model_version_set",
+	DatasourceClass:        "oci_datascience_model_version_sets",
+	DatasourceItemsAttr:    "model_version_sets",
+	ResourceAbbreviation:   "model_version_set",
+	RequireResourceRefresh: true,
+	DiscoverableLifecycleStates: []string{
+		string(oci_datascience.ModelVersionSetLifecycleStateActive),
+	},
+}
+
 var exportDatasciencePipelineRunHints = &tf_export.TerraformResourceHints{
 	ResourceClass:          "oci_datascience_pipeline_run",
 	DatasourceClass:        "oci_datascience_pipeline_runs",
@@ -126,6 +137,7 @@ var datascienceResourceGraph = tf_export.TerraformResourceGraph{
 		{TerraformResourceHints: exportDatascienceJobHints},
 		{TerraformResourceHints: exportDatascienceJobRunHints},
 		{TerraformResourceHints: exportDatasciencePipelineRunHints},
+		{TerraformResourceHints: exportDatascienceModelVersionSetHints},
 		{TerraformResourceHints: exportDatasciencePipelineHints},
 	},
 	"oci_datascience_model": {