Merge pull request #2151 from oracle/release_gh

Releasing version 6.1.0

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 6.1.0 (July 02, 2024)
+
+### Added
+- Support for MySQL Homogenous Migration support
+- Support for Generative AI Service - Lora Fine-Tuning Method
+- Support for Resource Scheduler
+- Support for File Storage: Clone detach feature
+- Support for Oracle Exadata Database Service on Exascale Infrastructure | ExaDB-XS
+### Bug Fix
+- formatted database migration code
+- tagging in management_agent
+
 ## 6.0.0 (June 26, 2024)
 
 ### Added

examples/README.md

@@ -205,6 +205,8 @@ This directory contains Terraform configuration files showing how to create spec
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/redis.zip)
 - resourcemanager  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcemanager.zip)
+- resourcescheduler  
+    [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/resourcescheduler.zip)
 - serviceManagerProxy  
     [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/serviceManagerProxy.zip)
 - service_catalog  

examples/database/db_systems/db_exadbxs/datasources.tf

@@ -0,0 +1,35 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+data "oci_identity_availability_domains" "test_availability_domains" {
+  compartment_id = var.tenancy_ocid
+}
+
+locals {
+  ad = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
+}
+
+data "oci_database_backups" "test_database_backups_by_exadbxs" {
+  compartment_id = var.compartment_ocid
+  shape_family   = "EXADB_XS"
+}
+
+data "oci_database_gi_versions" "test_gi_versions" {
+  #Required
+  compartment_id = var.compartment_ocid
+  #Optional
+  shape               = "ExaDbXS"
+  availability_domain = local.ad
+}
+
+data "oci_database_gi_version_minor_versions" "test_gi_minor_versions" {
+  #Required
+  version = data.oci_database_gi_versions.test_gi_versions.gi_versions[0].version
+  #Optional
+  compartment_id                 = data.oci_database_gi_versions.test_gi_versions.compartment_id
+  availability_domain            = data.oci_database_gi_versions.test_gi_versions.availability_domain
+  shape_family                   = "EXADB_XS"
+  shape                          = data.oci_database_gi_versions.test_gi_versions.shape
+  is_gi_version_for_provisioning = false
+}
+

examples/database/db_systems/db_exadbxs/exadb_vm_cluster.tf

@@ -0,0 +1,49 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "oci_database_exadb_vm_cluster" "test_exadb_vm_cluster" {
+
+  #Required
+  availability_domain          = local.ad
+  compartment_id               = var.compartment_ocid
+  display_name                 = "ExampleExadbVmCluster"
+  exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
+  grid_image_id                = data.oci_database_gi_version_minor_versions.test_gi_minor_versions.gi_minor_versions[0].grid_image_id
+  hostname                     = "apollo"
+  cluster_name                 = "apollo"
+  shape                        = "EXADBXS"
+  ssh_public_keys              = [var.ssh_public_key]
+  subnet_id                    = oci_core_subnet.exadbxs_client_subnet.id
+  backup_subnet_id             = oci_core_subnet.exadbxs_backup_subnet.id
+
+  node_config {
+    enabled_ecpu_count_per_node              = "8"
+    total_ecpu_count_per_node                = "16"
+    vm_file_system_storage_size_gbs_per_node = "293"
+  }
+
+  node_resource {
+    node_name = "node1"
+  }
+
+  node_resource {
+    node_name = "node2"
+  }
+
+  node_resource {
+    node_name = "node3"
+  }
+
+}
+
+data "oci_database_exadb_vm_clusters" "test_exadb_vm_clusters" {
+  #Required
+  compartment_id = var.compartment_ocid
+  #Optional
+  exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
+}
+
+data "oci_database_exadb_vm_cluster" "test_exadb_vm_cluster" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+}

examples/database/db_systems/db_exadbxs/exadb_vm_cluster_database.tf

@@ -0,0 +1,67 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+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"
+}
+
+resource "oci_database_database" "test_db1" {
+  database {
+    admin_password = var.test_db_password
+    db_name        = "TFDB1"
+  }
+  db_home_id = oci_database_db_home.test_db_home.id
+  source     = "NONE"
+}
+
+resource "oci_database_database" "test_db2" {
+  database {
+    admin_password = var.test_db_password
+    db_name        = "TFDB2"
+  }
+  db_home_id = oci_database_db_home.test_db_home.id
+  source     = "NONE"
+}
+
+resource "oci_database_pluggable_database" "test_db1_pdb" {
+  container_database_id = oci_database_database.test_db1.id
+  pdb_name              = "DB1PDB"
+  pdb_admin_password    = var.test_db_password
+  tde_wallet_password   = var.test_db_password
+}
+
+resource "oci_database_pluggable_database" "test_db1_local_cloned_pdb" {
+  container_database_id = oci_database_database.test_db1.id
+  pdb_name = "DB1LocalThinClonedPDB"
+  pdb_admin_password = var.test_db_password
+  tde_wallet_password = var.test_db_password
+  pdb_creation_type_details {
+    creation_type = "LOCAL_CLONE_PDB"
+    source_pluggable_database_id = oci_database_pluggable_database.test_db1_pdb.id
+    is_thin_clone = true
+  }
+}
+
+# resource "oci_database_pluggable_database" "test_db2_remote_cloned_pdb" {
+#   container_database_id = oci_database_database.test_db2.id
+#   pdb_name = "DB2RemoteThinClonedPDB"
+#   pdb_admin_password = var.test_db_password
+#   tde_wallet_password = var.test_db_password
+#   pdb_creation_type_details {
+#     creation_type = "REMOTE_CLONE_PDB"
+#     source_container_database_admin_password = var.test_db_password
+#     source_pluggable_database_id = oci_database_pluggable_database.test_db1_pdb.id
+#     is_thin_clone = true
+#   }
+# }
+
+data "oci_database_pluggable_databases" "test_pdbs" {
+  compartment_id        = var.compartment_ocid
+  state = "AVAILABLE"
+}
+
+data "oci_database_pluggable_database" "test_db1_local_cloned_pdb" {
+  pluggable_database_id = oci_database_pluggable_database.test_db1_local_cloned_pdb.id
+}

examples/database/db_systems/db_exadbxs/exadb_vm_cluster_db_node.tf

@@ -0,0 +1,13 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+# Get db node list
+data "oci_database_db_nodes" "test_exadb_vm_cluster_db_nodes" {
+  compartment_id = var.compartment_ocid
+  vm_cluster_id   = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+}
+
+# Get db node details
+data "oci_database_db_node" "test_exadb_vm_cluster_db_node" {
+  db_node_id = data.oci_database_db_nodes.test_exadb_vm_cluster_db_nodes.db_nodes[0].id
+}

examples/database/db_systems/db_exadbxs/exadb_vm_cluster_update_history_entries.tf

@@ -0,0 +1,13 @@
+data "oci_database_exadb_vm_cluster_update_history_entries" "test_exadb_vm_cluster_update_history_entries" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+  #Optional
+  update_type = "OS_UPDATE"
+}
+
+data "oci_database_exadb_vm_cluster_update_history_entry" "test_exadb_vm_cluster_update_history_entry" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+  #Optional
+  update_history_entry_id = data.oci_database_exadb_vm_cluster_update_history_entries.test_exadb_vm_cluster_update_history_entries.exadb_vm_cluster_update_history_entries[0].id
+}

examples/database/db_systems/db_exadbxs/exadb_vm_cluster_updates.tf

@@ -0,0 +1,12 @@
+data "oci_database_exadb_vm_cluster_updates" "test_exadb_vm_cluster_updates" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+  #Optional
+  update_type = "GI_PATCH"
+}
+
+data "oci_database_exadb_vm_cluster_update" "test_exadb_vm_cluster_update" {
+  #Required
+  exadb_vm_cluster_id = oci_database_exadb_vm_cluster.test_exadb_vm_cluster.id
+  update_id           = data.oci_database_exadb_vm_cluster_updates.test_exadb_vm_cluster_updates.exadb_vm_cluster_updates[0].id
+}

examples/database/db_systems/db_exadbxs/exascale_db_storage_vault.tf

@@ -0,0 +1,23 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_vault" {
+  #Required
+  availability_domain = local.ad
+  compartment_id      = var.compartment_ocid
+  display_name        = "ExampleExascaleDbStorageVault"
+  high_capacity_database_storage {
+    total_size_in_gbs = 800
+  }
+  additional_flash_cache_in_percent = 20
+}
+
+data "oci_database_exascale_db_storage_vaults" "test_exascale_db_storage_vaults" {
+  #Required
+  compartment_id = var.compartment_ocid
+}
+
+data "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_vault" {
+  #Required
+  exascale_db_storage_vault_id = oci_database_exascale_db_storage_vault.test_exascale_db_storage_vault.id
+}

examples/database/db_systems/db_exadbxs/network.tf

@@ -0,0 +1,79 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+resource "oci_core_virtual_network" "exadbxs_vcn" {
+  compartment_id = var.compartment_ocid
+  cidr_blocks    = ["10.1.0.0/16"]
+  display_name   = "exadbxs-tf-vcn"
+  dns_label      = "tfvcn"
+}
+
+resource "oci_core_internet_gateway" "exadbxs_igw" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_virtual_network.exadbxs_vcn.id
+  display_name   = "exadbxs-tf-igw"
+}
+
+resource "oci_core_route_table" "exadbxs_rt" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_virtual_network.exadbxs_vcn.id
+  display_name   = "exadbxs-tf-route-table"
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.exadbxs_igw.id
+  }
+}
+
+resource "oci_core_subnet" "exadbxs_client_subnet" {
+  cidr_block        = "10.1.20.0/24"
+  compartment_id  = var.compartment_ocid
+  vcn_id            = oci_core_virtual_network.exadbxs_vcn.id
+  route_table_id    = oci_core_route_table.exadbxs_rt.id
+  security_list_ids = [
+    oci_core_virtual_network.exadbxs_vcn.default_security_list_id,
+    oci_core_security_list.exadbxs_security_list.id
+  ]
+  dns_label    = "tfclientsub"
+  display_name = "exadbxs-tf-client-subnet"
+}
+
+resource "oci_core_subnet" "exadbxs_backup_subnet" {
+  cidr_block     = "10.1.21.0/24"
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_virtual_network.exadbxs_vcn.id
+  route_table_id = oci_core_route_table.exadbxs_rt.id
+  dns_label      = "tfbackupsub"
+  display_name   = "exadbxs-tf-backup-subnet"
+}
+
+resource "oci_core_security_list" "exadbxs_security_list" {
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_virtual_network.exadbxs_vcn.id
+  display_name   = "exadbxs-security-list"
+
+  ingress_security_rules {
+    source   = "10.1.22.0/24"
+    protocol = "6"
+  }
+
+  ingress_security_rules {
+    source   = "10.1.22.0/24"
+    protocol = "1"
+  }
+
+  ingress_security_rules {
+    source   = "10.1.22.0/24"
+    protocol = "all"
+  }
+
+  egress_security_rules {
+    destination = "10.1.22.0/24"
+    protocol    = "6"
+  }
+
+  egress_security_rules {
+    destination = "10.1.22.0/24"
+    protocol    = "1"
+  }
+}

examples/database/db_systems/db_exadbxs/provider.tf

@@ -0,0 +1,8 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+provider "oci" {
+  auth                = var.auth
+  config_file_profile = var.config_file_profile
+  region              = var.region
+}

examples/database/db_systems/db_exadbxs/variables.tf

@@ -0,0 +1,22 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "region" {}
+variable "compartment_ocid" {}
+variable "config_file_profile" {}
+variable "auth" {
+  default = "SecurityToken"
+}
+
+variable "ssh_public_key" {
+  default = ""
+}
+
+variable "db_name" {
+  default = "TFDB"
+}
+
+variable "test_db_password" {
+  default = "BEstrO0ng_#11"
+}