Merge pull request #1863 from oracle/release_gh

Releasing version 4.119.0

Author: NagendraNigade

CHANGELOG.md

@@ -141,11 +141,15 @@ variable "monitor_availability_configuration_min_allowed_runs_per_interval" {
 }
 
 variable "monitor_maintenance_window_schedule_time_ended" {
-  default = "2023-02-12T22:47:12.613Z"
+  default = "2025-02-12T22:47:12.613Z"
 }
 
 variable "monitor_maintenance_window_schedule_time_started" {
-  default = "2022-12-18T22:47:12.654Z"
+  default = "2024-12-18T22:47:12.654Z"
+}
+
+variable "vantage_points" {
+  default = ["OraclePublic-us-ashburn-1"]
 }
 
 provider "oci" {
@@ -162,7 +166,7 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
   display_name               = var.monitor_display_name
   monitor_type               = var.monitor_monitor_type
   repeat_interval_in_seconds = var.monitor_repeat_interval_in_seconds
-  vantage_points   = ["OraclePublic-us-ashburn-1"]
+  vantage_points   = var.vantage_points
 
   #Optional
   configuration {

examples/apm/apm_synthetics/monitors/monitor.tf

@@ -26,7 +26,6 @@ variable "node_pool_ssh_public_key" {
 }
 
 variable "kms_vault_id" {
-
 }
 
 variable "node_pool_node_eviction_node_pool_settings_eviction_grace_duration" {
@@ -37,6 +36,18 @@ variable "node_pool_node_eviction_node_pool_settings_is_force_delete_after_grace
   default = false
 }
 
+variable "node_pool_cycling_details_is_node_cycling_enabled" {
+  default = true
+}
+
+variable "node_pool_cycling_details_maximum_surge" {
+  default = "1"
+}
+
+variable "node_pool_cycling_details_maximum_unavailable" {
+  default = "0"
+}
+
 variable "node_pool_state" {
   default = []
 }
@@ -155,7 +166,7 @@ resource "oci_core_subnet" "nodePool_Subnet_2" {
 resource "oci_containerengine_cluster" "test_cluster" {
   #Required
   compartment_id     = var.compartment_ocid
-  kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
+  kubernetes_version = data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[0]
   name               = "tfTestCluster"
   vcn_id             = oci_core_vcn.test_vcn.id
 
@@ -195,10 +206,10 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.test_cluster.id
   compartment_id     = var.compartment_ocid
-  kubernetes_version = reverse(data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions)[0]
+  kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
   name               = "tfPool"
   node_shape         = "VM.Standard2.1"
-  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id, oci_core_subnet.nodePool_Subnet_2.id]
 
   #Optional
   initial_node_labels {
@@ -213,6 +224,13 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
     is_force_delete_after_grace_duration = var.node_pool_node_eviction_node_pool_settings_is_force_delete_after_grace_duration
   }
 
+  node_pool_cycling_details {
+    #Optional
+    is_node_cycling_enabled = var.node_pool_cycling_details_is_node_cycling_enabled
+    maximum_surge           = var.node_pool_cycling_details_maximum_surge
+    maximum_unavailable     = var.node_pool_cycling_details_maximum_unavailable
+  }
+
   node_source_details {
     #Required
     image_id    = local.image_id
@@ -230,10 +248,10 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.test_cluster.id
   compartment_id     = var.compartment_ocid
-  kubernetes_version = reverse(data.oci_containerengine_node_pool_option.test_node_pool_option.kubernetes_versions)[0]
+  kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
   name               = "flexShapePool"
   node_shape         = "VM.Standard.E3.Flex"
-  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
+  subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id, oci_core_subnet.nodePool_Subnet_2.id]
 
   node_source_details {
     #Required

examples/container_engine/main.tf

@@ -76,6 +76,13 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
 #  cpu_core_count_per_node               = 50
 #  total_container_databases             = 12
   compute_model                   = "ECPU"
+
+  //To ignore changes to autonomous_data_storage_size_in_tbs
+  lifecycle {
+    ignore_changes = [
+      autonomous_data_storage_size_in_tbs,
+    ]
+  }
 }
 
 resource "oci_core_network_security_group" "test_network_security_group" {

examples/database/atp-d/exadata.tf

@@ -56,6 +56,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   }
   rotate_key_trigger = "true"
   version_preference = "LATEST_RELEASE_UPDATE"
+  db_version          = "19.18.0.1.0"
 }
 
 resource "random_string" "autonomous_database_admin_password" {

examples/database/atp-d/main.tf

@@ -791,4 +791,4 @@ data "oci_database_management_external_db_system_connectors" "test_external_db_s
 #  #Required
 #  external_db_system_id      = oci_database_management_external_db_system.test_external_db_system.id
 #  enable_database_management = false
-#}
+#}

examples/databasemanagement/main.tf

@@ -8,7 +8,9 @@ variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 variable "stack_mon_management_agent_id_discovery" {}
-
+variable "discovery_job_should_propagate_tags_to_discovered_resources" {
+	default = false
+}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -24,6 +26,7 @@ resource "oci_stack_monitoring_discovery_job" "test_discovery_job" {
 	compartment_id = var.compartment_ocid
 	discovery_client = "LA_SERVICE"
 	discovery_type = "ADD"
+	should_propagate_tags_to_discovered_resources = var.discovery_job_should_propagate_tags_to_discovered_resources
 	discovery_details {
 		#Required
 		agent_id = var.stack_mon_management_agent_id_discovery
@@ -57,6 +60,10 @@ resource "oci_stack_monitoring_discovery_job" "test_discovery_job" {
 			}
 		}
 	}
+	lifecycle {
+		ignore_changes = [
+			discovery_details, system_tags, defined_tags]
+	}
 }
 data "oci_stack_monitoring_discovery_jobs" "test_discovery_jobs" {
   #Required

examples/stack_monitoring/discovery_jobs/discovery_job.tf

@@ -40,6 +40,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource1" {
 		value = "7.0"
 	}
 	resource_time_zone = "en"
+	lifecycle {
+		ignore_changes = [
+			credentials,
+			properties,
+			external_id,
+			defined_tags]
+	}
 }
 resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
 	#Required
@@ -60,6 +67,13 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
 		value = "7.0"
 	}
 	resource_time_zone = "en"
+	lifecycle {
+		ignore_changes = [
+			credentials,
+			properties,
+			external_id,
+			defined_tags]
+	}
 }
 
 resource "oci_stack_monitoring_monitored_resources_associate_monitored_resource" "test_monitored_resources_associate_monitored_resource" {

examples/stack_monitoring/monitored_resource_associate_monitored_resources/monitored_resource_associate_monitored_resource.tf

@@ -40,6 +40,7 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource" {
 		value = "7.0"
 	}
 	resource_time_zone = "en"
+	freeform_tags = { "bar-key" = "test_monitored_resource.value" }
 	lifecycle {
 		ignore_changes = [
 			properties, external_id]

examples/stack_monitoring/monitored_resources/monitored_resource.tf

@@ -40,6 +40,14 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource1" {
 		value = "7.0"
 	}
 	resource_time_zone = "en"
+	freeform_tags = { "bar-key" = "test_monitored_resource1.value" }
+	lifecycle {
+		ignore_changes = [
+			credentials,
+			properties,
+			external_id,
+			defined_tags]
+	}
 }
 resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
 	#Required
@@ -60,6 +68,14 @@ resource "oci_stack_monitoring_monitored_resource" "test_monitored_resource2" {
 		value = "7.0"
 	}
 	resource_time_zone = "en"
+	freeform_tags = { "bar-key" = "test_monitored_resource2.value" }
+	lifecycle {
+		ignore_changes = [
+			credentials,
+			properties,
+			external_id,
+			defined_tags]
+	}
 }
 
 resource "oci_stack_monitoring_monitored_resources_associate_monitored_resource" "test_monitored_resources_associate_monitored_resource" {
@@ -68,6 +84,10 @@ resource "oci_stack_monitoring_monitored_resources_associate_monitored_resource"
 	compartment_id = var.compartment_ocid
 	destination_resource_id = oci_stack_monitoring_monitored_resource.test_monitored_resource2.id
 	source_resource_id = oci_stack_monitoring_monitored_resource.test_monitored_resource1.id
+	lifecycle {
+		ignore_changes = [
+			id]
+	}
 }
 
 resource "oci_stack_monitoring_monitored_resources_list_member" "test_monitored_resources_list_member" {