Merge pull request #2230 from oracle/release_gh

Releasing version 6.15.0

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 6.15.0 (October 23, 2024)
+
+### Added
+- Support for FSS Resource Locking
+- Support for ADB-S: Customer Managed Keys via Azure Key Vault and AWS KMS
+- Compute support for ZPR
+- nlb-cp zpr support
+- Support for Add DB 23ai support to Globally Distributed Autonomous Database
+- Support for OCI Data Science Model Store Backup and Retention
+- Support for FC Redundancy Project
+
+### Bug Fix
+- For the ACD Version selection using env variable and vmNetwork should not consider state for calculating hash
+- Fixed the timestamp issue to corrected form
+
 ## 6.14.0 (October 16, 2024)
 
 ### Added

examples/compute/instance/instance.tf

@@ -153,6 +153,11 @@ resource "oci_core_instance" "test_instance" {
     "freeformkey${count.index}" = "freeformvalue${count.index}"
   }
 
+  security_attributes = {
+    "oracle-zpr.sensitivity.value" = "low"
+    "oracle-zpr.sensitivity.mode" = "enforce"
+  }
+
   preemptible_instance_config {
     preemption_action {
       type = "TERMINATE"

examples/compute/vnic/vnic.tf

@@ -94,6 +94,11 @@ resource "oci_core_instance" "test_instance" {
   create_vnic_details {
     subnet_id      = oci_core_subnet.test_subnet.id
     hostname_label = "testinstance"
+
+    security_attributes = {
+      "oracle-zpr.sensitivity.value" = "low"
+      "oracle-zpr.sensitivity.mode" = "enforce"
+    }
   }
 
   metadata = {

examples/database/adb/encryption_key/autonomous_database_encryption_key.tf

@@ -0,0 +1,42 @@
+// 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" {
+}
+
+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_database_autonomous_database" "test_autonomous_database" {
+  admin_password           = "BEstrO0ng_#11"
+  compartment_id           = var.compartment_ocid
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "Xsk5djnfdl23423"
+  db_version               = "19c"
+  db_workload              = "AJD"
+  license_model            = "LICENSE_INCLUDED"
+  encryption_key {
+    autonomous_database_provider = "ORACLE_MANAGED"
+  }
+}

examples/database/adb/scheduled_operation/autonomous_database_scheduled_operations.tf

@@ -0,0 +1,58 @@
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+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_database_autonomous_database" "autonomous_database" {
+  #required
+  admin_password = "Ka2P7jb1_3?*##DZ"
+  compartment_id = "ocid1.tenancy.oc1..aaaaaaaayxnndmkzcpajuuptcojciksbdrlwofhbe3hve6lypcqfgx56ssva"
+  cpu_core_count = "6"
+  data_storage_size_in_tbs = "1"
+  db_name  = "testdbScheduledOperations"
+  customer_contacts {
+    email = "test1@oracle.com"
+  }
+  customer_contacts {
+    email = "test2@oracle.com"
+  }
+  scheduled_operations {
+    day_of_week {
+      name = "MONDAY"
+    }
+    scheduled_start_time = "10:00"
+    scheduled_stop_time = "18:00"
+  }
+  scheduled_operations {
+      day_of_week {
+        name = "TUESDAY"
+      }
+      scheduled_start_time = "10:00"
+      scheduled_stop_time = "18:00"
+    }
+  scheduled_operations {
+    day_of_week {
+      name = "FRIDAY"
+    }
+    scheduled_start_time = "10:00"
+    scheduled_stop_time = "18:00"
+  }
+}

examples/globally_distributed_database/description.md → examples/globally_distributed_database/globally_distributed_database_19c/description.md

@@ -1,2 +1,2 @@
 # Overview
-This is a Terraform configuration that creates the Globally Distributed Database service on Oracle Cloud Infrastructure.
+This is a Terraform configuration that creates the Globally Distributed Database 19c service on Oracle Cloud Infrastructure.

examples/globally_distributed_database/oci_globally_distributed_database_private_endpoints.tf → examples/globally_distributed_database/globally_distributed_database_19c/oci_globally_distributed_database_private_endpoints.tf

@@ -9,4 +9,10 @@ resource "oci_globally_distributed_database_private_endpoint" "this" {
   description = "Test OCI Globally Distributed Database Private Endpoint"
   #freeform_tags = var.oci_globally_distributed_database_freeform_tags
   nsg_ids = var.nsg_ocids
+
+  lifecycle {
+    ignore_changes = [
+      sharded_databases,
+    ]
+  }
 }

examples/globally_distributed_database/outputs.tf → examples/globally_distributed_database/globally_distributed_database_19c/outputs.tf

@@ -11,7 +11,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
     oci_globally_distributed_database_sharded_database = {
       catalog_details = [
         for catalog_detail in oci_globally_distributed_database_sharded_database.this.catalog_details : {
-          admin_password                      = nonsensitive(catalog_detail.admin_password)
+          //admin_password                      = nonsensitive(catalog_detail.admin_password)
           cloud_autonomous_vm_cluster_id      = catalog_detail.cloud_autonomous_vm_cluster_id
           compute_count                       = catalog_detail.compute_count
           container_database_id               = catalog_detail.container_database_id
@@ -58,7 +58,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
       private_endpoint        = oci_globally_distributed_database_sharded_database.this.private_endpoint
       shard_details = [
         for shard_detail in oci_globally_distributed_database_sharded_database.this.shard_details : {
-          admin_password                      = nonsensitive(shard_detail.admin_password)
+          //admin_password                      = nonsensitive(shard_detail.admin_password)
           cloud_autonomous_vm_cluster_id      = shard_detail.cloud_autonomous_vm_cluster_id
           compute_count                       = shard_detail.compute_count
           container_database_id               = shard_detail.container_database_id
@@ -94,6 +94,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
     data_source_sharded_database  = data.oci_globally_distributed_database_sharded_database.this
     data_source_sharded_databases = data.oci_globally_distributed_database_sharded_databases.this
   }
+  sensitive = true
 }
 
 output "oci_globally_distributed_database_sharded_database" {

examples/globally_distributed_database/provider.tf → examples/globally_distributed_database/globally_distributed_database_19c/provider.tf

@@ -10,7 +10,5 @@ provider "oci" {
   region              = var.region
 }
 
-provider "local" {
-  version = ">=1.3.0" # Need this version of the local provider to support base64 encoded inputs
-}
+
 

examples/globally_distributed_database/globally_distributed_database_23ai/datasources.tf

@@ -0,0 +1,30 @@
+data "oci_globally_distributed_database_private_endpoint" "this" {
+  #Required
+  private_endpoint_id = oci_globally_distributed_database_private_endpoint.this.id
+}
+
+data "oci_globally_distributed_database_private_endpoints" "this" {
+  #Required
+  compartment_id = oci_globally_distributed_database_private_endpoint.this.compartment_id
+
+  #Optional
+  display_name = oci_globally_distributed_database_private_endpoint.this.display_name
+  state        = oci_globally_distributed_database_private_endpoint.this.state
+}
+
+data "oci_globally_distributed_database_sharded_database" "this" {
+  #Required
+  sharded_database_id = oci_globally_distributed_database_sharded_database.this.id
+
+  #Optional
+  metadata = "test" //oci_globally_distributed_database_sharded_database.this.metadata
+}
+
+data "oci_globally_distributed_database_sharded_databases" "this" {
+  #Required
+  compartment_id = oci_globally_distributed_database_sharded_database.this.compartment_id
+
+  #Optional
+  display_name = oci_globally_distributed_database_sharded_database.this.display_name
+  state        = oci_globally_distributed_database_sharded_database.this.state
+}

examples/globally_distributed_database/globally_distributed_database_23ai/description.md

@@ -0,0 +1,2 @@
+# Overview
+This is a Terraform configuration that creates the Globally Distributed Database 23ai service on Oracle Cloud Infrastructure.

examples/globally_distributed_database/globally_distributed_database_23ai/oci_globally_distributed_database_private_endpoints.tf

@@ -0,0 +1,18 @@
+resource "oci_globally_distributed_database_private_endpoint" "this" {
+  #Required
+  compartment_id = var.compartment_ocid
+  display_name   = "GloballyDistributedDB23ai-PrivateEndpoint-Example"
+  subnet_id      = var.subnet_ocid
+
+  #Optional
+  #defined_tags  = var.oci_globally_distributed_database_defined_tags_value
+  description = "Test OCI Globally Distributed Database 23ai Private Endpoint"
+  #freeform_tags = var.oci_globally_distributed_database_freeform_tags
+  nsg_ids = var.nsg_ocids
+
+  lifecycle {
+    ignore_changes = [
+      sharded_databases,
+    ]
+  }
+}

examples/globally_distributed_database/globally_distributed_database_23ai/oci_globally_distributed_database_sharded_databases.tf

@@ -0,0 +1,121 @@
+
+// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates.  All rights reserved.
+// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+// Code generated. DO NOT EDIT.
+
+resource "oci_globally_distributed_database_sharded_database" "this" {
+  #Required
+  catalog_details {
+    #Required
+    admin_password                      = var.ogdd_sharded_database_catalog_details_admin_password
+    cloud_autonomous_vm_cluster_id      = var.ogdd_sharded_database_catalog_details_cloud_autonomous_vm_cluster_id
+    compute_count                       = var.ogdd_sharded_database_catalog_details_compute_count
+    data_storage_size_in_gbs            = var.ogdd_sharded_database_catalog_details_data_storage_size_in_gbs
+    is_auto_scaling_enabled             = var.ogdd_sharded_database_catalog_details_is_auto_scaling_enabled
+    peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_catalog_details_peer_cloud_autonomous_vm_cluster_id
+  }
+
+  character_set      = var.ogdd_sharded_database_character_set
+  compartment_id     = var.compartment_ocid
+  db_deployment_type = var.ogdd_sharded_database_db_deployment_type
+  db_version         = var.ogdd_sharded_database_db_version
+  db_workload        = var.ogdd_sharded_database_db_workload
+  display_name       = "GloballyDistributedDB23ai-Sharded-Database-Example"
+  listener_port      = var.ogdd_sharded_database_listener_port
+  listener_port_tls  = var.listener_port_tls
+  ncharacter_set     = var.ogdd_sharded_database_ncharacter_set
+  ons_port_local     = var.ogdd_sharded_database_ons_port_local
+  ons_port_remote    = var.ogdd_sharded_database_ons_port_remote
+  prefix             = var.ogdd_sharded_database_prefix
+  replication_method = var.oci_globally_distributed_database_replication_method
+  replication_factor = var.oci_globally_distributed_database_replication_factor
+  replication_unit   = var.oci_globally_distributed_database_replication_unit
+
+  shard_details {
+    #Required
+    admin_password                      = var.ogdd_sharded_database_shard_details_admin_password
+    cloud_autonomous_vm_cluster_id      = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
+    compute_count                       = var.ogdd_sharded_database_shard_details_compute_count
+    data_storage_size_in_gbs            = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
+    is_auto_scaling_enabled             = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
+    peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
+    shard_space                         = var.ogdd_sharded_database_shard_details_shard_space
+    encryption_key_details {
+      vault_id           = var.vault_id
+      kms_key_id         = var.kms_key_id
+      kms_key_version_id = var.kms_key_version_id
+    }
+  }
+
+    shard_details {
+    #Required
+    admin_password                      = var.ogdd_sharded_database_shard_details_admin_password
+    //cloud_autonomous_vm_cluster_id      = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
+    cloud_autonomous_vm_cluster_id      = "ocid of the cluster id"
+    compute_count                       = var.ogdd_sharded_database_shard_details_compute_count
+    data_storage_size_in_gbs            = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
+    is_auto_scaling_enabled             = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
+    peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
+    shard_space                         = var.ogdd_sharded_database_shard_details_shard_space
+    encryption_key_details {
+      vault_id           = var.vault_id
+      kms_key_id         = var.kms_key_id
+      kms_key_version_id = var.kms_key_version_id
+    }
+  }
+  shard_details {
+    #Required
+    admin_password                      = var.ogdd_sharded_database_shard_details_admin_password
+    //cloud_autonomous_vm_cluster_id      = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
+    cloud_autonomous_vm_cluster_id = "ocid of the cluster id"
+    compute_count                       = var.ogdd_sharded_database_shard_details_compute_count
+    data_storage_size_in_gbs            = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
+    is_auto_scaling_enabled             = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
+    peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
+    shard_space                         = var.ogdd_sharded_database_shard_details_shard_space
+    encryption_key_details {
+      vault_id           = var.vault_id
+      kms_key_id         = var.kms_key_id
+      kms_key_version_id = var.kms_key_version_id
+    }
+  }
+
+  sharding_method                 = var.ogdd_sharded_database_sharding_method
+  chunks                          = var.ogdd_sharded_database_chunks
+  cluster_certificate_common_name = var.ogdd_sharded_database_cluster_certificate_common_name
+  #defined_tags                    = var.oci_globally_distributed_database_defined_tags_value
+  #freeform_tags                   = var.oci_globally_distributed_database_freeform_tags
+
+  # POST OPERATIONS
+  # POST operations will only be performed if the corresponding trigger is not NULL, is != 0 and is greater than the previous value.
+
+  configure_sharding_trigger                            = var.oci_globally_distributed_database_configure_sharding_trigger
+  download_gsm_certificate_signing_request_trigger      = var.oci_globally_distributed_database_download_gsm_certificate_signing_request_trigger
+  generate_gsm_certificate_signing_request_trigger      = var.oci_globally_distributed_database_generate_gsm_certificate_signing_request_trigger
+  get_connection_string_trigger                         = var.oci_globally_distributed_database_get_connection_string_trigger
+  start_database_trigger                                = var.oci_globally_distributed_database_start_database_trigger
+  stop_database_trigger                                 = var.oci_globally_distributed_database_stop_database_trigger
+  validate_network_trigger                              = var.oci_globally_distributed_database_validate_network_trigger
+  upload_signed_certificate_and_generate_wallet_trigger = var.oci_globally_distributed_database_upload_signed_certificate_and_generate_wallet
+  ca_signed_certificate                                 = null//file(var.oci_globally_distributed_database_ca_signed_certificate)
+  configure_gsms_trigger                                = var.oci_globally_distributed_database_configure_gsms_trigger
+  configure_gsms_trigger_old_gsm_names                  = var.oci_globally_distributed_database_configure_gsms_trigger_old_gsm_names
+  configure_gsms_trigger_is_latest_gsm_image            = var.oci_globally_distributed_database_configure_gsms_trigger_is_latest_gsm_image
+  generate_wallet_trigger                               = var.oci_globally_distributed_database_generate_wallet
+  generate_wallet_password                              = var.oci_globally_distributed_database_generate_wallet_password
+
+  # PATCH Operations
+  /*
+  patch_operations {
+    #Required
+    operation = var.oci_globally_distributed_database_patch_operation_operation
+    selection = var.oci_globally_distributed_database_patch_operation_selection
+
+    #Optional
+    value = var.oci_globally_distributed_database_patch_operation_value
+  }
+  */
+
+  depends_on = [oci_globally_distributed_database_private_endpoint.this]
+}
+