Merge pull request #1915 from oracle/release_gh

Releasing version 5.4.0

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 5.4.0 (July 12, 2023)
+
+### Added
+- Support for Multitenant support for Workload Identity (WRIS)
+- Support for KMS key Rotation for Block/Boot Volume Backups
+- Support for 3rd VM Cluster Network for DR (Data Guard) | Exa-DB-C@C (ExaCC)
+- Support for Upgrade - Personal to Corporate
+- Support for APM - Synthetics - Disable automatic screenshots - API Only
+- Support migration without SSH to DB Host.
+- Support for Patch One-Off Download Support DBCS-EXaCS-ExaCC Update
+### Bug Fix
+- Adding rack_serial_number in database_exadata_infrastructure_resource.go
+- Resolved Resource Discovery issue for Terraform Version Greater than 1.3
+
 ## 5.3.0 (June 28, 2023)
 
 ### Added

examples/apm/apm_synthetics/monitors/monitor.tf

@@ -40,6 +40,10 @@ variable "monitor_configuration_is_certificate_validation_enabled" {
   default = false
 }
 
+variable "monitor_configuration_is_default_snapshot_enabled" {
+  default = false
+}
+
 variable "monitor_configuration_is_failure_retried" {
   default = false
 }
@@ -185,6 +189,7 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
     is_certificate_validation_enabled = var.monitor_configuration_is_certificate_validation_enabled
     is_failure_retried                = var.monitor_configuration_is_failure_retried
     is_redirection_enabled            = var.monitor_configuration_is_redirection_enabled
+    is_default_snapshot_enabled       = var.monitor_configuration_is_default_snapshot_enabled
 
     #Optional
     network_configuration {

examples/compute/instance/rd/core.tf

@@ -0,0 +1,6 @@
+## This is tmp config to run import for resources
+data "oci_core_instance" "test_instance" {
+    #Required
+    instance_id = "ocid1.instance.oc1.phx.anyhqljsjcdxrhqcovs45jnvimoshybmoddqtuf2xy5zzq3ph3fuwj7ugbla"
+}
+

examples/compute/instance/rd/provider.tf

@@ -0,0 +1,3 @@
+provider oci {
+	region = var.region
+}

examples/compute/instance/rd/vars.tf

@@ -0,0 +1,3 @@
+variable region { default = "us-phoenix-1" }
+variable tenancy_ocid { default = "ocid1.tenancy.oc1..aaaaaaaagkbzgg6lpzrf47xzy4rjoxg4de6ncfiq2rncmjiujvy2hjgxvziq" }
+variable compartment_ocid { default = "ocid1.tenancy.oc1..aaaaaaaagkbzgg6lpzrf47xzy4rjoxg4de6ncfiq2rncmjiujvy2hjgxvziq" }

examples/container_engine/main.tf

@@ -52,6 +52,22 @@ variable "node_pool_state" {
   default = []
 }
 
+variable "cluster_workload_mapping_namespace" {
+  default = "namespace"
+}
+
+variable "cluster_workload_mapping_defined_tags_value" {
+  default = "value"
+}
+
+variable "cluster_workload_mapping_freeform_tags" {
+  default = { "Department" = "Finance" }
+}
+
+variable defined_tag_namespace_name {
+  default = "test"
+}
+
 provider "oci" {
   region           = var.region
   tenancy_ocid     = var.tenancy_ocid
@@ -60,6 +76,24 @@ provider "oci" {
   private_key_path = var.private_key_path
 }
 
+resource "oci_identity_tag_namespace" "tag-namespace1" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  description = "example tag namespace"
+  name = var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"
+
+  is_retired = false
+}
+
+resource "oci_identity_tag" "tag1" {
+  #Required
+  description = "example tag"
+  name = "example-tag"
+  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
+
+  is_retired = false
+}
+
 data "oci_identity_availability_domain" "ad1" {
   compartment_id = var.tenancy_ocid
   ad_number      = 1
@@ -268,6 +302,17 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
   ssh_public_key      = var.node_pool_ssh_public_key
 }
 
+resource "oci_containerengine_cluster_workload_mapping" "test_cluster_workload_mapping" {
+  #Required"
+  cluster_id            = oci_containerengine_cluster.test_cluster.id
+  mapped_compartment_id = var.compartment_ocid
+  namespace             = var.cluster_workload_mapping_namespace
+
+  #Optional
+  defined_tags  = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "${var.cluster_workload_mapping_defined_tags_value}"}
+  freeform_tags = var.cluster_workload_mapping_freeform_tags
+}
+
 output "cluster" {
   value = {
     id                 = oci_containerengine_cluster.test_cluster.id

examples/database/exadata_cc_3rd_network/exadata-infrastructure.tf

@@ -0,0 +1,153 @@
+// Copyright (c) 2017, 2023, 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 "ssh_public_key" {
+  default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCoUma91jRZV5yeAv46/JRFbd7t7J+yfopdvhh+aO3e7IFpQymdiWaTXFbONJnAqIGP90ux5icYEoNNTkcD1uf+kN/nPBjtUkla2PGNsZOkNFkQTVQxqHnGuLznP259MhCpWDXPnuwYGbsTT0LodWh9nq1v52viL7D/R6GJSz63IkgKqVebuSbqA+51hNwcpDic8MQ19Ilb0Z+sY7bGZnR2GTFNa6Bm9UGWAArOZ4ER453CmN96lX3KbimI6iW85Eny4OCndwOjK25JHXI4A7K3GVMoplyJtjBM5ExC7Xt3/L3yDNiF3oZbdHd3OQtmjajQeub2NlVU6+8AQJK/ecODQ7+S6DTZuPUma5KLEOMDXjrzYjXbBEkZaxu7kQK+KBIdhqSpkeZUr4OB+Qumd9B/WjMJOzLGLt1uJ2x7lgKlrDIfXAwWYm1cHEE0K7kDVFLtGEayF6E4cIHw70OoOyq6CSxaphkIFvsBYFfFx1rc8w1upKokzi489ij53mY/r8M= [email protected]"
+}
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = "us-ashburn-1"
+  //version          = "4.121.0"
+}
+
+resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
+  #Required
+  admin_network_cidr          = "192.168.0.0/16"
+  cloud_control_plane_server1 = "10.32.88.1"
+  cloud_control_plane_server2 = "10.32.88.3"
+  compartment_id              = var.compartment_ocid
+  display_name                = "tstExaInfra"
+  dns_server                  = ["10.231.225.65"]
+  gateway                     = "10.32.88.5"
+  infini_band_network_cidr    = "10.31.8.0/21"
+  netmask                     = "255.255.255.0"
+  ntp_server                  = ["10.231.225.76"]
+  shape                       = "ExadataCC.X7"
+  time_zone                   = "US/Pacific"
+  activation_file             = "activation.zip"
+  storage_count               = 3
+  compute_count               = 2
+  is_cps_offline_report_enabled = false
+  is_multi_rack_deployment      = false
+
+  #Optional
+  network_bonding_mode_details {
+    backup_network_bonding_mode = "ACTIVE_BACKUP"
+    client_network_bonding_mode = "ACTIVE_BACKUP"
+  }
+
+  #Optional
+  contacts {
+    email        = "[email protected]"
+    is_primary   = "true"
+    name         = "name"
+    phone_number = "1234567891"
+  }
+
+  corporate_proxy = "http://192.168.19.1:80"
+  /*defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
+  }
+
+  freeform_tags = {
+    "Department" = "Accounting"
+  }*/
+
+  maintenance_window {
+    preference = "CUSTOM_PREFERENCE"
+
+    days_of_week {
+      name = "TUESDAY"
+    }
+
+    hours_of_day = ["4"]
+    lead_time_in_weeks = 2
+
+    months {
+      name = "JANUARY"
+    }
+
+    months {
+      name = "APRIL"
+    }
+
+    months {
+      name = "JULY"
+    }
+
+    months {
+      name = "OCTOBER"
+    }
+
+    weeks_of_month = ["2"]
+
+    patching_mode = "ROLLING"
+
+    is_custom_action_timeout_enabled = true
+
+    custom_action_timeout_in_mins = 30
+  }
+
+}
+
+data "oci_database_exadata_infrastructure_download_config_file" "test_exadata_infrastructure_download_config_file" {
+  #Required
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
+
+  #Optional
+  base64_encode_content = true
+}
+
+data "oci_database_exadata_infrastructures" "test_exadata_infrastructures" {
+  #Required
+  compartment_id = var.compartment_ocid
+}
+
+/*
+resource "oci_identity_tag_namespace" "tag-namespace1" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  description    = "tagNamespace1"
+  name           = "testexamples-tag-namespace1"
+}
+
+resource "oci_identity_tag" "tag1" {
+  #Required
+  description      = "tf example tag"
+  name             = "tf-example-tag"
+  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
+}
+*/
+
+data "oci_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = 1
+}
+
+resource "local_file" "test_exadata_infrastructure_downloaded_config_file" {
+  content  = data.oci_database_exadata_infrastructure_download_config_file.test_exadata_infrastructure_download_config_file.content
+  filename = "${path.module}/exadata_infrastructure_config.zip"
+}
+

examples/database/exadata_cc_3rd_network/exadata_infrastructure_config.zip

@@ -0,0 +1 @@
+ZmFrZV9leGFjY19pbmZyYXN0cnVjdHVyZV9jb25maWc=