Releasing version 5.6.0

Releasing version 5.6.0

Author: Khalid-Chaudhry

CHANGELOG.md

@@ -22,7 +22,7 @@ resource "oci_ai_document_project" "test_project" {
   compartment_id = var.compartment_id
 }
 
-resource "oci_ai_document_model" "test_model" {
+resource "oci_ai_document_model" "test_model1" {
   #Required
   compartment_id = var.compartment_id
   model_type = "KEY_VALUE_EXTRACTION"
@@ -38,6 +38,44 @@ resource "oci_ai_document_model" "test_model" {
   #Optional
   display_name = "test_tf_model"
   is_quick_mode = "false"
-  max_training_time_in_hours = "0.5"
+  model_version              = var.model_model_version
+}
+
+resource "oci_ai_document_model" "test_model2" {
+  #Required
+  compartment_id = var.compartment_id
+  model_type = "KEY_VALUE_EXTRACTION"
+  project_id = oci_ai_document_project.test_project.id
+
+  training_dataset {
+    bucket = "tf_test_bucket"
+    dataset_type = "OBJECT_STORAGE"
+    namespace = "axgexwaxnm7k"
+    object = "tf_test_aadhar_1686719828190.jsonl"
+  }
+
+  #Optional
+  display_name = "test_tf_model2"
+  is_quick_mode = "false"
+  model_version              = var.model_model_version
+}
+
+resource "oci_ai_document_model" "test_compose_model" {
+  #Required
+  compartment_id = var.compartment_id
+  model_type = "KEY_VALUE_EXTRACTION"
+  project_id = oci_ai_document_project.test_project.id
+
+  component_models {
+    model_id = oci_ai_document_model.test_model1.id
+  }
+
+  component_models {
+    model_id = oci_ai_document_model.test_model2.id
+  }
+
+  #Optional
+  display_name = "test_compose_model"
+  is_quick_mode = "false"
   model_version              = var.model_model_version
 }

examples/aiDocument/main.tf

@@ -27,7 +27,7 @@ variable "subscription_id" {
 } 
 
 provider "oci" {
-  provider         = "4.67.0"
+  # version         = "4.67.0"
   region           = var.region
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -52,40 +52,6 @@ resource "oci_budget_budget" "test_budget" {
   budget_processing_period_start_offset = "11"
 }
 
-resource "oci_budget_budget" "test_budget_invoice" {
-  #Required
-  amount         = "1"
-  compartment_id = var.tenancy_ocid
-  reset_period   = "MONTHLY"
-  target_type    = "COMPARTMENT"
-
-  targets = [
-    var.subscription_id
-  ]
-
-  #Optional
-  description  = "budget invoice description"
-  display_name = "budget_invoice"
-  processing_period_type = "INVOICE"
-} 
-
-# get budget should happen after alert rule is successful
-# as alert rule creation updates the `alert_rule_count` field
-data "oci_budget_budget" "budget1" {
-  budget_id = oci_budget_budget.test_budget.id
-  depends_on = [
-    data.oci_budget_alert_rule.test_alert_rule
-  ]
-}
-
-data "oci_budget_budget" "budget_invoice" {
-  budget_id = oci_budget_budget.test_budget_invoice.id
-  depends_on = [
-    data.oci_budget_alert_rule.test_alert_rule
-  ]
-}
-
-
 data "oci_budget_budgets" "test_budgets" {
   #Required
   compartment_id = var.tenancy_ocid
@@ -96,40 +62,22 @@ data "oci_budget_budgets" "test_budgets" {
 
 output "budget" {
   value = {
-    amount           = data.oci_budget_budget.budget1.amount
-    compartment_id   = data.oci_budget_budget.budget1.compartment_id
-    reset_period     = data.oci_budget_budget.budget1.reset_period
-    targets          = data.oci_budget_budget.budget1.targets[0]
-    description      = data.oci_budget_budget.budget1.description
-    display_name     = data.oci_budget_budget.budget1.display_name
-    alert_rule_count = data.oci_budget_budget.budget1.alert_rule_count
-    state            = data.oci_budget_budget.budget1.state
-    time_created     = data.oci_budget_budget.budget1.time_created
-    time_updated     = data.oci_budget_budget.budget1.time_updated
-    version          = data.oci_budget_budget.budget1.version
+    amount           = oci_budget_budget.test_budget.amount
+    compartment_id   = oci_budget_budget.test_budget.compartment_id
+    reset_period     = oci_budget_budget.test_budget.reset_period
+    targets          = oci_budget_budget.test_budget.targets[0]
+    description      = oci_budget_budget.test_budget.description
+    display_name     = oci_budget_budget.test_budget.display_name
+    alert_rule_count = oci_budget_budget.test_budget.alert_rule_count
+    state            = oci_budget_budget.test_budget.state
+    time_created     = oci_budget_budget.test_budget.time_created
+    time_updated     = oci_budget_budget.test_budget.time_updated
+    version          = oci_budget_budget.test_budget.version
   }
   # These values are not always present
-  //    actual_spend        = data.oci_budget_budget.budget1.actual_spend
-  //    forecasted_spend    = data.oci_budget_budget.budget1.forecasted_spend
-  //    time_spend_computed = data.oci_budget_budget.budget1.time_spend_computed
-}
-
-output "budget_invoice" {
-  value = {
-    amount           = data.oci_budget_budget.budget_invoice.amount
-    compartment_id   = data.oci_budget_budget.budget_invoice.compartment_id
-    reset_period     = data.oci_budget_budget.budget_invoice.reset_period
-    targets          = data.oci_budget_budget.budget_invoice.targets[0]
-    description      = data.oci_budget_budget.budget_invoice.description
-    display_name     = data.oci_budget_budget.budget_invoice.display_name
-    alert_rule_count = data.oci_budget_budget.budget_invoice.alert_rule_count
-    state            = data.oci_budget_budget.budget_invoice.state
-    time_created     = data.oci_budget_budget.budget_invoice.time_created
-    time_updated     = data.oci_budget_budget.budget_invoice.time_updated
-    version          = data.oci_budget_budget.budget_invoice.version
-
-    processing_period_type = data.oci_budget_budget.budget_invoice.processing_period_type
-  }
+  //    actual_spend        = oci_budget_budget.test_budget.actual_spend
+  //    forecasted_spend    = oci_budget_budget.test_budget.forecasted_spend
+  //    time_spend_computed = oci_budget_budget.test_budget.time_spend_computed
 }
 
 resource "oci_budget_alert_rule" "test_alert_rule" {
@@ -178,6 +126,4 @@ data "oci_budget_alert_rules" "test_alert_rules" {
   #Optional
   //  display_name = oci_budget_alert_rule.test_alert_rule.display_name
   state = "ACTIVE"
-}
-
-
+}

examples/budget/main.tf renamed to examples/budget/budget/main.tf

@@ -0,0 +1,128 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+/*
+ * This example shows how to use the single use budget and alert rule resources.
+ */
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+variable "subscription_id" {
+} 
+
+provider "oci" {
+  # version         = "4.67.0"
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+resource "oci_budget_budget" "test_single_use_budget" {
+  # Required 
+  amount         = "1"
+  compartment_id = var.tenancy_ocid
+  reset_period   = "MONTHLY"
+  target_type    = "COMPARTMENT"
+
+  targets = [
+    var.compartment_ocid,
+  ]
+
+  # Optional
+  description  = "budget single use"
+  display_name = "budget2"
+  processing_period_type = "SINGLE_USE"
+  start_date   = "2023-07-12T16:01:19.847222+05:30"
+  end_date     = "2023-08-12T16:01:19.847222+05:30"
+}
+
+
+data "oci_budget_budgets" "test_budgets" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  #Optional
+  //  display_name = oci_budget_budget.test_budget.display_name
+  //  state        = "ACTIVE"
+}
+
+output "budget_single_use" {
+  value = {
+    amount           = oci_budget_budget.test_single_use_budget.amount
+    compartment_id   = oci_budget_budget.test_single_use_budget.compartment_id
+    reset_period     = oci_budget_budget.test_single_use_budget.reset_period
+    targets          = oci_budget_budget.test_single_use_budget.targets[0]
+    description      = oci_budget_budget.test_single_use_budget.description
+    display_name     = oci_budget_budget.test_single_use_budget.display_name
+    alert_rule_count = oci_budget_budget.test_single_use_budget.alert_rule_count
+    state            = oci_budget_budget.test_single_use_budget.state
+    time_created     = oci_budget_budget.test_single_use_budget.time_created
+    time_updated     = oci_budget_budget.test_single_use_budget.time_updated
+    version          = oci_budget_budget.test_single_use_budget.version
+    processing_period_type = oci_budget_budget.test_single_use_budget.processing_period_type
+  }
+}
+
+resource "oci_budget_alert_rule" "test_alert_rule" {
+  #Required
+  budget_id      = oci_budget_budget.test_single_use_budget.id
+  threshold      = "100"
+  threshold_type = "ABSOLUTE"
+  type           = "ACTUAL"
+
+  #Optional
+  description  = "alertRuleDescription"
+  display_name = "alertRule"
+  message      = "possible overspend"
+  recipients   = "[email protected]"
+}
+
+output "alert_rule" {
+  value = {
+    budget_id      = data.oci_budget_alert_rule.test_alert_rule.budget_id
+    recipients     = data.oci_budget_alert_rule.test_alert_rule.recipients
+    description    = data.oci_budget_alert_rule.test_alert_rule.description
+    display_name   = data.oci_budget_alert_rule.test_alert_rule.display_name
+    message        = data.oci_budget_alert_rule.test_alert_rule.message
+    recipients     = data.oci_budget_alert_rule.test_alert_rule.recipients
+    state          = data.oci_budget_alert_rule.test_alert_rule.state
+    threshold      = data.oci_budget_alert_rule.test_alert_rule.threshold
+    threshold_type = data.oci_budget_alert_rule.test_alert_rule.threshold_type
+    time_created   = data.oci_budget_alert_rule.test_alert_rule.time_created
+    time_updated   = data.oci_budget_alert_rule.test_alert_rule.time_updated
+    type           = data.oci_budget_alert_rule.test_alert_rule.type
+    version        = data.oci_budget_alert_rule.test_alert_rule.version
+  }
+}
+
+data "oci_budget_alert_rule" "test_alert_rule" {
+  #Required
+  budget_id     = oci_budget_budget.test_single_use_budget.id
+  alert_rule_id = oci_budget_alert_rule.test_alert_rule.id
+}
+
+data "oci_budget_alert_rules" "test_alert_rules" {
+  #Required
+  budget_id = oci_budget_budget.test_single_use_budget.id
+
+  #Optional
+  //  display_name = oci_budget_alert_rule.test_alert_rule.display_name
+  state = "ACTIVE"
+}

examples/budget/single_use_budget/main.tf

@@ -270,6 +270,8 @@ resource "oci_core_instance_pool" "test_instance_pool" {
   size = 2
   state = "RUNNING"
   display_name = "TestInstancePool"
+  instance_display_name_formatter = "host-$${launchCount}"
+  instance_hostname_formatter = "host-$${launchCount}"
 
   placement_configurations {
     availability_domain = data.oci_identity_availability_domain.ad.name