Merge pull request #2096 from oracle/release_gh

Releasing version 5.38.0
oracle · Apr 17, 2024 · f4f8330 · f4f8330
2 parents 4185ea1 + 3b644ac
commit f4f8330
Show file tree

Hide file tree

Showing 308 changed files with 7,796 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 5.38.0 (April 17, 2024)
+
+### Added
+- Support for Oracle Process Automation (OPA) : Support for Start/Stop operation in Public API
+- Support for ODSC - Model Deploy - Custom Public Egress Support
+- Support for Cost Management - Usage Statements
+- Support for Oracle Home Version Control - Phase 2 | ADB-D and ADB-C@C
+- Support for OCI Cache Service with Redis - NSG Support
+### Bug Fix
+- Update psql Documentaiton for TF Provider
+
 ## 5.37.0 (April 09, 2024)
 
 ### Added

diff --git a/examples/database/atp-d/main.tf b/examples/database/atp-d/main.tf
@@ -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 = []
 }

diff --git a/examples/database/exadata_cc/adbd/acd_from_adsi.tf b/examples/database/exadata_cc/adbd/acd_from_adsi.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
+}
diff --git a/examples/database/exadata_cc/adbd/adsi.tf b/examples/database/exadata_cc/adbd/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"
+    }
+}
diff --git a/examples/database/exadata_cc/adbd/autonomous_vm_cluster.tf b/examples/database/exadata_cc/adbd/autonomous_vm_cluster.tf
@@ -54,4 +54,3 @@ resource "oci_database_autonomous_vm_cluster" "autonomous_vm_cluster_2" {
 
 
 
-
diff --git a/examples/datascience/model_deployment/model_deployment.tf b/examples/datascience/model_deployment/model_deployment.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
 }
diff --git a/examples/metering_computation/usage_statement_email_recipients_group/main.tf b/examples/metering_computation/usage_statement_email_recipients_group/main.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"
+  }
+}
diff --git a/examples/opa/main.tf b/examples/opa/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}"]

diff --git a/examples/zips/adm.zip b/examples/zips/adm.zip
diff --git a/examples/zips/aiAnomalyDetection.zip b/examples/zips/aiAnomalyDetection.zip
diff --git a/examples/zips/aiDocument.zip b/examples/zips/aiDocument.zip
diff --git a/examples/zips/aiLanguage.zip b/examples/zips/aiLanguage.zip
diff --git a/examples/zips/aiVision.zip b/examples/zips/aiVision.zip
diff --git a/examples/zips/always_free.zip b/examples/zips/always_free.zip
diff --git a/examples/zips/analytics.zip b/examples/zips/analytics.zip
diff --git a/examples/zips/announcements_service.zip b/examples/zips/announcements_service.zip
diff --git a/examples/zips/api_gateway.zip b/examples/zips/api_gateway.zip
diff --git a/examples/zips/apm.zip b/examples/zips/apm.zip
diff --git a/examples/zips/appmgmt_control.zip b/examples/zips/appmgmt_control.zip
diff --git a/examples/zips/artifacts.zip b/examples/zips/artifacts.zip
diff --git a/examples/zips/audit.zip b/examples/zips/audit.zip
diff --git a/examples/zips/autoscaling.zip b/examples/zips/autoscaling.zip
diff --git a/examples/zips/bastion.zip b/examples/zips/bastion.zip
diff --git a/examples/zips/big_data_service.zip b/examples/zips/big_data_service.zip
diff --git a/examples/zips/blockchain.zip b/examples/zips/blockchain.zip
diff --git a/examples/zips/budget.zip b/examples/zips/budget.zip
diff --git a/examples/zips/capacity_management.zip b/examples/zips/capacity_management.zip
diff --git a/examples/zips/certificatesManagement.zip b/examples/zips/certificatesManagement.zip
diff --git a/examples/zips/cloudBridge.zip b/examples/zips/cloudBridge.zip
diff --git a/examples/zips/cloudMigrations.zip b/examples/zips/cloudMigrations.zip
diff --git a/examples/zips/cloudguard.zip b/examples/zips/cloudguard.zip
diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip
diff --git a/examples/zips/computecloudatcustomer.zip b/examples/zips/computecloudatcustomer.zip
diff --git a/examples/zips/computeinstanceagent.zip b/examples/zips/computeinstanceagent.zip
diff --git a/examples/zips/concepts.zip b/examples/zips/concepts.zip
diff --git a/examples/zips/container_engine.zip b/examples/zips/container_engine.zip
diff --git a/examples/zips/container_instances.zip b/examples/zips/container_instances.zip
diff --git a/examples/zips/database.zip b/examples/zips/database.zip
diff --git a/examples/zips/databaseTools.zip b/examples/zips/databaseTools.zip
diff --git a/examples/zips/databasemanagement.zip b/examples/zips/databasemanagement.zip
diff --git a/examples/zips/databasemigration.zip b/examples/zips/databasemigration.zip
diff --git a/examples/zips/datacatalog.zip b/examples/zips/datacatalog.zip
diff --git a/examples/zips/dataflow.zip b/examples/zips/dataflow.zip
diff --git a/examples/zips/dataintegration.zip b/examples/zips/dataintegration.zip
diff --git a/examples/zips/datalabeling.zip b/examples/zips/datalabeling.zip
diff --git a/examples/zips/datasafe.zip b/examples/zips/datasafe.zip
diff --git a/examples/zips/datascience.zip b/examples/zips/datascience.zip
diff --git a/examples/zips/devops.zip b/examples/zips/devops.zip
diff --git a/examples/zips/disaster_recovery.zip b/examples/zips/disaster_recovery.zip
diff --git a/examples/zips/dns.zip b/examples/zips/dns.zip
diff --git a/examples/zips/em_warehouse.zip b/examples/zips/em_warehouse.zip
diff --git a/examples/zips/email.zip b/examples/zips/email.zip
diff --git a/examples/zips/events.zip b/examples/zips/events.zip
diff --git a/examples/zips/fast_connect.zip b/examples/zips/fast_connect.zip
diff --git a/examples/zips/functions.zip b/examples/zips/functions.zip
diff --git a/examples/zips/fusionapps.zip b/examples/zips/fusionapps.zip
diff --git a/examples/zips/generative_ai.zip b/examples/zips/generative_ai.zip
diff --git a/examples/zips/goldengate.zip b/examples/zips/goldengate.zip
diff --git a/examples/zips/health_checks.zip b/examples/zips/health_checks.zip
diff --git a/examples/zips/id6.zip b/examples/zips/id6.zip
diff --git a/examples/zips/identity.zip b/examples/zips/identity.zip
diff --git a/examples/zips/identity_data_plane.zip b/examples/zips/identity_data_plane.zip
diff --git a/examples/zips/identity_domains.zip b/examples/zips/identity_domains.zip
diff --git a/examples/zips/integration.zip b/examples/zips/integration.zip
diff --git a/examples/zips/jms.zip b/examples/zips/jms.zip
diff --git a/examples/zips/jms_java_downloads.zip b/examples/zips/jms_java_downloads.zip
diff --git a/examples/zips/kms.zip b/examples/zips/kms.zip
diff --git a/examples/zips/license_manager.zip b/examples/zips/license_manager.zip
diff --git a/examples/zips/limits.zip b/examples/zips/limits.zip
diff --git a/examples/zips/load_balancer.zip b/examples/zips/load_balancer.zip
diff --git a/examples/zips/log_analytics.zip b/examples/zips/log_analytics.zip
diff --git a/examples/zips/logging.zip b/examples/zips/logging.zip
diff --git a/examples/zips/management_agent.zip b/examples/zips/management_agent.zip
diff --git a/examples/zips/management_dashboard.zip b/examples/zips/management_dashboard.zip
diff --git a/examples/zips/marketplace.zip b/examples/zips/marketplace.zip
diff --git a/examples/zips/media_services.zip b/examples/zips/media_services.zip
diff --git a/examples/zips/metering_computation.zip b/examples/zips/metering_computation.zip
diff --git a/examples/zips/monitoring.zip b/examples/zips/monitoring.zip
diff --git a/examples/zips/mysql.zip b/examples/zips/mysql.zip
diff --git a/examples/zips/network_firewall.zip b/examples/zips/network_firewall.zip
diff --git a/examples/zips/network_load_balancer.zip b/examples/zips/network_load_balancer.zip
diff --git a/examples/zips/networking.zip b/examples/zips/networking.zip
diff --git a/examples/zips/nosql.zip b/examples/zips/nosql.zip
diff --git a/examples/zips/notifications.zip b/examples/zips/notifications.zip
diff --git a/examples/zips/object_storage.zip b/examples/zips/object_storage.zip
diff --git a/examples/zips/ocvp.zip b/examples/zips/ocvp.zip
diff --git a/examples/zips/onesubscription.zip b/examples/zips/onesubscription.zip
diff --git a/examples/zips/opa.zip b/examples/zips/opa.zip
diff --git a/examples/zips/opensearch.zip b/examples/zips/opensearch.zip
diff --git a/examples/zips/operator_access_control.zip b/examples/zips/operator_access_control.zip
diff --git a/examples/zips/opsi.zip b/examples/zips/opsi.zip
diff --git a/examples/zips/optimizer.zip b/examples/zips/optimizer.zip
diff --git a/examples/zips/oracle_cloud_vmware_solution.zip b/examples/zips/oracle_cloud_vmware_solution.zip
diff --git a/examples/zips/oracle_content_experience.zip b/examples/zips/oracle_content_experience.zip
diff --git a/examples/zips/oracle_digital_assistant.zip b/examples/zips/oracle_digital_assistant.zip
diff --git a/examples/zips/os_management_hub.zip b/examples/zips/os_management_hub.zip
diff --git a/examples/zips/osmanagement.zip b/examples/zips/osmanagement.zip
diff --git a/examples/zips/osp_gateway.zip b/examples/zips/osp_gateway.zip
diff --git a/examples/zips/osub_billing_schedule.zip b/examples/zips/osub_billing_schedule.zip
diff --git a/examples/zips/osub_organization_subscription.zip b/examples/zips/osub_organization_subscription.zip
diff --git a/examples/zips/osub_subscription.zip b/examples/zips/osub_subscription.zip
diff --git a/examples/zips/osub_usage.zip b/examples/zips/osub_usage.zip
diff --git a/examples/zips/pic.zip b/examples/zips/pic.zip
diff --git a/examples/zips/psql.zip b/examples/zips/psql.zip
diff --git a/examples/zips/queue.zip b/examples/zips/queue.zip
diff --git a/examples/zips/recovery.zip b/examples/zips/recovery.zip
diff --git a/examples/zips/redis.zip b/examples/zips/redis.zip
diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip
diff --git a/examples/zips/serviceManagerProxy.zip b/examples/zips/serviceManagerProxy.zip
diff --git a/examples/zips/service_catalog.zip b/examples/zips/service_catalog.zip
diff --git a/examples/zips/service_connector_hub.zip b/examples/zips/service_connector_hub.zip
diff --git a/examples/zips/service_mesh.zip b/examples/zips/service_mesh.zip
diff --git a/examples/zips/stack_monitoring.zip b/examples/zips/stack_monitoring.zip
diff --git a/examples/zips/storage.zip b/examples/zips/storage.zip
diff --git a/examples/zips/streaming.zip b/examples/zips/streaming.zip
diff --git a/examples/zips/usage_proxy.zip b/examples/zips/usage_proxy.zip
diff --git a/examples/zips/vault_secret.zip b/examples/zips/vault_secret.zip
diff --git a/examples/zips/vbs_inst.zip b/examples/zips/vbs_inst.zip
diff --git a/examples/zips/visual_builder.zip b/examples/zips/visual_builder.zip
diff --git a/examples/zips/vn_monitoring.zip b/examples/zips/vn_monitoring.zip
diff --git a/examples/zips/vulnerability_scanning_service.zip b/examples/zips/vulnerability_scanning_service.zip
diff --git a/examples/zips/web_app_acceleration.zip b/examples/zips/web_app_acceleration.zip
diff --git a/examples/zips/web_app_firewall.zip b/examples/zips/web_app_firewall.zip
diff --git a/examples/zips/web_application_acceleration_and_security.zip b/examples/zips/web_application_acceleration_and_security.zip
diff --git a/go.mod b/go.mod
@@ -65,7 +65,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.63.1
+	github.com/oracle/oci-go-sdk/v65 v65.63.2
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect

diff --git a/go.sum b/go.sum
@@ -509,8 +509,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/oracle/oci-go-sdk/v65 v65.63.1 h1:dYL7sk9L1+C9LCmoq+zjPMNteuJJfk54YExq/4pV9xQ=
-github.com/oracle/oci-go-sdk/v65 v65.63.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.63.2 h1:wFuw//K6d6jGsU46fiWCF3R1WbwaDdsf6xA7jEG8sJM=
+github.com/oracle/oci-go-sdk/v65 v65.63.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go
@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "5.37.0"
-const ReleaseDate = "2024-04-10"
+const Version = "5.38.0"
+const ReleaseDate = "2024-04-17"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)