Merge pull request #2175 from oracle/release_gh

Releasing OCI Provider v6.7.0

Author: tf-oci-pub

CHANGELOG.md

@@ -90,6 +90,18 @@ resource "oci_database_autonomous_database" "test_autonomous_database_ecpu" {
   is_free_tier             = "false"
 }
 
+resource "oci_database_autonomous_database" "test_autonomous_database_developer" {
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_ocid
+  compute_count            = "4.0"
+  compute_model            = "ECPU"
+  data_storage_size_in_gb = "20"
+  db_name                  = "adbDeveloper"
+  db_version               = "19c"
+  license_model            = "LICENSE_INCLUDED"
+  is_free_tier             = "false"
+}
+
 resource "oci_database_autonomous_database" "test_autonomous_database_local_adg_failover_data_loss_limit" {
   admin_password           = random_string.autonomous_database_admin_password.result
   compartment_id           = var.compartment_ocid

examples/database/adb/autonomous_database.tf

@@ -0,0 +1,41 @@
+// Copyright (c) 2017, 2024, 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 "calculate_audit_volume_available_audit_collection_start_time" {
+  default = "2023-05-17T15:05:28Z"
+}
+
+variable "calculate_audit_volume_available_database_unique_name" {
+  default = "databaseUniqueName"
+}
+
+variable "calculate_audit_volume_available_trail_locations" {
+  default = []
+}
+
+
+
+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
+}
+
+resource "oci_data_safe_calculate_audit_volume_available" "test_calculate_audit_volume_available" {
+  #Required
+  audit_profile_id = oci_data_safe_audit_profile_management.test_audit_profile_management.id
+
+  #Optional
+  audit_collection_start_time = var.calculate_audit_volume_available_audit_collection_start_time
+  database_unique_name        = var.calculate_audit_volume_available_database_unique_name
+  trail_locations             = var.calculate_audit_volume_available_trail_locations
+}
+

examples/datasafe/calculate_audit_volume_available/calculate_audit_volume_available.tf

@@ -0,0 +1,36 @@
+// Copyright (c) 2017, 2024, 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 "calculate_audit_volume_collected_time_from_month" {
+  default = "2024-05-17T15:05:28Z"
+}
+
+variable "calculate_audit_volume_collected_time_to_month" {
+  default = "2024-05-17T17:05:28Z"
+}
+
+
+
+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
+}
+
+
+resource "oci_data_safe_calculate_audit_volume_collected" "test_calculate_audit_volume_collected" {
+  #Required
+  audit_profile_id = oci_data_safe_audit_profile_management.test_audit_profile_management.id
+  time_from_month  = var.calculate_audit_volume_collected_time_from_month
+
+  #Optional
+  time_to_month = var.calculate_audit_volume_collected_time_to_month
+}

examples/datasafe/calculate_audit_volume_collected/calculate_audit_volume_collected.tf

@@ -18,10 +18,6 @@ variable "dr_plan_execution_display_name" {
   default = "displayName"
 }
 
-variable "dr_plan_execution_dr_plan_execution_type" {
-  default = "SWITCHOVER_PRECHECK"
-}
-
 variable "dr_plan_execution_execution_options_are_prechecks_enabled" {
   default = false
 }
@@ -81,6 +77,5 @@ data "oci_disaster_recovery_dr_plan_executions" "test_dr_plan_executions" {
   #Optional
   display_name           = var.dr_plan_execution_display_name
   dr_plan_execution_id   = oci_disaster_recovery_dr_plan_execution.test_dr_plan_execution.id
-  dr_plan_execution_type = var.dr_plan_execution_dr_plan_execution_type
   #state                  = var.dr_plan_execution_state
 }

examples/disaster_recovery/dr_plan_execution/dr_plan_execution.tf

@@ -59,7 +59,7 @@ provider "oci" {
 resource "oci_integration_integration_instance" "test_integration_instance" {
   #Required
   compartment_id            = var.compartment_id
-  integration_instance_type = "STANDARDX"
+  integration_instance_type = "HEALTHCARE"
   shape                     = "DEVELOPMENT"
   display_name              = "displayName"
   is_byol                   = "false"
@@ -96,17 +96,17 @@ data "oci_integration_integration_instance" "test_integration_instance" {
   integration_instance_id = oci_integration_integration_instance.test_integration_instance.id
 }
 
-resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
-  #Required
-  compartment_id            = var.compartment_id
-  display_name              = "instance4643_idcs"
-  integration_instance_type = "STANDARDX"
-  shape                     = "DEVELOPMENT"
-  # shape                     = "PRODUCTION"
-  is_byol                   = "false"
-  message_packs             = "10"
-  idcs_at                   = var.integration_instance_idcs_access_token
-}
+# resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
+#   #Required
+#   compartment_id            = var.compartment_id
+#   display_name              = "instance4643_idcs"
+#   integration_instance_type = "STANDARDX"
+#   shape                     = "DEVELOPMENT"
+#   # shape                     = "PRODUCTION"
+#   is_byol                   = "false"
+#   message_packs             = "10"
+#   idcs_at                   = var.integration_instance_idcs_access_token
+# }
 
 resource "oci_integration_private_endpoint_outbound_connection" "integration_private_endpoint" {
   integration_instance_id = oci_integration_integration_instance.test_integration_instance.id

examples/integration/main.tf

@@ -18,10 +18,6 @@ variable "private_key_path" {
 variable "region" {
 }
 
-variable "limit_definition_name" {
-  default = "vm-standard2-8-count"
-}
-
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid

examples/limits/quota.tf renamed to examples/limits/quotas/quota.tf

@@ -0,0 +1,101 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+
+}
+
+variable "subscription_ocid" {
+
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+variable "limit_definition_name" {
+  default = "vm-standard2-8-count"
+}
+
+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_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = 1
+}
+
+data "oci_limits_services" "test_services" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  filter {
+    name   = "name"
+    values = ["compute"]
+  }
+}
+
+data "oci_limits_limit_definitions" "test_limit_definitions" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  #Optional
+  name         = var.limit_definition_name
+  service_name = data.oci_limits_services.test_services.services[0].name
+}
+
+data "oci_limits_resource_availability" "test_resource_availability" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  limit_name     = var.limit_definition_name
+  service_name   = data.oci_limits_services.test_services.services[0].name
+
+  #Optional
+  #specify this parameter depending upon the limit and service
+  availability_domain = data.oci_identity_availability_domain.ad.name
+}
+
+data "oci_limits_limit_values" "test_limit_values" {
+  #Required
+  compartment_id = var.tenancy_ocid
+  service_name   = data.oci_limits_services.test_services.services[0].name
+
+  #Optional
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  name                = var.limit_definition_name
+  scope_type          = "AD"
+}
+
+#### Subscription Param
+
+data "oci_limits_services" "test_services_with_subscription" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  #Optional
+  subscription_id = var.subscription_ocid
+}
+
+data "oci_limits_limit_definitions" "test_limit_definitions_with_subscription" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  #Optional
+  subscription_id = var.subscription_ocid
+}
+
+

examples/limits/tags.tf renamed to examples/limits/quotas/tags.tf

@@ -415,6 +415,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener1" {
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes1.name
   port                        = 80
   protocol                    = "TCP"
+  tcp_idle_timeout            = 360
   is_ppv2enabled	          = true
   depends_on = [oci_network_load_balancer_backend_set.nlb-bes3]
 }
@@ -424,6 +425,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener2" {
   name                        = "udp_listener"
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes2.name
   port                        = 22
+  udp_idle_timeout            = 300
   protocol                    = "UDP"
   depends_on = [oci_network_load_balancer_listener.nlb-listener1]
 }
@@ -434,6 +436,8 @@ resource "oci_network_load_balancer_listener" "nlb-listener3" {
   default_backend_set_name    = oci_network_load_balancer_backend_set.nlb-bes3.name
   port                        = 8080
   protocol                    = "TCP_AND_UDP"
+  tcp_idle_timeout            = 240
+  udp_idle_timeout            = 180
   depends_on = [oci_network_load_balancer_listener.nlb-listener2]
 }