Merge pull request #2113 from oracle/release_gh

Release gh

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 5.42.0 (May 15, 2024)
+
+### Added
+- VCNIP Provide IP Inventory view and IP Utilization alerts
+- Support for ExaDB-C@C Resize of Local Files Systems (non /u02)
+- Support for [DMS] Fixing AWS_S3 issue in the example file
+- Support for OCI NLB Proxy Protocol Support
+- Support for Email Delivery: Custom Return Path API
+session resumption support for LB
+- Support for OS Management Hub - OCI Instance Support & ALX Support
+- Create_management resource for Masking Report in Data Safe
+### Bug Fix
+- fix oci_log_analytics_namespace import issue
+
 ## 5.41.0 (May 07, 2024)
 
 ### Added

examples/databasemigration/migration/migration.tf

@@ -241,6 +241,12 @@ resource "oci_database_migration_connection" "test_connection_target_usr_managed
   }
 }
 
+variable "secret_access_key" {
+  default = ""
+}
+variable "access_key_id" {
+  default = ""
+}
 resource "oci_database_migration_migration" "test_migration" {
   compartment_id = var.compartment_id
 
@@ -263,14 +269,14 @@ resource "oci_database_migration_migration" "test_migration" {
   }
   data_transfer_medium_details_v2 {
     type = "AWS_S3"
-    access_key_id = "AKIA4XMMNYWWF4PYZ3EW"
+    access_key_id = var.access_key_id
     object_storage_bucket {
       bucket = "bucket"
       namespace = "namespace"
     }
     name = "AWS-S3"
     region = "Ashburn"
-    secret_access_key = "3xYJLMQkRDROe7/QzrZTgRDzeq2akfkn+Hb+C95D"
+    secret_access_key = var.secret_access_key
   }
   datapump_settings {
     export_directory_object {
@@ -408,4 +414,4 @@ resource "oci_database_migration_migration" "test_no_ssh_migration" {
 output "password" {
   sensitive = true
   value = random_string.autonomous_database_admin_password.result
-}
+}

examples/datasafe/masking_report_management/masking_report_management.tf

@@ -0,0 +1,26 @@
+// 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 "data_safe_target_ocid" {}
+variable "masking_policy_id" {}
+
+
+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_data_safe_masking_report_management" "test_masking_report_management" {
+  #Required
+  target_id = var.data_safe_target_ocid
+  masking_policy_id = var.masking_policy_id
+}

examples/email/emailreturnpath.tf

@@ -0,0 +1,51 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+
+variable "email_return_path_state" {
+	default = "ACTIVE"
+}
+
+variable "domain_verification_id" {
+
+}
+
+variable "email_domain" {
+	default = "objdomain.email.ap-mumbai-1.oci.oc-test.com"
+}
+
+variable "description" {
+	default = "description2"
+}
+
+variable "department" {
+	default = "Accounting"
+}
+
+
+data "oci_email_email_return_paths" "test_email_return_paths" {
+	compartment_id = var.compartment_ocid
+	filter {
+		name = "id"
+		values = ["${oci_email_email_return_path.test_email_return_path.id}"]
+	}
+	id = "${oci_email_email_return_path.test_email_return_path.id}"
+	name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
+	parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
+	state = var.email_return_path_state
+}
+
+resource "oci_email_email_domain" "test_email_domain_rp" {
+	compartment_id = var.compartment_ocid
+	domain_verification_id = var.domain_verification_id
+	name = var.email_domain
+}
+
+resource "oci_email_email_return_path" "test_email_return_path" {
+	description = var.description
+	freeform_tags = {
+		"Department" = var.department
+	}
+	name = "tfrp.${oci_email_email_domain.test_email_domain_rp.name}"
+	parent_resource_id = "${oci_email_email_domain.test_email_domain_rp.id}"
+}

examples/email/provider.tf

@@ -22,7 +22,7 @@ variable "compartment_ocid" {
 }
 
 variable "region" {
-  default = "us-ashburn-1"
+  default = "ap-mumbai-1"
 }
 
 provider "oci" {

examples/load_balancer/lb_full/lb_full.tf

@@ -461,6 +461,7 @@ resource "oci_load_balancer_listener" "lb-listener2" {
     protocols               = ["TLSv1.1", "TLSv1.2"]
     server_order_preference = "ENABLED"
     cipher_suite_name       = oci_load_balancer_ssl_cipher_suite.test_ssl_cipher_suite.name
+    has_session_resumption  = true
   }
 }
 
@@ -492,6 +493,7 @@ resource "oci_load_balancer_listener" "lb-listener4" {
     protocols                          = ["TLSv1.1", "TLSv1.2"]
     server_order_preference            = "ENABLED"
     cipher_suite_name                  = oci_load_balancer_ssl_cipher_suite.test_ssl_cipher_suite3.name
+    has_session_resumption             = true
   }
 }
 

examples/network_load_balancer/network_load_balancer_full/nlb_full.tf

@@ -380,15 +380,16 @@ resource "oci_network_load_balancer_backend_set" "nlb-bes2" {
     interval_in_millis  = 10000
     retries             = 3
   }
-  depends_on   = [oci_network_load_balancer_backend_set.nlb-bes1]
+
+  depends_on            = [oci_network_load_balancer_backend_set.nlb-bes1]
 }
 
 resource "oci_network_load_balancer_backend_set" "nlb-bes3" {
   name                     = "nlb-bes3"
   network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id
   policy                   = "THREE_TUPLE"
   is_fail_open = false
-  is_instant_failover_enabled = false
+  is_instant_failover_enabled = true
 
 
   health_checker {
@@ -414,6 +415,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener1" {
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes1.name
   port                        = 80
   protocol                    = "TCP"
+  is_ppv2enabled	          = true
   depends_on = [oci_network_load_balancer_backend_set.nlb-bes3]
 }
 

examples/networking/ip_inventory/ip_inventory.tf

@@ -0,0 +1,55 @@
+// 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 "vcn_ocid" {
+}
+
+variable "subnet_ocid" {
+}
+
+variable "ip_inventory_vcn_overlap_compartment_list" {
+  type = list(string)
+  default = []
+}
+
+variable "ip_inventory_vcn_overlap_region_list" {
+  type = list(string)
+  default = []
+}
+
+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
+}
+
+// Get VCN Overlap
+data "oci_core_ip_inventory_vcn_overlaps" "test_ip_inventory_vcn_overlaps" {
+  #Required
+  compartment_list = var.ip_inventory_vcn_overlap_compartment_list
+  region_list      = var.ip_inventory_vcn_overlap_region_list
+  vcn_id           = var.vcn_ocid
+}
+
+// Subnet CIDR Utilisation
+data "oci_core_ip_inventory_subnet_cidr" "test_ip_inventory_subnet_cidrs" {
+  #Required
+  subnet_id = var.subnet_ocid
+}
+
+// Subnet Details
+data "oci_core_ip_inventory_subnet" "test_ip_inventory_subnets" {
+  #Required
+  subnet_id = var.subnet_ocid
+}

examples/os_management_hub/entitlement/main.tf

@@ -0,0 +1,26 @@
+// 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_id" {}
+variable "lifecycle_stage_id" {} 
+
+
+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
+}
+
+# List all entitlements in a compartment
+# --------------------------------------
+data "oci_os_management_hub_entitlements" "test_entitlements" {
+  compartment_id = "${var.compartment_id}"
+}
+

examples/os_management_hub/erratum/main.tf

@@ -0,0 +1,46 @@
+// 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_id" {}
+
+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
+}
+
+
+data "oci_os_management_hub_errata" "test_errata" {
+  #Required
+  compartment_id = "${var.compartment_id}"
+
+  #Optional
+  name = ["ELBA-2024-12244"]
+  name_contains = "ELBA-2024-12244"
+}
+
+data "oci_os_management_hub_errata" "test_errata_2" {
+  #Required
+  compartment_id = "${var.compartment_id}"
+
+  #Optional
+  classification_type = ["BUGFIX"]
+  name = ["ELBA-2024-12244"]
+  name_contains = "ELBA-2024-12244"
+  os_family = "ORACLE_LINUX_9"
+  time_issue_date_end = "2024-04-01T00:00:00.000Z"
+  time_issue_date_start = "2024-03-20T00:00:00.000Z"
+}
+
+
+data "oci_os_management_hub_erratum" "test_erratum" {
+  compartment_id = "${var.compartment_id}"
+  name = "ELBA-2024-12244"
+}

examples/os_management_hub/event/main.tf

@@ -0,0 +1,56 @@
+// 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_id" {}
+variable "event_id" {}
+variable "osmh_managed_instance_ocid" {}
+
+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
+}
+
+
+# Event has no public create API. Refer to https://confluence.oci.oraclecorp.com/x/Q5W15Q for creating events.
+
+### Event
+# Update tag and compartment
+resource "oci_os_management_hub_event" "test_event" {
+  compartment_id = "${var.compartment_id}"
+  event_id = "${var.event_id}"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+}
+
+# List Event
+
+data "oci_os_management_hub_events" "test_events" {
+  compartment_id = "${var.compartment_id}"
+  event_summary = "Manually created event 2 for testing caused by <Yijiu>"
+  event_summary_contains = "testing"
+  filter {
+    name = "id"
+    values = ["${var.event_id}"]
+  }
+  id = "${var.event_id}"
+  is_managed_by_autonomous_linux = "true"
+  resource_id = "${var.osmh_managed_instance_ocid}"
+  state = "ACTIVE"
+  time_created_greater_than_or_equal_to = "2018-01-01T00:00:00.000Z"
+  time_created_less_than = "2088-01-01T00:00:00.000Z"
+  type = ["EXPLOIT_ATTEMPT"]
+}
+
+# Get Event
+data "oci_os_management_hub_event" "test_event" {
+  # Required
+  event_id = "${var.event_id}"
+}