Merge pull request #2157 from oracle/release_gh

Releasing version v6.3.0
oracle · Jul 16, 2024 · f7bee92 · f7bee92
2 parents 7cac9d9 + 6b92584
commit f7bee92
Show file tree

Hide file tree

Showing 147 changed files with 114 additions and 2,127 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 6.3.0 (July 16, 2024)
+
+### Deprecation
+em_warehouse service
+### Bug Fix
+Autostart and autostop along with other updates.
+
 ## 6.2.0 (July 10, 2024)
 
 ### Added

diff --git a/examples/em_warehouse/em_warehouse.tf b/examples/em_warehouse/em_warehouse.tf
@@ -1,177 +1,2 @@
-// Copyright (c) 2017, 2024, 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" {}
-variable "compartment_ocid" {}
-
-variable "em_warehouse_defined_tags_value" {
-  default = "value"
-}
-
-variable "em_warehouse_display_name" {
-  default = "displayName"
-}
-
-variable "em_warehouse_freeform_tags" {
-  default = { "bar-key" = "value" }
-}
-
-variable "em_warehouse_state" {
-  default = "ACTIVE"
-}
-
-
-
-provider "oci" {
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
-  region           = var.region
-}
-
-resource "oci_identity_tag_namespace" "tag-namespace1" {
-  compartment_id = var.tenancy_ocid
-  description    = "example tag namespace"
-  name           = "examples-tag-namespace-all"
-  is_retired     = false
-}
-
-resource "oci_identity_tag" "tag1" {
-  description      = "example tag"
-  name             = "example-tag"
-  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
-  is_cost_tracking = false
-  is_retired       = false
-}
-
-variable "warehouse_defined_tags_value" {
-  default = "warehouse_tag_value"
-}
-
-variable "warehouse_freeform_tags" {
-  default = { "bar-key" = "value" }
-}
-
-variable "warehouse_display_name" {
-  default = "TestWarehouseDisplayName"
-}
-
-variable "warehouse_cpu_allocated" {
-  default = 1.0
-}
-
-variable "storage_allocated_in_gbs" {
-  default = 1.0
-}
-
-// To Create a OPSI Warehouse
-resource "oci_opsi_operations_insights_warehouse" "test_operations_insights_warehouse" {
-  #Required
-  compartment_id             = var.compartment_ocid
-  cpu_allocated              = var.warehouse_cpu_allocated
-  display_name               = var.warehouse_display_name
-
-  #Optional
-  defined_tags               = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.warehouse_defined_tags_value}")}"
-  freeform_tags              = var.warehouse_freeform_tags
-  storage_allocated_in_gbs 	 = var.storage_allocated_in_gbs
-}
-
-data "oci_objectstorage_namespace" "test_namespace" {
-    compartment_id = var.compartment_ocid
-}
-
-variable "bucket_name" {
-  default = "em_data_collection_bucket"
-}
-
-resource "oci_objectstorage_bucket" "test_bucket" {
-  name = var.bucket_name
-  compartment_id = var.compartment_ocid
-  namespace = data.oci_objectstorage_namespace.test_namespace.namespace
-}
-
-variable "enterprise_manager_bridge_defined_tags_value" {
-  default = "embridge_tag_value"
-}
-
-variable "enterprise_manager_bridge_description" {
-  default = "Test EM Bridge Description"
-}
-
-variable "enterprise_manager_bridge_display_name" {
-  default = "TestEMManagedBridgeName"
-}
-
-variable "enterprise_manager_bridge_freeform_tags" {
-  default = { "bar-key" = "value" }
-}
-
-variable "enterprise_manager_bridge_state" {
-  default = ["ACTIVE"]
-}
-
-variable "compartment_id_in_subtree" {
-  default = true
-}
-
-// To Create a Enterprise Manager Bridge
-resource "oci_opsi_enterprise_manager_bridge" "test_enterprise_manager_bridge" {
-  #Required
-  compartment_id             = var.compartment_ocid
-  display_name               = var.enterprise_manager_bridge_display_name
-  object_storage_bucket_name = oci_objectstorage_bucket.test_bucket.name
-
-  #Optional
-  defined_tags               = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.enterprise_manager_bridge_defined_tags_value}")}"
-  freeform_tags              = var.enterprise_manager_bridge_freeform_tags
-  description 		           = var.enterprise_manager_bridge_description
-}
-
-// To Create a Enterprise Manager Warehouse
-resource "oci_em_warehouse_em_warehouse" "test_em_warehouse" {
-  #Required
-  compartment_id                   = var.compartment_ocid
-  em_bridge_id                     = oci_opsi_enterprise_manager_bridge.test_enterprise_manager_bridge.id
-  operations_insights_warehouse_id = oci_opsi_operations_insights_warehouse.test_operations_insights_warehouse.id
-
-  #Optional
-  defined_tags  = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.em_warehouse_defined_tags_value}")}"
-  display_name  = var.em_warehouse_display_name
-  freeform_tags = var.em_warehouse_freeform_tags
-}
-
-// List emWarehouses present under a compartment
-data "oci_em_warehouse_em_warehouses" "test_em_warehouses" {
-  #Required
-  compartment_id                   = var.compartment_ocid
-
-  #Optional
-  display_name                     = var.em_warehouse_display_name
-  id                               = oci_em_warehouse_em_warehouse.test_em_warehouse.id
-  operations_insights_warehouse_id = oci_opsi_operations_insights_warehouse.test_operations_insights_warehouse.id
-  state                            = var.em_warehouse_state
-}
-
-// Get emWarehouse for a particular id
-data "oci_em_warehouse_em_warehouse" "test_em_warehouse" {
-  #Required
-  em_warehouse_id = oci_em_warehouse_em_warehouse.test_em_warehouse.id
-}
-
-// Get ETL Runs for a particular emWarehouseId
-data "oci_em_warehouse_em_warehouse_etl_runs" "test_em_warehouse_etl_runs" {
-  #Required
-  em_warehouse_id = oci_em_warehouse_em_warehouse.test_em_warehouse.id
-}
-
-// Get Resource Usage for a particular emWarehouseId
-data "oci_em_warehouse_em_warehouse_resource_usage" "test_em_warehouse_resource_usage" {
-  #Required
-  em_warehouse_id = oci_em_warehouse_em_warehouse.test_em_warehouse.id
-}
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
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/aiDocument.zip b/examples/zips/aiDocument.zip
diff --git a/examples/zips/aiLanguage.zip b/examples/zips/aiLanguage.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/capacity_management.zip b/examples/zips/capacity_management.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/cluster_placement_groups.zip b/examples/zips/cluster_placement_groups.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computecloudatcustomer.zip b/examples/zips/computecloudatcustomer.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/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/demand_signal.zip b/examples/zips/demand_signal.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/generative_ai.zip b/examples/zips/generative_ai.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/identity_domains.zip b/examples/zips/identity_domains.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/jms_java_downloads.zip b/examples/zips/jms_java_downloads.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/os_management_hub.zip b/examples/zips/os_management_hub.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/psql.zip b/examples/zips/psql.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/redis.zip b/examples/zips/redis.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/resourcescheduler.zip b/examples/zips/resourcescheduler.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
@@ -52,7 +52,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // 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.69.1
+	github.com/oracle/oci-go-sdk/v65 v65.69.2
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect

diff --git a/go.sum b/go.sum
@@ -140,8 +140,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.69.1 h1:X3vNSw9tXOxML96L3wBxrK7cwESgP/H1IgR8rTH5Ab4=
-github.com/oracle/oci-go-sdk/v65 v65.69.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.69.2 h1:lROMJ8/VakGOGObAWUxTVY2AX1wQCUIzVqfL4Fb2Ay8=
+github.com/oracle/oci-go-sdk/v65 v65.69.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "6.2.0"
-const ReleaseDate = "2024-07-10"
+const Version = "6.3.0"
+const ReleaseDate = "2024-07-17"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

diff --git a/internal/integrationtest/database_autonomous_database_resource_test.go b/internal/integrationtest/database_autonomous_database_resource_test.go
@@ -4444,7 +4444,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
 		//0. Verify Create
 		{
 			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, DatabaseAutonomousDatabaseRepresentation),
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create, autonomousDatabaseRepresentationForScheduledOperations),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -4498,7 +4498,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
 		{
 			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
-					acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseAutonomousDatabaseRepresentation, []string{"scheduled_operations"}),
+					acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
 						map[string]interface{}{
 							"scheduled_operations": []acctest.RepresentationGroup{
 								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
@@ -4561,7 +4561,7 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
 		{
 			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
-					acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseAutonomousDatabaseRepresentation, []string{"scheduled_operations"}),
+					acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
 						map[string]interface{}{
 							"scheduled_operations": []acctest.RepresentationGroup{
 								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMondayUpdated},
@@ -4615,6 +4615,69 @@ func TestDatabaseAutonomousDatabaseResource_scheduledOperations(t *testing.T) {
 					"scheduled_stop_time":  "19:00",
 				}, nil),
 
+				func(s *terraform.State) (err error) {
+					_, err = acctest.FromInstanceState(s, resourceName, "id")
+					return err
+				},
+			),
+		},
+		{
+			Config: config + compartmentIdVariableStr + DatabaseAutonomousDatabaseResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_database", "test_autonomous_database", acctest.Optional, acctest.Create,
+					acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(autonomousDatabaseRepresentationForScheduledOperations, []string{"scheduled_operations"}),
+						map[string]interface{}{
+							"scheduled_operations": []acctest.RepresentationGroup{
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationMondayUpdated},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationTuesday},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationWednesday},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationThursday},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationFriday},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSaturday},
+								{RepType: acctest.Optional, Group: DatabaseAutonomousDatabaseScheduledOperationsRepresentationSunday}},
+							"cpu_core_count": acctest.Representation{RepType: acctest.Optional, Create: `8.0`},
+						})),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "admin_password", "BEstrO0ng_#11"),
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "cpu_core_count", "8"),
+				// verify computed field db_workload to be defaulted to OLTP
+				resource.TestCheckResourceAttr(resourceName, "db_workload", "OLTP"),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "MONDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "TUESDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "WEDNESDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "THURSDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "FRIDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "SATURDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+				acctest.CheckResourceSetContainsElementWithProperties(resourceName, "scheduled_operations", map[string]string{
+					"day_of_week.0.name":   "SUNDAY",
+					"scheduled_start_time": "09:00",
+					"scheduled_stop_time":  "19:00",
+				}, nil),
+
 				func(s *terraform.State) (err error) {
 					_, err = acctest.FromInstanceState(s, resourceName, "id")
 					return err