Merge pull request #2269 from oracle/release_gh

Releasing version 6.22.0

Author: ganbaras

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.22.0 (January 16, 2025)
+
+### Added
+- Source based routing support
+- Support for Windows BYOL for VMs
+- Support for ADB-S: Allow Changing Patch Level Provisioning
+- Support for OpenSearch Cross Cluster Search V2
+- Support for ADB-S: Backup Retention Lock
+- Support for StackMonitoring: Metric Extensions : Advanced Support and Integration
+- Support for Extend OBP cloud service to include new SKUs for Digital Assets editions
+- Support for Data Science: Support Private Endpoint Access for Model Deployment
+- Support for Add ZeroETL as a resource in GoldenGate Cloud Service
+- Support Llama 3.2 unit shape in Generative AI service
+- Support for BDS 3.0.29 Release - Feature Enhancements
+### Bug Fix
+- BaseDB CP - Fixing Integration Tests: Database Upgrade & Database Upgrade from Database Software Image
+- ExaDB-XS VM Cluster Getting Replaced due to HostName Case Mismatch
+
+
 ## 6.21.0 (December 19, 2024)
 
 ### Added

examples/compute/instance/instance_with_license_configs.tf

@@ -0,0 +1,85 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "windows_instance_shape" {
+  default = "VM.Standard2.1"
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.1.0.0/16"
+  compartment_id = var.compartment_ocid
+  display_name   = "TestVcn"
+  dns_label      = "testvcn"
+}
+
+resource "oci_core_internet_gateway" "test_internet_gateway" {
+  compartment_id = var.compartment_ocid
+  display_name   = "TestInternetGateway"
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
+resource "oci_core_default_route_table" "default_route_table" {
+  manage_default_resource_id = oci_core_vcn.test_vcn.default_route_table_id
+  display_name               = "DefaultRouteTable"
+
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.test_internet_gateway.id
+  }
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  cidr_block          = "10.1.20.0/24"
+  display_name        = "TestSubnet"
+  dns_label           = "testsubnet"
+  security_list_ids   = [oci_core_vcn.test_vcn.default_security_list_id]
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.test_vcn.id
+  route_table_id      = oci_core_vcn.test_vcn.default_route_table_id
+  dhcp_options_id     = oci_core_vcn.test_vcn.default_dhcp_options_id
+}
+
+data "oci_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = 1
+}
+
+resource "oci_core_instance" "test_instance_with_license_config" {
+  count               = 1
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "TestInstance${count.index}"
+  shape               = var.windows_instance_shape
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.test_subnet.id
+    display_name     = "Primaryvnic"
+  }
+
+  licensing_configs {
+    type = "WINDOWS"
+    license_type = "OCI_PROVIDED"
+  }
+
+  source_details {
+    source_type = "image"
+    source_id   = data.oci_core_images.supported_windows_shape_images.images[0]["id"]
+  }
+
+  timeouts {
+    create = "60m"
+  }
+}
+
+output "supported_windows_shape_images" {
+  value = data.oci_core_images.supported_windows_shape_images.images[0]["id"]
+}
+
+# Gets a list of all images that support a given Instance shape
+data "oci_core_images" "supported_windows_shape_images" {
+  compartment_id   = var.tenancy_ocid
+  shape            = var.windows_instance_shape
+  operating_system = "Windows"
+}

examples/compute/instance_pool/instance_configuration.tf

@@ -0,0 +1,115 @@
+variable "windows_instance_shape" {
+  default = "VM.Standard2.1"
+}
+
+resource "oci_core_instance_configuration" "test_instance_configuration" {
+  compartment_id = var.compartment_ocid
+  display_name   = "TestInstanceConfiguration"
+
+  instance_details {
+    instance_type = "compute"
+
+    /*
+      Attach multiple block volumes
+    */
+    block_volumes {
+      create_details {
+        compartment_id       = var.compartment_ocid
+        display_name         = "TestCreateVolumeDetails-1"
+        availability_domain  = data.oci_identity_availability_domain.ad.name
+        size_in_gbs          = 50
+        vpus_per_gb          = 20 // min vpus
+        is_auto_tune_enabled = false
+        block_volume_replicas {
+          display_name        = "TestCreateVolumeDetails-1"
+          availability_domain = data.oci_identity_availability_domain.ad.name
+        }
+      }
+
+      attach_details {
+        type                                = "paravirtualized"
+        display_name                        = "TestAttachVolumeDetails-1"
+        is_read_only                        = true
+        is_shareable                        = true
+      }
+    }
+
+    block_volumes {
+      create_details {
+        compartment_id      = var.compartment_ocid
+        display_name        = "TestCreateVolumeDetails-2"
+        availability_domain = data.oci_identity_availability_domain.ad.name
+        size_in_gbs         = 50
+        vpus_per_gb         = 20 // min vpus
+      }
+
+      attach_details {
+        type                                = "paravirtualized"
+        display_name                        = "TestAttachVolumeDetails-2"
+        is_read_only                        = true
+        is_shareable                        = true
+      }
+    }
+
+    launch_details {
+      compartment_id                      = var.compartment_ocid
+      ipxe_script                         = "ipxeScript"
+      shape                               = var.windows_instance_shape
+      display_name                        = "TestInstanceConfigurationLaunchDetails"
+      is_pv_encryption_in_transit_enabled = false
+      preferred_maintenance_action        = "LIVE_MIGRATE"
+      launch_mode                         = "NATIVE"
+
+      agent_config {
+        is_management_disabled = false
+        is_monitoring_disabled = false
+      }
+
+      availability_config {
+        recovery_action             = "RESTORE_INSTANCE"
+        is_live_migration_preferred = false
+      }
+
+      launch_options {
+        network_type = "PARAVIRTUALIZED"
+      }
+
+      instance_options {
+        are_legacy_imds_endpoints_disabled = false
+      }
+
+      create_vnic_details {
+        assign_private_dns_record = true
+        assign_public_ip       = true
+        display_name           = "TestInstanceConfigurationVNIC"
+        skip_source_dest_check = false
+      }
+
+      licensing_configs {
+        type = "WINDOWS"
+        license_type = "OCI_PROVIDED"
+      }
+
+      extended_metadata = {
+        some_string   = "stringA"
+        nested_object = "{\"some_string\": \"stringB\", \"object\": {\"some_string\": \"stringC\"}}"
+      }
+
+      source_details {
+        source_type = "image"
+        image_id    = data.oci_core_images.supported_windows_shape_images.images[0]["id"]
+      }
+    }
+  }
+}
+
+output "supported_windows_shape_images" {
+  value = data.oci_core_images.supported_windows_shape_images.images[0]["id"]
+}
+
+# Gets a list of all images that support a given Instance shape
+data "oci_core_images" "supported_windows_shape_images" {
+  compartment_id   = var.tenancy_ocid
+  shape            = var.windows_instance_shape
+  operating_system = "Windows"
+}

examples/database/adb/autonomous_database.tf

@@ -257,7 +257,7 @@ resource "oci_database_autonomous_database" "autonomous_database_oneway_tls_conn
   db_name                     = "adbOneWay"
 
   whitelisted_ips             = ["1.1.1.1"]
-  is_mtls_connection_required    = "true"
+  is_mtls_connection_required = "true"
 }
 
 resource "oci_database_autonomous_database" "autonomous_database_dbms_status" {
@@ -389,7 +389,6 @@ output "autonomous_databases" {
   value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
 }
 
-
 resource "oci_database_autonomous_database" "test_autonomous_database_shrink" {
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid

examples/database/db_systems/db_exadbxs/exadb_vm_cluster_database.tf

@@ -4,7 +4,7 @@
 resource "oci_database_db_home" "test_db_home" {
   display_name = "ExampleExaDbVmDbHome"
   db_system_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
-  db_version   = "23.4.0.24.05"
+  db_version   = data.oci_database_gi_version_minor_versions.test_gi_minor_versions.gi_minor_versions[0].version
 }
 
 resource "oci_database_database" "test_db1" {

examples/database/db_systems/db_vm/db_upgrade/data.tf

@@ -0,0 +1,51 @@
+# $Header$
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+#
+#    NAME
+#      data.tf
+#
+#    USAGE
+#      Use the following path for the Example & Backward Compatibility tests: database/db_systems/db_vm/db_upgrade
+#    NOTES
+#      Terraform Integration Test: TestDatabaseDatabaseUpgradeResource_basic
+#
+#    FILE(S)
+#      database_database_upgrade_test.go
+#
+#    MODIFIED   MM/DD/YY
+#    escabrer   12/13/2024 - Created
+
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
+data "oci_database_db_systems" "test_db_system_for_upgrade" {
+  compartment_id = var.compartment_id
+  filter {
+    name = "id"
+    values = [oci_database_db_system.test_db_system_for_upgrade.id]
+  }
+}
+
+data "oci_database_db_homes" "test_db_system_for_upgrade" {
+  compartment_id = var.compartment_id
+  db_system_id = oci_database_db_system.test_db_system_for_upgrade.id
+}
+
+data "oci_database_db_home" "test_db_system_for_upgrade" {
+  db_home_id = data.oci_database_db_homes.test_db_system_for_upgrade.db_homes.0.db_home_id
+}
+
+data "oci_database_databases" "test_db_system_for_upgrade" {
+  compartment_id = var.compartment_id
+  db_home_id = data.oci_database_db_homes.test_db_system_for_upgrade.db_homes.0.db_home_id
+}
+
+data "oci_database_database" "test_db_system_for_upgrade" {
+  database_id = data.oci_database_databases.test_db_system_for_upgrade.databases.0.id
+}
+
+
+

examples/database/db_systems/db_vm/db_upgrade/main.tf

@@ -0,0 +1,75 @@
+# $Header$
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+#
+#    NAME
+#      main.tf
+#
+#    USAGE
+#      Use the following path for the Example & Backward Compatibility tests: database/db_systems/db_vm/db_upgrade
+#    NOTES
+#      Terraform Integration Test: TestDatabaseDatabaseUpgradeResource_basic
+#
+#    FILE(S)
+#      database_database_upgrade_test.go
+#
+#    MODIFIED   MM/DD/YY
+#    escabrer   12/13/2024 - Created
+
+
+
+resource "oci_database_db_system" "test_db_system_for_upgrade" {
+  availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
+  compartment_id = var.compartment_id
+  data_storage_size_in_gb = "256"
+  database_edition = "ENTERPRISE_EDITION"
+  db_home {
+    database {
+      admin_password = var.admin_password
+      character_set = "AL32UTF8"
+      db_name = "tfDb"
+      db_workload = "OLTP"
+      ncharacter_set = "AL16UTF16"
+      pdb_name = "tfPdb"
+    }
+    db_version = "12.2.0.1"
+    display_name = "tfDbHome"
+  }
+  db_system_options {
+    storage_management = "LVM"
+  }
+  disk_redundancy = "NORMAL"
+  display_name = "tfDbSystemForUpgradeExample"
+  domain = oci_core_subnet.test_subnet.subnet_domain_name
+  fault_domains = ["FAULT-DOMAIN-1"]
+  hostname = "tf-db-host"
+  license_model = "LICENSE_INCLUDED"
+  lifecycle {
+    ignore_changes = [db_home[0].db_version, defined_tags]
+  }
+  node_count = "1"
+  nsg_ids = [oci_core_network_security_group.test_nsg.id]
+  shape = "VM.Standard2.2"
+  ssh_public_keys = [var.ssh_public_key]
+  subnet_id = oci_core_subnet.test_subnet.id
+}
+
+resource "oci_database_database_upgrade" "test_database_precheck" {
+  action = "PRECHECK"
+  database_id = data.oci_database_databases.test_db_system_for_upgrade.databases.0.id
+  database_upgrade_source_details {
+    db_version = "19.24.0.0"
+    source = "DB_VERSION"
+  }
+}
+
+resource "oci_database_database_upgrade" "test_database_upgrade" {
+  action = "UPGRADE"
+  database_id = data.oci_database_databases.test_db_system_for_upgrade.databases.0.id
+  database_upgrade_source_details {
+    db_version = "19.24.0.0"
+    options = "-upgradeTimezone false -keepEvents"
+    source = "DB_VERSION"
+  }
+  depends_on = [oci_database_database_upgrade.test_database_precheck]
+}