Merge bb/master into release_gh

Author: NagaRajuPasunuri

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 5.1.0 (Unreleased)
+
+### Added
+- Support for Java Management Service 7.0
+- Support for Usage proxy: Adding APIs for MQS public API deprecation
+- Support for Allow user to select the billing interval of deleted nodes
+- Support for realm specific service endpoints
+- Support for CASPER - ObjectStorage to have Customer Specific Domains in Customer Zone DNS
+- Support for OPSI: TCPS Support for Cloud Databases
+- Support for Operations Insights AIX Support
+- Custom model features in Document Service
+### Bug Fix
+- Remove duplicate Create for resource
+- updated examples for devops artifact to show options and helm example and public docs
+
 ## 5.0.0 (June 06, 2023)
 
 ### Added

examples/aiDocument/description.md

@@ -0,0 +1,4 @@
+# Overview
+This is a Terraform configuration that creates the AI Document resources 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/aiDocument/main.tf

@@ -0,0 +1,43 @@
+provider "oci" {
+}
+
+variable "tenancy_ocid" {
+  default = "ocid1.tenancy.oc1..aaaaaaaaikox5b3adi2w237m2fwomzxybp52i7byjrj5fxradayjqxum7bsq"
+}
+
+variable "region" {
+  default = "us-phoenix-1"
+}
+
+variable "model_model_version" {
+  default = "modelVersion"
+}
+
+variable "compartment_id" { default = "ocid1.compartment.oc1..aaaaaaaa3jewat7ub6yf257bsxvfcfz5zt46fruduji37ekbsefwmcmzvgxq" }
+
+variable defined_tag_namespace_name { default = "" }
+
+
+resource "oci_ai_document_project" "test_project" {
+  compartment_id = var.compartment_id
+}
+
+resource "oci_ai_document_model" "test_model" {
+  #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_dataset_1680065500556.jsonl"
+  }
+
+  #Optional
+  display_name = "test_tf_model"
+  is_quick_mode = "false"
+  max_training_time_in_hours = "0.5"
+  model_version              = var.model_model_version
+}

examples/apm/apm_domains/main.tf

@@ -71,4 +71,4 @@ data "oci_apm_data_keys" "test_data_keys" {
 
   #Optional
   data_key_type = var.data_key_data_key_type
-}
+}

examples/devops/deployment_service/deploy_helm_artifact_with_attestation/deploy_helm_artifact_for_attestation.tf

@@ -46,7 +46,7 @@ locals {
 
 resource "oci_devops_deploy_artifact" "helm_chart_implicit_no_public_key" {
     #Required
-    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    argument_substitution_mode = "NONE"
     deploy_artifact_source {
         #Required
         deploy_artifact_source_type = "HELM_CHART"
@@ -66,7 +66,7 @@ resource "oci_devops_deploy_artifact" "helm_chart_implicit_no_public_key" {
 
 resource "oci_devops_deploy_artifact" "helm_chart_no_public_key" {
     #Required
-    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    argument_substitution_mode = "NONE"
     deploy_artifact_source {
         #Required
         deploy_artifact_source_type = "HELM_CHART"
@@ -92,7 +92,7 @@ resource "oci_devops_deploy_artifact" "helm_chart_no_public_key" {
 
 resource "oci_devops_deploy_artifact" "helm_chart_vault_public_key" {
     #Required
-    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    argument_substitution_mode = "NONE"
     deploy_artifact_source {
         #Required
         deploy_artifact_source_type = "HELM_CHART"
@@ -119,7 +119,7 @@ resource "oci_devops_deploy_artifact" "helm_chart_vault_public_key" {
 
 resource "oci_devops_deploy_artifact" "helm_chart_inline_public_key" {
     #Required
-    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    argument_substitution_mode = "NONE"
     deploy_artifact_source {
         #Required
         deploy_artifact_source_type = "HELM_CHART"

examples/jms/announcements/main.tf

@@ -0,0 +1,31 @@
+// Copyright (c) 2017, 2023, 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 "time_start" {}
+
+variable "time_end" {}
+
+variable "summary_contains" {
+  default = "example summary value"
+}
+
+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
+}
+
+data "oci_jms_announcements" "test_jms_announcements" {
+	#Optional
+	summary_contains = var.summary_contains
+	time_start = var.time_start
+	time_end = var.time_end
+}

examples/jms/fleet_advanced_feature_configuration/main.tf

@@ -11,8 +11,6 @@ variable "fleet_id" {
   default = "example-fleet-id"
 }
 
-
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid

examples/jms/fleet_blocklists/main.tf

@@ -15,8 +15,6 @@ variable "fleet_blocklist_operation" {
   default = "DELETE_JAVA_INSTALLATION"
 }
 
-
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid

examples/jms/fleet_crypto_analysis_results/main.tf

@@ -25,8 +25,6 @@ variable "crypto_analysis_result_id" {
   default = "example-crypto-analysis-result-id"
 }
 
-
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid

examples/jms/fleet_diagnoses/main.tf

@@ -0,0 +1,25 @@
+// Copyright (c) 2017, 2023, 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 "fleet_id" {
+  default = "example-fleet-id"
+}
+
+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
+}
+
+data "oci_jms_fleet_diagnoses" "test_jms_fleet_diagnoses" {
+	#Required
+	fleet_id = var.fleet_id
+}