oracle · NagendraNigade · Oct 5, 2022 · Sep 20, 2022 · May 26, 2022 · Aug 23, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 4.96.0 (October 05, 2022)
+
+### Added
+- resource discovery for private DNS zones and rrsets
+- Support for BDS - Start/Stop Cluster
+- Support for OPSI Windows/Solaris support
+- Support for OCI Bastions - DNS Support
+- Generate terraform config for services with non zero resource only
+- Id based RD without resourceType
+- Support for EXACC Elastic Compute
+### Bug Fix
+- Support for repeated Deployments on each apply
+- canaryStrategy code added to fix the issue
+
 ## 4.95.0 (September 28, 2022)
 
 ### Added

diff --git a/examples/bastion/instance.tf b/examples/bastion/instance.tf
@@ -12,7 +12,7 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = data.oci_identity_availability_domain.bastion_ad.name
   compartment_id      = var.compartment_ocid
   display_name        = "TestInstance"
-  shape               = "VM.Standard1.1"
+  shape               = "VM.Standard2.1"
 
   agent_config {
     are_all_plugins_disabled  = false
@@ -27,7 +27,7 @@ resource "oci_core_instance" "test_instance" {
   create_vnic_details {
     subnet_id        = oci_core_subnet.test_subnet.id
     display_name     = "Primaryvnic"
-    assign_public_ip = true
+    assign_public_ip = false
     hostname_label   = "testinstance"
   }
 

diff --git a/examples/bastion/network.tf b/examples/bastion/network.tf
@@ -10,7 +10,7 @@ resource "oci_core_service_gateway" "test_bastion_service_gateway" {
   display_name   = "sgw"
 
   services {
-    service_id = data.oci_core_services.test_bastion_services.services[1]["id"]
+    service_id = data.oci_core_services.test_bastion_services.services[0]["id"]
   }
 
   vcn_id = oci_core_vcn.test_bastion_vcn.id
@@ -21,7 +21,7 @@ resource "oci_core_default_route_table" "bastion_default_route_table" {
   display_name               = "DefaultRouteTable"
 
   route_rules {
-    destination       = lookup(data.oci_core_services.test_bastion_services.services[1], "cidr_block")
+    destination       = lookup(data.oci_core_services.test_bastion_services.services[0], "cidr_block")
     destination_type  = "SERVICE_CIDR_BLOCK"
     network_entity_id = oci_core_service_gateway.test_bastion_service_gateway.id
   }

diff --git a/examples/bastion/session.tf b/examples/bastion/session.tf
@@ -36,7 +36,7 @@ variable "session_target_resource_details_target_resource_port" {
 resource "time_sleep" "wait_3_minutes_for_bastion_plugin" {
   depends_on = [oci_core_instance.test_instance]
 
-  create_duration = "3m"
+  create_duration = "5m"
 }
 
 resource "oci_bastion_session" "test_session_managed_ssh" {

diff --git a/examples/database/exadata_cc/exadata-infrastructure.tf b/examples/database/exadata_cc/exadata-infrastructure.tf
@@ -42,7 +42,7 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   infini_band_network_cidr    = "10.31.8.0/21"
   netmask                     = "255.255.255.0"
   ntp_server                  = ["10.231.225.76"]
-  shape                       = "ExadataCC.Quarter3.100"
+  shape                       = "ExadataCC.X7"
   time_zone                   = "US/Pacific"
   activation_file             = "activation.zip"
   storage_count               = 3

diff --git a/examples/database/exadata_cc/vm_cluster.tf b/examples/database/exadata_cc/vm_cluster.tf
@@ -31,11 +31,13 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
     nodes {
       hostname = "myprefix2-cghdm1"
       ip       = "192.169.19.18"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
     }
 
     nodes {
       hostname = "myprefix2-cghdm2"
       ip       = "192.169.19.20"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
     }
 
     vlan_id = "11"
@@ -52,13 +54,15 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
       ip           = "192.168.19.10"
       vip          = "192.168.19.11"
       vip_hostname = "myprefix1-r64zc1-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.0.id
     }
 
     nodes {
       hostname     = "myprefix1-r64zc2"
       ip           = "192.168.19.14"
       vip          = "192.168.19.15"
       vip_hostname = "myprefix1-r64zc2-vip"
+      db_server_id = data.oci_database_db_servers.test_db_servers.db_servers.1.id
     }
 
     vlan_id = "10"
@@ -74,6 +78,14 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
   }
 
   validate_vm_cluster_network = true
+
+  action = "ADD_DBSERVER_NETWORK"
+
+  lifecycle {
+    ignore_changes = [
+      vm_networks,
+    ]
+  }
 }
 
 data "oci_database_gi_versions" "gi_version" {

diff --git a/examples/devops/deployment_service/wait_deploy_stage/wait_deploy_stage.tf b/examples/devops/deployment_service/wait_deploy_stage/wait_deploy_stage.tf
@@ -20,7 +20,7 @@ variable "region" {
 }
 
 provider "oci" {
-  #version = "4.62.0"
+  #version = "4.92.0"
   region           = var.region
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -58,8 +58,8 @@ resource "oci_devops_deploy_pipeline" "test_deploy_pipeline" {
   #Required
   project_id = oci_devops_project.test_project.id
 
-  description   = "description"
-  display_name  = "displayName"
+  description  = "description"
+  display_name = "displayName"
 }
 
 resource "oci_devops_deploy_stage" "test_wait_deploy_stage" {
@@ -74,8 +74,8 @@ resource "oci_devops_deploy_stage" "test_wait_deploy_stage" {
   }
   deploy_stage_type = "WAIT"
 
-  description                                  = "description"
-  display_name                                 = "displayName"
+  description  = "description"
+  display_name = "displayName"
   wait_criteria {
     #Required
     wait_duration = "PT5S"
@@ -89,5 +89,6 @@ resource "oci_devops_deployment" "test_deployment" {
   deployment_type    = "PIPELINE_DEPLOYMENT"
 
   #Optional
-  display_name           = "test_deployment"
+  display_name                  = "test_deployment"
+  trigger_new_devops_deployment = false
 }
diff --git a/examples/storage/fss/data_sources.tf b/examples/storage/fss/data_sources.tf
@@ -84,3 +84,26 @@ data "oci_core_private_ips" "ip_mount_target1" {
   }
 }
 
+# Gets a list of replications in a compartment and availability domain
+data "oci_file_storage_replications" "test_replications" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  #display_name   = var.replication_display_name
+  #file_system_id = oci_file_storage_file_system.test_file_system.id
+  #id             = var.replication_id
+  #state          = var.replication_state
+}
+
+data "oci_file_storage_replication_targets" "test_replication_targets" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+
+  #Optional
+  #display_name = var.replication_target_display_name
+  #id           = var.replication_target_id
+  #state        = var.replication_target_state
+}
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/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/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/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/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/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/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.22.0
+	github.com/oracle/oci-go-sdk/v65 v65.23.0
 	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.22.0 h1:lCv8gxFOVI8sG0vCjxZ8CuXy3QOUM+JspcAdzsPkjcs=
-github.com/oracle/oci-go-sdk/v65 v65.22.0/go.mod h1:oyMrMa1vOzzKTmPN+kqrTR9y9kPA2tU1igN3NUSNTIE=
+github.com/oracle/oci-go-sdk/v65 v65.23.0 h1:v+nyukczQQ05xXzF+AdmjR9TQMRrWQENF+jVFZiyEQg=
+github.com/oracle/oci-go-sdk/v65 v65.23.0/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.95.0"
-const ReleaseDate = "2022-09-28"
+const Version = "4.96.0"
+const ReleaseDate = "2022-10-05"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

diff --git a/internal/integrationtest/bastion_bastion_test.go b/internal/integrationtest/bastion_bastion_test.go
@@ -55,6 +55,7 @@ var (
 		"target_subnet_id":             acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
 		"client_cidr_block_allow_list": acctest.Representation{RepType: acctest.Required, Create: []string{`0.0.0.0/0`}, Update: []string{`0.0.0.0/0`}},
 		"defined_tags":                 acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
+		"dns_proxy_status":             acctest.Representation{RepType: acctest.Optional, Create: `DISABLED`},
 		"freeform_tags":                acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"max_session_ttl_in_seconds":   acctest.Representation{RepType: acctest.Optional, Create: `1800`, Update: `3600`},
 		"name":                         acctest.Representation{RepType: acctest.Required, Create: bastionName},
@@ -116,6 +117,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "bastion_type", "STANDARD"),
 				resource.TestCheckResourceAttr(resourceName, "client_cidr_block_allow_list.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "dns_proxy_status", "DISABLED"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "1800"),
@@ -148,6 +150,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "bastion_type", "STANDARD"),
 				resource.TestCheckResourceAttr(resourceName, "client_cidr_block_allow_list.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+				resource.TestCheckResourceAttr(resourceName, "dns_proxy_status", "DISABLED"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "1800"),
@@ -175,6 +178,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "bastion_type", "STANDARD"),
 				resource.TestCheckResourceAttr(resourceName, "client_cidr_block_allow_list.#", "1"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "dns_proxy_status", "DISABLED"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
 				resource.TestCheckResourceAttr(resourceName, "max_session_ttl_in_seconds", "3600"),
@@ -208,6 +212,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "bastions.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "bastions.0.bastion_type", "STANDARD"),
 				resource.TestCheckResourceAttr(datasourceName, "bastions.0.compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(datasourceName, "bastions.0.dns_proxy_status", "DISABLED"),
 				resource.TestCheckResourceAttr(datasourceName, "bastions.0.freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(datasourceName, "bastions.0.id"),
 				resource.TestCheckResourceAttr(datasourceName, "bastions.0.name", bastionName),
@@ -229,6 +234,7 @@ func TestBastionBastionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "bastion_type", "STANDARD"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "client_cidr_block_allow_list.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(singularDatasourceName, "dns_proxy_status", "DISABLED"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "max_session_ttl_in_seconds", "3600"),

diff --git a/internal/integrationtest/bastion_session_test.go b/internal/integrationtest/bastion_session_test.go
@@ -51,15 +51,16 @@ var (
 	BastionsessionRepresentation = map[string]interface{}{
 		"bastion_id":              acctest.Representation{RepType: acctest.Required, Create: `${oci_bastion_bastion.test_bastion.id}`},
 		"key_details":             acctest.RepresentationGroup{RepType: acctest.Required, Group: BastionsessionKeyDetailsRepresentation},
-		"target_resource_details": acctest.RepresentationGroup{RepType: acctest.Required, Group: BastionsessionTargetResourceDetailsRepresentation},
+		"target_resource_details": acctest.RepresentationGroup{RepType: acctest.Required, Group: BastionSessionTargetResourceDetailsRepresentation},
 		"display_name":            acctest.Representation{RepType: acctest.Optional, Create: `managed_ssh`, Update: `managed_ssh2`},
 		"key_type":                acctest.Representation{RepType: acctest.Optional, Create: `PUB`},
 		"session_ttl_in_seconds":  acctest.Representation{RepType: acctest.Optional, Create: `1800`},
 	}
-	BastionsessionTargetResourceDetailsRepresentation = map[string]interface{}{
-		"session_type":       acctest.Representation{RepType: acctest.Required, Create: `MANAGED_SSH`},
-		"target_resource_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_instance.test_instance.id}`},
-		"target_resource_operating_system_user_name": acctest.Representation{RepType: acctest.Required, Create: `opc`},
+	BastionSessionTargetResourceDetailsRepresentation = map[string]interface{}{
+		"session_type":                               acctest.Representation{RepType: acctest.Required, Create: `MANAGED_SSH`},
+		"target_resource_fqdn":                       acctest.Representation{RepType: acctest.Optional, Create: `targetResourceFqdn`},
+		"target_resource_id":                         acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_instance.test_instance.id}`},
+		"target_resource_operating_system_user_name": acctest.Representation{RepType: acctest.Optional, Create: `opc`},
 		"target_resource_port":                       acctest.Representation{RepType: acctest.Optional, Create: `22`},
 		"target_resource_private_ip_address":         acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_instance.test_instance.private_ip}`},
 	}
@@ -270,6 +271,7 @@ func TestBastionSessionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "sessions.0.target_resource_details.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "sessions.0.target_resource_details.0.session_type", "MANAGED_SSH"),
 				resource.TestCheckResourceAttrSet(datasourceName, "sessions.0.target_resource_details.0.target_resource_display_name"),
+				resource.TestCheckResourceAttr(datasourceName, "sessions.0.target_resource_details.0.target_resource_fqdn", "targetResourceFqdn"),
 				resource.TestCheckResourceAttrSet(datasourceName, "sessions.0.target_resource_details.0.target_resource_id"),
 				resource.TestCheckResourceAttrSet(datasourceName, "sessions.0.target_resource_details.0.target_resource_operating_system_user_name"),
 				resource.TestCheckResourceAttr(datasourceName, "sessions.0.target_resource_details.0.target_resource_port", "22"),
@@ -298,6 +300,7 @@ func TestBastionSessionResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "target_resource_details.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "target_resource_details.0.session_type", "MANAGED_SSH"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "target_resource_details.0.target_resource_display_name"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "target_resource_details.0.target_resource_fqdn", "targetResourceFqdn"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "target_resource_details.0.target_resource_port", "22"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "target_resource_details.0.target_resource_private_ip_address"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),

diff --git a/internal/integrationtest/bds_odh_instance_resource_test.go b/internal/integrationtest/bds_odh_instance_resource_test.go
@@ -173,10 +173,14 @@ func TestResourceBdsOdhInstance(t *testing.T) {
 		acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Optional, acctest.Create, bdsInstanceOdhRepresentation), "bds", "bdsInstanceOdh", t)
 
 	acctest.ResourceTest(t, testAccCheckBdsBdsInstanceOdhDestroy, []resource.TestStep{
-		// verify Create
+		// verify Create, cluster will be force stopped after create
 		{
 			Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr +
-				acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Required, acctest.Create, bdsInstanceOdhRepresentation),
+				acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Required, acctest.Create,
+					acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
+						"is_force_stop_jobs": acctest.Representation{RepType: acctest.Required, Create: `true`},
+						"state":              acctest.Representation{RepType: acctest.Required, Create: `INACTIVE`},
+					})),
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
 				resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
@@ -188,6 +192,7 @@ func TestResourceBdsOdhInstance(t *testing.T) {
 				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
 				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
 				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),
+				resource.TestCheckResourceAttr(resourceName, "state", "INACTIVE"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -196,6 +201,29 @@ func TestResourceBdsOdhInstance(t *testing.T) {
 			),
 		},
 
+		// start the cluster
+		{
+			Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr +
+				acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Required, acctest.Create,
+					acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
+						"is_force_stop_jobs": acctest.Representation{RepType: acctest.Required, Create: `true`},
+						"state":              acctest.Representation{RepType: acctest.Required, Create: `ACTIVE`},
+					})),
+			Check: resource.ComposeAggregateTestCheckFunc(
+				resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
+				resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
+				resource.TestCheckResourceAttr(resourceName, "cluster_version", "ODH1"),
+				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttr(resourceName, "is_high_availability", "true"),
+				resource.TestCheckResourceAttr(resourceName, "is_secure", "true"),
+				resource.TestCheckResourceAttr(resourceName, "nodes.#", "9"),
+				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
+				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
+				resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),
+				resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
+			),
+		},
+
 		// delete before next Create
 		{
 			Config: config + compartmentIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr,