Merge pull request #2096 from oracle/release_gh

Releasing version 5.38.0

Author: NagaRajuPasunuri

CHANGELOG.md

@@ -66,6 +66,42 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   is_dst_file_update_enabled = false
 }
 
+resource "oci_database_autonomous_database_software_image" "autonomous_database_software_image" {
+  compartment_id = var.compartment_ocid
+  display_name = "ADSI-TFTest"
+  image_shape_family = "EXADATA_SHAPE"
+  source_cdb_id = oci_database_autonomous_container_database.test_autonomous_container_database.id
+  freeform_tags = {
+      "Department" = "Finance"
+    }
+}
+
+resource "random_string" "db_unique_name_adsi_acd" {
+  length = 8
+  special = false
+  number = false
+}
+
+resource "oci_database_autonomous_container_database" "autonomous_container_database_from_adsi" {
+  cloud_autonomous_vm_cluster_id       = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
+  database_software_image_id = oci_database_autonomous_database_software_image.autonomous_database_software_image.id
+  backup_config {
+    recovery_window_in_days = "7"
+  }
+  compartment_id = var.compartment_ocid
+  db_unique_name = random_string.db_unique_name_adsi_acd.result
+  display_name = "ACD-TFTest"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  maintenance_window_details {
+    preference = "NO_PREFERENCE"
+  }
+  patch_model = "RELEASE_UPDATES"
+  service_level_agreement_type = "STANDARD"
+  version_preference = "LATEST_RELEASE_UPDATE"
+  is_dst_file_update_enabled = false
+}
 variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
   default = []
 }

examples/database/atp-d/main.tf

@@ -0,0 +1,29 @@
+resource "random_string" "db_unique_name_adsi_acd" {
+  length = 8
+  special = false
+  number = false
+}
+
+resource "oci_database_autonomous_container_database" "autonomous_container_database_from_adsi" {
+  autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
+  database_software_image_id = oci_database_autonomous_database_software_image.autonomous_database_software_image.id
+  backup_config {
+    backup_destination_details {
+      type = "LOCAL"
+    }
+    recovery_window_in_days = "7"
+  }
+  compartment_id = var.compartment_ocid
+  db_unique_name = random_string.db_unique_name_adsi_acd.result
+  display_name = "ACD-TFTest"
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+  maintenance_window_details {
+    preference = "NO_PREFERENCE"
+  }
+  patch_model = "RELEASE_UPDATES"
+  service_level_agreement_type = "STANDARD"
+  version_preference = "LATEST_RELEASE_UPDATE"
+  is_dst_file_update_enabled = false
+}

examples/database/exadata_cc/adbd/acd_from_adsi.tf

@@ -0,0 +1,9 @@
+resource "oci_database_autonomous_database_software_image" "autonomous_database_software_image" {
+  compartment_id = var.compartment_ocid
+  display_name = "ADSI-TFTest"
+  image_shape_family = "EXACC_SHAPE"
+  source_cdb_id = oci_database_autonomous_container_database.autonomous_container_database.id
+  freeform_tags = {
+      "Department" = "Finance"
+    }
+}

examples/database/exadata_cc/adbd/adsi.tf

@@ -54,4 +54,3 @@ resource "oci_database_autonomous_vm_cluster" "autonomous_vm_cluster_2" {
 
 
 
-

examples/database/exadata_cc/adbd/autonomous_vm_cluster.tf

@@ -203,6 +203,10 @@ variable "model_deployment_model_deployment_configuration_details_environment_co
 variable "model_deployment_model_deployment_configuration_details_environment_configuration_details_server_port" {
 }
 
+# For Custom Egress
+variable "model_egress_id" {
+}
+
 # A model deployment resource configurations for creating a new model deployment with scaling policy type = FIXED SIZE
 resource "oci_datascience_model_deployment" "tf_model_deployment" {
   # Required
@@ -425,6 +429,66 @@ resource "oci_datascience_model_deployment" "tf_model_deployment_byoc" {
   //  freeform_tags = var.model_deployment_freeform_tag
 }
 
+# A model deployment resource configurations for creating a new model deployment with Custom Networking
+resource "oci_datascience_model_deployment" "tf_model_deployment_custom_networking" {
+  # Required
+  compartment_id = var.compartment_ocid
+  model_deployment_configuration_details {
+    # Required
+    deployment_type = var.model_deployment_model_deployment_configuration_details_deployment_type
+    model_configuration_details {
+      # Required
+      instance_configuration {
+        # Required
+        instance_shape_name = var.shape
+
+        #Optional
+        model_deployment_instance_shape_config_details {
+
+          #Optional
+          cpu_baseline  = var.model_deployment_model_deployment_configuration_details_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_cpu_baseline
+          memory_in_gbs = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_memory_in_gbs
+          ocpus         = var.model_deployment_model_configuration_details_instance_configuration_model_deployment_instance_shape_config_details_ocpus
+        }
+
+        # Required
+        subnet_id = oci_core_subnet.tf_subnet.id
+      }
+      model_id = var.model_egress_id
+
+      # Optional
+      bandwidth_mbps         = var.model_deployment_model_deployment_configuration_details_model_configuration_details_bandwidth_mbps
+      maximum_bandwidth_mbps = var.model_deployment_model_deployment_configuration_details_model_configuration_details_maximum_bandwidth_mbps
+
+      scaling_policy {
+        # Required
+        instance_count = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_instance_count
+        policy_type    = var.model_deployment_model_deployment_configuration_details_model_configuration_details_scaling_policy_policy_type
+      }
+    }
+  }
+  project_id = var.project_ocid
+
+  # Optional
+  category_log_details {
+
+    # Optional
+    access {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.access_log_id
+    }
+    predict {
+      # Required
+      log_group_id = var.log_group_id
+      log_id       = var.predict_log_id
+    }
+  }
+  # Optional
+  description   = var.model_deployment_description
+  display_name  = var.model_deployment_display_name
+}
+
 # The data resource for a list of model deployments in a specified compartment
 data "oci_datascience_model_deployments" "tf_model_deployments" {
   # Required
@@ -436,4 +500,15 @@ data "oci_datascience_model_deployments" "tf_model_deployments" {
   id           = oci_datascience_model_deployment.tf_model_deployment.id
   project_id   = var.project_ocid
   state        = var.model_deployment_state
+}
+
+resource "oci_core_subnet" "tf_subnet" {
+  cidr_block     = "10.0.0.0/22"
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.tf_vcn.id
+}
+
+resource "oci_core_vcn" "tf_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.compartment_ocid
 }

examples/datascience/model_deployment/model_deployment.tf

@@ -0,0 +1,26 @@
+variable "tenancy_ocid" {
+}
+
+variable "region" {
+  default = "r1"
+}
+
+variable "subscription_id" {
+  default = "10153310"
+}
+
+
+provider "oci" {
+  auth                = "SecurityToken"
+  config_file_profile = "terraform-federation-test"
+  region              = var.region
+}
+
+resource "oci_metering_computation_usage_statement_email_recipients_group" "test_usage_statement_email_recipients_group" {
+  subscription_id = var.subscription_id
+  compartment_id  = var.tenancy_ocid
+  recipients_list {
+    email_id = "[email protected]"
+    state = "ACTIVE"
+  }
+}

examples/metering_computation/usage_statement_email_recipients_group/main.tf

@@ -24,25 +24,33 @@ variable "idcs_access_token" {
 }
 
 provider "oci" {
-  tenancy_ocid     = var.tenancy_ocid
-  user_ocid        = var.user_ocid
-  fingerprint      = var.fingerprint
-  private_key_path = var.private_key_path
+  # API key authentication
+  # tenancy_ocid     = var.tenancy_ocid
+  # user_ocid        = var.user_ocid
+  # fingerprint      = var.fingerprint
+  # private_key_path = var.private_key_path
+  # region           = var.region
+
+  # Security token authentication
+  auth = "SecurityToken"
+  config_file_profile = "tf"
   region           = var.region
 }
 
 resource "oci_opa_opa_instance" "test_opa_instance" {
   compartment_id = "${var.compartment_id}"
   consumption_model = "UCM"
-  display_name = "displayName"
+  display_name = "opa_instance_tf"
   idcs_at = "${var.idcs_access_token}"
   metering_type = "EXECUTION_PACK"
   shape_name = "PRODUCTION"
+  is_breakglass_enabled = false
+  state = "ACTIVE"
 }
 
 data "oci_opa_opa_instances" "test_opa_instances" {
   compartment_id = "${var.compartment_id}"
-  display_name = "displayName2"
+  display_name = "opa_instance_tf"
   filter {
     name = "id"
     values = ["${oci_opa_opa_instance.test_opa_instance.id}"]