Merge pull request #1814 from oracle/release_gh

Releasing version 4.113.0

Author: vsin12

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 4.113.0 (March 22, 2023)
+
+### Added
+- Support for GoldenGate Additional Connection Types R3
+- Support for Custom shapes for the build runner
+- Support for ADB-S: Cheaper Autonomous Data Guard
+- Support for Pre Built Functions
+- Support for ADB on ExaCC | Long Term Backup Retention
+- Support for ExaCS | DBRS integration
+### Bug Fix
+- Set compartment_id for oci_artifacts_container_configuration to fix state file inconsistency
+- Test enabling resource discovery for core resources: oci_core_compute_capacity_reservation
+- Edit Volume ID inside a VolumeGroup results the VG gets destoried
+- Resource Discovery failing for DNS service with oci_dns_rrset resource
+
 ## 4.112.0 (March 15, 2023)
 
 ### Added

examples/database/db_systems/db_exacs/resources.tf

@@ -67,6 +67,37 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
   display_name = "createdDbHome"
 }
 
+resource "oci_database_db_home" "test_dbrs_db_home_vm_cluster" {
+  vm_cluster_id = oci_database_cloud_vm_cluster.test_cloud_vm_cluster.id
+
+  database {
+    admin_password = "BEstrO0ng_#11"
+    db_name        = "dbrsDb"
+    character_set  = "AL32UTF8"
+    ncharacter_set = "AL16UTF16"
+    db_workload    = "OLTP"
+    pdb_name       = "pdbName"
+    db_backup_config {
+      auto_backup_enabled    = "true"
+      auto_backup_window     = "SLOT_TWO"
+      backup_deletion_policy = "DELETE_IMMEDIATELY"
+      backup_destination_details {
+        dbrs_policy_id = "dbrsPolicyOcid"
+        type           = "DBRS"
+      }
+    }
+    freeform_tags = {
+      "Department" = "Finance"
+    }
+  }
+
+  # VM_CLUSTER_BACKUP can also be specified as a source for cloud VM clusters.
+  source       = "VM_CLUSTER_NEW"
+  db_version   = "19.0.0.0"
+  display_name = "createdDbrsDbHome"
+}
+
+
 resource "oci_database_db_home" "test_db_home_vm_cluster_no_db" {
   vm_cluster_id = oci_database_cloud_vm_cluster.test_cloud_vm_cluster.id
 

examples/database/db_systems/db_exacs/variables.tf

@@ -8,7 +8,10 @@ variable "private_key_path" {}
 variable "region" {}
 
 variable "compartment_ocid" {}
-variable "ssh_public_key" {}
+
+variable "ssh_public_key" {
+  default = "ssh-rsa"
+}
 variable "ssh_private_key" {}
 
 variable "cloud_exadata_infrastructure_shape" {

examples/database/exadata_cc/adbd/acd.tf

@@ -6,6 +6,7 @@ resource "random_string" "db_unique_name" {
 
 resource "oci_database_autonomous_container_database" "autonomous_container_database" {
   autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
+  db_version = "19.18.0.1.0"
   backup_config {
     backup_destination_details {
       type = "LOCAL"

examples/database/exadata_cc/adbd/adb.tf

@@ -10,7 +10,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   #Required
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid
-  cpu_core_count           = "1"
+  compute_count            = "2"
   data_storage_size_in_tbs = "1"
   db_name                  = "atpdb1"
 

examples/devops/build_service/build_pipeline/build_pipeline.tf

@@ -0,0 +1,103 @@
+// 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 "compartment_ocid" {}
+
+variable "build_pipeline_build_pipeline_parameters_items_default_value" {
+  default = "defaultValue"
+}
+
+variable "build_pipeline_build_pipeline_parameters_items_description" {
+  default = "description"
+}
+
+variable "build_pipeline_build_pipeline_parameters_items_name" {
+  default = "name"
+}
+
+variable "build_pipeline_defined_tags_value" {
+  default = "value"
+}
+
+variable "build_pipeline_description" {
+  default = "description"
+}
+
+variable "build_pipeline_display_name" {
+  default = "displayName"
+}
+
+variable "build_pipeline_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+variable "build_pipeline_id" {
+  default = "id"
+}
+
+variable "build_pipeline_state" {
+  default = "ACTIVE"
+}
+
+
+
+provider "oci" {
+  # version          = "4.110.0"
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "random_string" "topicname" {
+  length  = 10
+  special = false
+}
+
+resource "random_string" "projectname" {
+  length  = 10
+  special = false
+}
+
+resource "oci_ons_notification_topic" "test_notification_topic" {
+  #Required
+  compartment_id = var.compartment_ocid
+  name           = join("", ["A", random_string.topicname.result])
+}
+
+resource "oci_devops_project" "test_project" {
+  #Required
+  compartment_id = var.compartment_ocid
+  name           = join("", ["A", random_string.projectname.result])
+  notification_config {
+    #Required
+    topic_id = oci_ons_notification_topic.test_notification_topic.id
+  }
+}
+
+resource "oci_devops_build_pipeline" "test_build_pipeline" {
+  #Required
+  project_id = oci_devops_project.test_project.id
+
+  #Optional
+  build_pipeline_parameters {
+    #Required
+    items {
+      #Required
+      default_value = var.build_pipeline_build_pipeline_parameters_items_default_value
+      name          = var.build_pipeline_build_pipeline_parameters_items_name
+
+      #Optional
+      description = var.build_pipeline_build_pipeline_parameters_items_description
+    }
+  }
+  description   = var.build_pipeline_description
+  display_name  = var.build_pipeline_display_name
+}
+

examples/devops/build_service/build_stage/build_stage.tf

@@ -48,7 +48,7 @@ variable "base_url" {
 resource "oci_ons_notification_topic" "test_notification_topic" {
   #Required
   compartment_id = var.compartment_ocid
-  name           = random_string.topicname.result
+  name           = join("", ["A", random_string.topicname.result])
 }
 
 resource "oci_devops_project" "test_project" {
@@ -177,6 +177,11 @@ resource "oci_devops_build_pipeline_stage" "test_build_pipeline_build_github_sta
   image                              = "OL7_X86_64_STANDARD_10"
   primary_build_source               = "primaryBuildSource"
   stage_execution_timeout_in_seconds = "10"
+  build_runner_shape_config {
+    build_runner_type = "CUSTOM"
+    memory_in_gbs = 4
+    ocpus = 1
+  }
   build_source_collection {
     items {
       connection_type   = "GITHUB"

examples/functions/main.tf

@@ -55,7 +55,7 @@ resource "oci_core_subnet" "test_subnet" {
 resource "oci_functions_application" "test_application" {
   #Required
   compartment_id = var.compartment_ocid
-  display_name   = "example-application"
+  display_name   = "example-application-test"
   subnet_ids     = [oci_core_subnet.test_subnet.id]
 
   #Optional
@@ -83,15 +83,15 @@ data "oci_functions_applications" "test_applications" {
   compartment_id = var.compartment_ocid
 
   #Optional
-  display_name = "example-application"
+  display_name = "example-application-test"
   id           = oci_functions_application.test_application.id
   state        = var.application_state
 }
 
 resource "oci_functions_function" "test_function" {
   #Required
   application_id = oci_functions_application.test_application.id
-  display_name   = "example-function"
+  display_name   = "example-function-test"
   image          = var.function_image
   memory_in_mbs  = "128"
 
@@ -109,84 +109,66 @@ resource "oci_functions_function" "test_function" {
   }
 }
 
-data "oci_functions_functions" "test_functions" {
-  #Required
-  application_id = oci_functions_application.test_application.id
-
+data "oci_functions_pbf_listings" "test_listings" {
   #Optional
-  display_name = "example-function"
-  id           = oci_functions_function.test_function.id
-  state        = "ACTIVE"
+  name = var.pbf_listing_name
 }
 
-resource "time_sleep" "wait_function_provisioning" {
-  depends_on      = [oci_functions_function.test_function]
-
-  create_duration = "5s"
+data "oci_functions_pbf_listing" "test_listing" {
+  #Required
+  pbf_listing_id = var.pbf_listing_id
 }
 
-resource "oci_functions_invoke_function" "test_invoke_function" {
-  depends_on           = [time_sleep.wait_function_provisioning]
-  fn_intent            = "httprequest"
-  fn_invoke_type       = "sync"
-  function_id          = oci_functions_function.test_function.id
-  invoke_function_body = var.invoke_function_body
-}
+data "oci_functions_pbf_listing_versions" "test_versions" {
+  #Required
+  pbf_listing_id = var.pbf_listing_id
 
-resource "oci_functions_invoke_function" "test_invoke_function_source_path" {
-  depends_on             = [time_sleep.wait_function_provisioning]
-  fn_intent              = "httprequest"
-  fn_invoke_type         = "sync"
-  function_id            = oci_functions_function.test_function.id
-  input_body_source_path = var.invoke_function_body_source_path
+  #Optional
+  is_current_version = true
 }
 
-resource "oci_functions_invoke_function" "test_invoke_function_detached" {
-  depends_on           = [time_sleep.wait_function_provisioning]
-  fn_intent            = "httprequest"
-  fn_invoke_type       = "detached"
-  function_id          = oci_functions_function.test_function.id
-  invoke_function_body = var.invoke_function_body
+data "oci_functions_pbf_listing_version" "test_version" {
+  #Required
+  pbf_listing_version_id = var.pbf_listing_version_id
 }
 
-resource "oci_functions_invoke_function" "test_invoke_function_encoded_body" {
-  depends_on                          = [time_sleep.wait_function_provisioning]
-  fn_intent                           = "cloudevent"
-  fn_invoke_type                      = "sync"
-  function_id                         = oci_functions_function.test_function.id
-  invoke_function_body_base64_encoded = base64encode(var.invoke_function_body)
+data "oci_functions_pbf_listing_triggers" "test_triggers" {
+  #Optional
+  name = var.pbf_trigger_name
 }
 
-resource "oci_functions_invoke_function" "test_invoke_function_encoded_body_detached" {
-  depends_on                          = [time_sleep.wait_function_provisioning]
-  fn_intent                           = "httprequest"
-  fn_invoke_type                      = "detached"
-  function_id                         = oci_functions_function.test_function.id
-  invoke_function_body_base64_encoded = base64encode(var.invoke_function_body)
+resource "oci_functions_function" "test_pre_built_function" {
+  application_id = oci_functions_application.test_application.id
+  display_name = "example-pre-built-function"
+  memory_in_mbs = "128"
+  source_details {
+    pbf_listing_id = var.pbf_listing_id
+    source_type = "PRE_BUILT_FUNCTIONS"
+  }
 }
 
-resource "oci_functions_invoke_function" "test_invoke_function_encoded_content" {
-  depends_on            = [time_sleep.wait_function_provisioning]
-  fn_intent             = "httprequest"
-  fn_invoke_type        = "sync"
-  function_id           = oci_functions_function.test_function.id
-  base64_encode_content = true
-}
+data "oci_functions_functions" "test_pre_built_functions" {
+  #Required
+  application_id = oci_functions_application.test_application.id
 
-output "test_invoke_function_content" {
-  value = oci_functions_invoke_function.test_invoke_function.content
+  #Optional
+  display_name = "example-pre-built-function"
+  id           = oci_functions_function.test_pre_built_function.id
+  state        = "ACTIVE"
 }
 
-output "test_invoke_function_source_path_content" {
-  value = oci_functions_invoke_function.test_invoke_function_source_path.content
-}
+data "oci_functions_functions" "test_functions" {
+  #Required
+  application_id = oci_functions_application.test_application.id
 
-output "test_invoke_function_encoded_body" {
-  value = oci_functions_invoke_function.test_invoke_function_encoded_body.content
+  #Optional
+  display_name = "example-function-test"
+  id           = oci_functions_function.test_function.id
+  state        = "ACTIVE"
 }
 
-output "test_invoke_function_encoded_content" {
-  value = base64decode(
-    oci_functions_invoke_function.test_invoke_function_encoded_content.content,
-  )
+resource "time_sleep" "wait_function_provisioning" {
+  depends_on      = [oci_functions_function.test_function]
+
+  create_duration = "5s"
 }

examples/functions/variables.tf

@@ -20,8 +20,9 @@ variable "compartment_ocid" {
 }
 
 variable "config" {
+  type = map(string) 
   default = {
-    "MY_FUNCTION_CONFIG" = "ConfVal"
+    "MEDIA_WORKFLOW_ID" = "someworkflowid"
   }
 }
 
@@ -85,11 +86,17 @@ variable "function_timeout_in_seconds" {
   default = 30
 }
 
-variable "invoke_function_body" {
+variable "kms_key_ocid" {
 }
 
-variable "invoke_function_body_source_path" {
+variable "pbf_listing_name" {
 }
 
-variable "kms_key_ocid" {
+variable "pbf_listing_id" {
 }
+
+variable "pbf_listing_version_id" {
+}
+
+variable "pbf_trigger_name" {
+}