Merge pull request #2199 from oracle/release_gh

Releasing OCI Provider Version v6.11.0

Author: vsin12

CHANGELOG.md

@@ -5,7 +5,7 @@ variable "tenancy_ocid" {
 }
 
 variable "cluster_profile" {
-default = "HADOOP"
+  default = "HADOOP"
 }
 
 variable "user_ocid" {
@@ -85,7 +85,7 @@ variable "bds_instance_nodes_shape" {
 }
 
 variable "bds_instance_worker_node_shape" {
-  default = "VM.Standard.Generic"
+  default = "VM.DenseIO.E5.Flex"
 }
 
 variable "bds_instance_compute_only_worker_node_shape" {
@@ -148,7 +148,7 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
   is_secure              = var.bds_instance_is_secure
   kms_key_id             = var.kms_key_id
   cluster_profile        = var.cluster_profile
-  bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/Lk5JT9tnUIOG4yLm6S21QVR7m3Rm2uj1RAS2Olx5v14onLU2Y-b0lIc_N0RuUIge/n/idpbwtq1b3ta/b/bucket-20230214-1316/o/execute_bootstrap_script.sh"
+  bootstrap_script_url   = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/Lk5JT9tnUIOG4yLm6S21QVR7m3Rm2uj1RAS2Olx5v14onLU2Y-b0lIc_N0RuUIge/n/idpbwtq1b3ta/b/bucket-20230214-1316/o/execute_bootstrap_script.sh"
 
   master_node {
     #Required
@@ -158,9 +158,9 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
     block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
     number_of_nodes          = 1
     shape_config {
-            memory_in_gbs = 120
-           ocpus         = 8
-        }
+      memory_in_gbs = 120
+      ocpus         = 8
+    }
   }
 
   util_node {
@@ -171,50 +171,50 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
     block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
     number_of_nodes          = 1
     shape_config {
-            memory_in_gbs = 120
-            ocpus         = 8
-        }
+      memory_in_gbs = 120
+      ocpus         = 8
+    }
   }
 
   worker_node {
     #Required
     shape = var.bds_instance_worker_node_shape
-    block_volume_size_in_gbs = var.bds_instance_nodes_block_volume_size_in_gbs
+    subnet_id       = var.subnet_id
+    number_of_nodes = 3
+    shape_config {
+      memory_in_gbs = 120
+      ocpus         = 8
+      nvmes         = 1
+    }
+  }
+
+  edge_node {
+    #Required
+    shape = var.bds_instance_edge_node_shape
+
     subnet_id                = var.subnet_id
-    number_of_nodes          = 3
-       shape_config {
-              memory_in_gbs = 120
-              ocpus         = 8
-         }
-      }
-
-      edge_node {
-        #Required
-        shape = var.bds_instance_edge_node_shape
-
-        subnet_id                = var.subnet_id
-        block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
-        number_of_nodes          = 1
-        shape_config {
-          memory_in_gbs = var.bds_instance_edge_memory_per_node
-          ocpus         = var.bds_instance_edge_ocpu_per_node
-        }
-      }
-
-      compute_only_worker_node {
-        #Required
-        shape = var.bds_instance_compute_only_worker_node_shape
-
-        subnet_id                = var.subnet_id
-        block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
-        number_of_nodes          = 1
-        shape_config {
-          memory_in_gbs = var.bds_instance_compute_only_worker_memory_per_node
-          ocpus         = var.bds_instance_compute_only_worker_ocpu_per_node
+    block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
+    number_of_nodes          = 1
+    shape_config {
+      memory_in_gbs = var.bds_instance_edge_memory_per_node
+      ocpus         = var.bds_instance_edge_ocpu_per_node
     }
   }
 
- ignore_existing_nodes_shape = ["worker", "master", "utility"]
+  compute_only_worker_node {
+    #Required
+    shape = var.bds_instance_compute_only_worker_node_shape
+
+    subnet_id                = var.subnet_id
+    block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
+    number_of_nodes          = 1
+    shape_config {
+      memory_in_gbs = var.bds_instance_compute_only_worker_memory_per_node
+      ocpus         = var.bds_instance_compute_only_worker_ocpu_per_node
+    }
+  }
+
+  ignore_existing_nodes_shape = ["worker", "master", "utility"]
 
   is_cloud_sql_configured = false
 
@@ -224,7 +224,7 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
 
   #Uncomment kafka_broker_node block for use of Kafka cluster
   #kafka_broker_node {
-    #Required
+  #Required
   #  shape = var.bds_instance_compute_only_worker_node_shape
 
   #  subnet_id                = var.subnet_id
@@ -237,10 +237,10 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
   #}
 
   #Optional
-#Uncomment this when running in home region (PHX)
-#  defined_tags = {
-#    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = var.bds_instance_defined_tags_value
-#  }
+  #Uncomment this when running in home region (PHX)
+  #  defined_tags = {
+  #    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = var.bds_instance_defined_tags_value
+  #  }
   freeform_tags = var.bds_instance_freeform_tags
   network_config {
     #Optional

examples/big_data_service/main.tf

@@ -0,0 +1,6 @@
+resource "oci_database_autonomous_database" "undelete_autonomous_database" {
+  compartment_id           = var.compartment_id
+  db_name                  = var.undelete_db_name
+  source                   = "UNDELETE_ADB"
+  source_id                = var.source_id
+}

examples/database/adb/adb_undelete/adb_undelete.tf

@@ -0,0 +1,11 @@
+// Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+
+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
+}

examples/database/adb/adb_undelete/provider.tf

@@ -38,7 +38,6 @@ resource "oci_database_migration_connection" "test_connection_mysql_rds_source"
   password = "BEstrO0ng_#11"
   technology_type = "AMAZON_RDS_MYSQL"
   username = "ggfe"
-  database_id = var.database_mysql_id
   database_name = "ggfe"
   host = "254.249.0.0"
   port = "3306"

examples/databasemigration/migration_mysql/migration_mysql_rds.tf

@@ -7,6 +7,7 @@ variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
+variable "sql_firewall_allowed_sql_ocid" {}
 
 variable "allowed_sql_sort_by" {
   default = "timeCollected"
@@ -37,3 +38,8 @@ data "oci_data_safe_sql_firewall_allowed_sqls" "test_sql_firewall_allowed_sqls"
   access_level                  = var.access_level
 }
 
+data "oci_data_safe_sql_firewall_allowed_sql" "test_sql_firewall_allowed_sql" {
+  #Required
+  sql_firewall_allowed_sql_id = var.sql_firewall_allowed_sql_ocid
+}
+

examples/datasafe/firewall_allowed_sql/firewall_allowed_sql.tf

@@ -22,7 +22,7 @@ variable "report_definition_column_filters_expressions" {
 }
 
 variable "report_definition_column_filters_field_name" {
-  default = "targetName"
+  default = "targetId"
 }
 
 variable "report_definition_column_filters_is_enabled" {

examples/datasafe/report_definition/report_definition.tf

@@ -0,0 +1,4 @@
+# Overview
+This is a Terraform configuration that creates the Fleet Apps Management service on Oracle Cloud Infrastructure.
+
+The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.

examples/fleet_apps_management/description.md

@@ -0,0 +1,180 @@
+// 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 "fleet_application_type" {
+  default = "applicationType"
+}
+
+variable "fleet_description" {
+  default = "fleet description"
+}
+
+variable "fleet_display_name" {
+  default = "fleetDisplayName"
+}
+
+variable "fleet_environment_type" {
+  default = "environmentType"
+}
+
+variable "fleet_fleet_type" {
+  default = "GENERIC"
+}
+
+variable "fleet_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+variable "fleet_group_type" {
+  default = "ENVIRONMENT"
+}
+
+variable "fleet_is_target_auto_confirm" {
+  default = true
+}
+
+variable "fleet_notification_preferences_preferences_on_job_failure" {
+  default = false
+}
+
+variable "fleet_notification_preferences_preferences_on_topology_modification" {
+  default = false
+}
+
+variable "fleet_notification_preferences_preferences_on_upcoming_schedule" {
+  default = false
+}
+
+variable "fleet_product" {
+  default = "OS(COMPUTE)"
+}
+
+variable "fleet_products" {
+  default = ["OS(COMPUTE)"]
+}
+
+variable "fleet_resource_selection_type" {
+  default = "MANUAL"
+}
+
+variable "fleet_rule_selection_criteria_match_condition" {
+  default = "MATCH_ALL"
+}
+
+variable "fleet_rule_selection_criteria_rules_basis" {
+  default = "basis"
+}
+
+variable "fleet_rule_selection_criteria_rules_conditions_attr_group" {
+  default = "attrGroup"
+}
+
+variable "fleet_rule_selection_criteria_rules_conditions_attr_key" {
+  default = "attrKey"
+}
+
+variable "fleet_rule_selection_criteria_rules_conditions_attr_value" {
+  default = "attrValue"
+}
+
+variable "fleet_state" {
+  default = "NEEDS_ATTENTION"
+}
+
+
+
+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
+}
+
+######## Supporting resources used with Fleet.
+
+# Topic creation
+resource "random_string" "topicname" {
+  length  = 10
+  special = false
+}
+
+resource "oci_ons_notification_topic" "test_notification_topic" {
+  #Required
+  compartment_id = var.compartment_id
+  name           = random_string.topicname.result
+}
+
+########
+
+resource "oci_fleet_apps_management_fleet" "test_fleet" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  fleet_type     = var.fleet_fleet_type
+
+  lifecycle {
+    ignore_changes = ["defined_tags"]
+  }
+
+  #Optional
+  application_type       = var.fleet_application_type
+  description            = var.fleet_description
+  display_name           = var.fleet_display_name
+  environment_type       = var.fleet_environment_type
+  freeform_tags          = var.fleet_freeform_tags
+  group_type             = var.fleet_group_type
+  is_target_auto_confirm = var.fleet_is_target_auto_confirm
+  notification_preferences {
+    #Required
+    compartment_id = var.compartment_id
+    topic_id       = oci_ons_notification_topic.test_notification_topic.id
+
+    #Optional
+    preferences {
+
+      #Optional
+      on_job_failure           = var.fleet_notification_preferences_preferences_on_job_failure
+      on_topology_modification = var.fleet_notification_preferences_preferences_on_topology_modification
+      on_upcoming_schedule     = var.fleet_notification_preferences_preferences_on_upcoming_schedule
+    }
+  }
+  products                = var.fleet_products
+  resource_selection_type = var.fleet_resource_selection_type
+  rule_selection_criteria {
+    #Required
+    match_condition = var.fleet_rule_selection_criteria_match_condition
+    rules {
+      #Required
+      compartment_id = var.tenancy_ocid
+      conditions {
+        #Required
+        attr_group = var.fleet_rule_selection_criteria_rules_conditions_attr_group
+        attr_key   = var.fleet_rule_selection_criteria_rules_conditions_attr_key
+        attr_value = var.fleet_rule_selection_criteria_rules_conditions_attr_value
+      }
+      resource_compartment_id = var.compartment_id
+      #Optional
+      basis = var.fleet_rule_selection_criteria_rules_basis
+    }
+  }
+}
+
+data "oci_fleet_apps_management_fleets" "test_fleets" {
+
+  #Optional
+  application_type = var.fleet_application_type
+  compartment_id   = var.tenancy_ocid
+  display_name     = var.fleet_display_name
+  environment_type = var.fleet_environment_type
+  fleet_type       = var.fleet_fleet_type
+  product          = var.fleet_product
+  state            = var.fleet_state
+}
+