Merge pull request #1762 from oracle/release_gh

Releasing version 4.107.0

Author: MeharwadeDivya

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 4.107.0 (February 08, 2023)
+
+### Added
+- Support for ADB-S: New ECPU-based SKUs for ADW and ATP
+- Support for Operations Insights : Customizable configuration
+- Support for ADB-D & ADB-CC | Autonomous Data Guard v3
+- Support for ADB-D | Oracle Home Version Control
+- Support for Devops Deploy Helm Attestation with helm args and helm diff
+### Bug Fix
+- Fix oci_core_instance to enable updating KMS Key id associated with the boot volume
+- Resource Discovery is not getting detected for Custom table resource in metering_computation service
+
 ## 4.106.0 (January 31, 2023)
 
 ### Added

examples/compute/instance/instance.tf

@@ -25,6 +25,9 @@ variable "ssh_public_key" {
 variable "ssh_private_key" {
 }
 
+variable "kms_key_ocid" {
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -123,6 +126,7 @@ resource "oci_core_instance" "test_instance" {
     # Otherwise, the default boot volume size of the image is used.
     # This should only be specified when source_type is set to "image".
     #boot_volume_size_in_gbs = "60"
+    kms_key_id = var.kms_key_ocid
   }
 
   # Apply the following flag only if you wish to preserve the attached boot volume upon destroying this instance

examples/database/adb/autonomous_database.tf

@@ -57,6 +57,18 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
   autonomous_maintenance_schedule_type = var.autonomous_database_autonomous_maintenance_schedule_type
 }
 
+resource "oci_database_autonomous_database" "test_autonomous_database_ecpu" {
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_ocid
+  compute_count            = "2.0"
+  compute_model            = "ECPU"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbEcpu"
+  db_version               = "19c"
+  license_model            = "LICENSE_INCLUDED"
+  is_free_tier             = "false"
+}
+
 resource "oci_database_autonomous_database" "test_autonomous_database_apex" {
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid

examples/database/atp-d/main.tf

@@ -53,6 +53,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
     weeks_of_month = ["2"]
   }
   rotate_key_trigger = "true"
+  version_preference = "LATEST_RELEASE_UPDATE"
 }
 
 resource "random_string" "autonomous_database_admin_password" {

examples/database/exadata_cc/adbd-dg/main.tf

@@ -39,6 +39,8 @@ resource "oci_database_exadata_infrastructure" "primary_exadata_infrastructure"
   cloud_control_plane_server1 = "10.32.88.1"
   cloud_control_plane_server2 = "10.32.88.3"
   compartment_id              = var.compartment_ocid
+  storage_count               = 3
+  compute_count               = 2
 
   contacts {
     email        = "shravan.thatikonda@oracle.com"
@@ -65,6 +67,8 @@ resource "oci_database_exadata_infrastructure" "standby_exadata_infrastructure"
   cloud_control_plane_server1 = "10.32.88.1"
   cloud_control_plane_server2 = "10.32.88.3"
   compartment_id              = var.compartment_ocid
+  storage_count               = 3
+  compute_count               = 2
 
   contacts {
     email        = "johndoe@acme.com"
@@ -112,10 +116,13 @@ resource "oci_database_vm_cluster_network" "primary_vm_cluster_network" {
     nodes {
       hostname = "myprefix2-cghdm1"
       ip       = "192.169.19.18"
+      db_server_id = data.oci_database_db_servers.primary_db_servers.db_servers.0.id
     }
     nodes {
       hostname = "myprefix2-cghdm2"
       ip       = "192.169.19.20"
+      db_server_id = data.oci_database_db_servers.primary_db_servers.db_servers.1.id
+
     }
     vlan_id = "11"
   }
@@ -129,12 +136,14 @@ resource "oci_database_vm_cluster_network" "primary_vm_cluster_network" {
       ip           = "192.168.19.10"
       vip          = "192.168.19.11"
       vip_hostname = "myprefix1-r64zc1-vip"
+      db_server_id = data.oci_database_db_servers.primary_db_servers.db_servers.0.id
     }
     nodes {
       hostname     = "primaryprefix1-r64zc2"
       ip           = "192.168.19.14"
       vip          = "192.168.19.15"
       vip_hostname = "primaryprefix1-r64zc2-vip"
+      db_server_id = data.oci_database_db_servers.primary_db_servers.db_servers.1.id
     }
     vlan_id = "10"
   }
@@ -175,10 +184,12 @@ resource "oci_database_vm_cluster_network" "standby_vm_cluster_network" {
     nodes {
       hostname = "myprefix2-cghdm1"
       ip       = "192.169.19.18"
+      db_server_id = data.oci_database_db_servers.standby_db_servers.db_servers.0.id
     }
     nodes {
       hostname = "myprefix2-cghdm2"
       ip       = "192.169.19.20"
+      db_server_id = data.oci_database_db_servers.standby_db_servers.db_servers.1.id
     }
     vlan_id = "11"
   }
@@ -192,13 +203,18 @@ resource "oci_database_vm_cluster_network" "standby_vm_cluster_network" {
       ip           = "192.168.19.10"
       vip          = "192.168.19.11"
       vip_hostname = "standbyprefix1-r64zc1-vip"
-    }
+    db_server_id = data.oci_database_db_servers.standby_db_servers.db_servers.0.id
+
+        }
     nodes {
       hostname     = "standbyprefix1-r64zc2"
       ip           = "192.168.19.14"
       vip          = "192.168.19.15"
       vip_hostname = "standbyprefix1-r64zc2-vip"
-    }
+    db_server_id = data.oci_database_db_servers.standby_db_servers.db_servers.1.id
+
+        }
+
     vlan_id = "10"
   }
   #Optional
@@ -217,8 +233,8 @@ resource "oci_database_autonomous_vm_cluster" "primary_autonomous_vm_cluster" {
   display_name                          = "PrimaryVmCluster"
   exadata_infrastructure_id             = oci_database_exadata_infrastructure.primary_exadata_infrastructure.id
   vm_cluster_network_id                 = oci_database_vm_cluster_network.primary_vm_cluster_network.id
-  cpu_core_count_per_node               = "6"
-  autonomous_data_storage_size_in_tbs   = "1.0"
+  cpu_core_count_per_node   = "10"
+  autonomous_data_storage_size_in_tbs = "2.0"
   memory_per_oracle_compute_unit_in_gbs = "12"
   total_container_databases             = "2"
   #Optional
@@ -240,8 +256,8 @@ resource "oci_database_autonomous_vm_cluster" "standby_autonomous_vm_cluster" {
   display_name                          = "StandbyVmCluster"
   exadata_infrastructure_id             = oci_database_exadata_infrastructure.standby_exadata_infrastructure.id
   vm_cluster_network_id                 = oci_database_vm_cluster_network.standby_vm_cluster_network.id
-  cpu_core_count_per_node               = "6"
-  autonomous_data_storage_size_in_tbs   = "1.0"
+  cpu_core_count_per_node   = "10"
+  autonomous_data_storage_size_in_tbs = "2.0"
   memory_per_oracle_compute_unit_in_gbs = "12"
   total_container_databases             = "2"
   #Optional
@@ -340,6 +356,26 @@ resource "oci_database_autonomous_container_database_dataguard_association_opera
   depends_on = [
   oci_database_autonomous_container_database_dataguard_association_operation.failover]
 }
+
+resource "oci_database_autonomous_container_database_dataguard_association" dgresource{
+  autonomous_container_database_id                       = oci_database_autonomous_container_database.dg_autonomous_container_database.id
+  autonomous_container_database_dataguard_association_id = data.oci_database_autonomous_container_database_dataguard_associations.primary_autonomous_dg_associations.autonomous_container_database_dataguard_associations[0].id
+  is_automatic_failover_enabled =   false
+  protection_mode               = "MAXIMUM_AVAILABILITY"
+  fast_start_fail_over_lag_limit_in_seconds = null
+}
+
+data "oci_database_db_servers" "primary_db_servers" {
+  #Required
+  compartment_id            = var.compartment_ocid
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.primary_exadata_infrastructure.id
+}
+
+data "oci_database_db_servers" "standby_db_servers" {
+  #Required
+  compartment_id            = var.compartment_ocid
+  exadata_infrastructure_id = oci_database_exadata_infrastructure.standby_exadata_infrastructure.id
+}
 #### End Resources ####
 #######################
 

examples/database/exadata_cc/adbd-dg/outputs.tf

@@ -41,4 +41,5 @@ output "primary_autonomous_dg_role" {
 
 output "standby_autonomous_dg_role" {
   value = data.oci_database_autonomous_container_database_dataguard_association.standby_autonomous_dg_association.role
-}
+}
+

examples/database/exadata_cc/adbd/acd.tf

@@ -23,4 +23,5 @@ resource "oci_database_autonomous_container_database" "autonomous_container_data
   }
   patch_model = "RELEASE_UPDATES"
   service_level_agreement_type = "STANDARD"
+  version_preference = "LATEST_RELEASE_UPDATE"
 }

examples/devops/deployment_service/deploy_helm_artifact/deploy_helm_artifact.tf

@@ -61,7 +61,7 @@ resource "oci_devops_deploy_artifact" "test_deploy_helm_artifact" {
   argument_substitution_mode = "NONE"
   deploy_artifact_source {
     deploy_artifact_source_type = "HELM_CHART"
-    chart_url = "iad.ocir.io/ax022wvgmjpq/fake"
+    chart_url = "oci://iad.ocir.io/ax022wvgmjpq/fake"
     deploy_artifact_version = "0.1"
   }
 }

examples/devops/deployment_service/deploy_helm_artifact_with_attestation/deploy_helm_artifact_for_attestation.tf

@@ -0,0 +1,178 @@
+/*
+This example demonstrates the various ways a helm chart artifact can be created and specifically,
+the options available for having a signed helm chart verified per
+https://helm.sh/docs/topics/provenance/.
+*/
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+variable "vault_secret_public_key_ocid" {
+}
+
+provider "oci" {
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+
+# OCID of the DevOps project.
+variable "project_id" {
+}
+
+
+locals {
+  chart_url = "oci://iad.ocir.io/namespace/repository/chart-name"
+  chart_version = "0.0.1"
+  vault_secret_public_key_ocid = var.vault_secret_public_key_ocid
+  public_key = "" // Add the public key here
+}
+
+
+resource "oci_devops_deploy_artifact" "helm_chart_implicit_no_public_key" {
+    #Required
+    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    deploy_artifact_source {
+        #Required
+        deploy_artifact_source_type = "HELM_CHART"
+
+        #Optional
+        chart_url = local.chart_url
+        deploy_artifact_version = local.chart_version
+    }
+    deploy_artifact_type = "HELM_CHART"
+    project_id = var.project_id
+
+    #Optional
+    description = "helm chart artifact with no public key"
+    display_name = "helmChartWithImplicitNoPublicKey"
+}
+
+
+resource "oci_devops_deploy_artifact" "helm_chart_no_public_key" {
+    #Required
+    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    deploy_artifact_source {
+        #Required
+        deploy_artifact_source_type = "HELM_CHART"
+
+        #Optional
+        chart_url = local.chart_url
+        deploy_artifact_version = local.chart_version
+
+        helm_verification_key_source {
+            verification_key_source_type = "NONE"
+        }
+    }
+    deploy_artifact_type = "HELM_CHART"
+    project_id = var.project_id
+
+    #Optional
+    description = "helm chart artifact with no public key"
+    display_name = "helmChartWithNoPublicKey"
+
+}
+
+
+
+resource "oci_devops_deploy_artifact" "helm_chart_vault_public_key" {
+    #Required
+    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    deploy_artifact_source {
+        #Required
+        deploy_artifact_source_type = "HELM_CHART"
+
+        #Optional
+        chart_url = local.chart_url
+        deploy_artifact_version = local.chart_version
+
+        helm_verification_key_source {
+            verification_key_source_type = "VAULT_SECRET"
+            vault_secret_id = local.vault_secret_public_key_ocid
+        }
+    }
+    deploy_artifact_type = "HELM_CHART"
+    project_id = var.project_id
+
+    #Optional
+    description = "helm chart artifact with vault public key"
+    display_name = "helmChartVaultPublicKey"
+
+
+}
+
+
+resource "oci_devops_deploy_artifact" "helm_chart_inline_public_key" {
+    #Required
+    argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+    deploy_artifact_source {
+        #Required
+        deploy_artifact_source_type = "HELM_CHART"
+
+        #Optional
+        chart_url = local.chart_url
+        deploy_artifact_version = local.chart_version
+
+        helm_verification_key_source {
+            verification_key_source_type = "INLINE_PUBLIC_KEY"
+            current_public_key = local.public_key
+            previous_public_key = local.public_key
+        }
+    }
+    deploy_artifact_type = "HELM_CHART"
+    project_id = var.project_id
+
+    #Optional
+    description = "helm chart artifact with inline public keys"
+    display_name = "helmChartInlinePublicKeys"
+
+}
+
+data "oci_devops_deploy_artifact" "retrieve_artifact_with_vault_public_key" {
+    deploy_artifact_id = oci_devops_deploy_artifact.helm_chart_vault_public_key.id
+}
+
+data "oci_devops_deploy_artifact" "retrieve_artifact_with_inline_public_key" {
+    deploy_artifact_id = oci_devops_deploy_artifact.helm_chart_inline_public_key.id
+}
+
+data "oci_devops_deploy_artifact" "retrieve_artifact_with_no_public_key" {
+    deploy_artifact_id = oci_devops_deploy_artifact.helm_chart_no_public_key.id
+}
+
+data "oci_devops_deploy_artifact" "retrieve_artifact_implicit_no_public_key" {
+    deploy_artifact_id = oci_devops_deploy_artifact.helm_chart_implicit_no_public_key.id
+}
+
+
+output helm_chart_implicit_no_public_key {
+    value = data.oci_devops_deploy_artifact.retrieve_artifact_implicit_no_public_key
+}
+
+output helm_chart_no_public_key {
+    value = data.oci_devops_deploy_artifact.retrieve_artifact_with_no_public_key
+}
+
+output helm_chart_vault_public_key {
+    value = data.oci_devops_deploy_artifact.retrieve_artifact_with_vault_public_key
+}
+
+output helm_chart_inline_public_key {
+    value = data.oci_devops_deploy_artifact.retrieve_artifact_with_inline_public_key
+}
+