Merge pull request #1921 from oracle/release_gh

Releasing OCI Provider v5.5.0
oracle · Jul 19, 2023 · a97550c · a97550c
2 parents 6078a44 + 08f7d8c
commit a97550c
Show file tree

Hide file tree

Showing 397 changed files with 14,664 additions and 1,885 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.5.0 (Unreleased)
+
+### Added
+- Support for Remove internal-only additionalCapabilities parameter from Container Instances Public SDK/CLI and Terraform
+- Support for Architecture Agnostic Instance Launch for Customer Overlay Services
+- Support for FSS: Support Kerberos with NFSv3 in FSS
+- Support for Include capacity reservation checks
+- Setting resource ID in statefile before waiting for workrequest for sub-resources
+- Support for Multitenant support for Workload Identity (WRIS)
+- Support for KMS key Rotation for Block/Boot Volume Backups
+- Support for 3rd VM Cluster Network for DR (Data Guard) | Exa-DB-C@C (ExaCC)
+- Support for Upgrade - Personal to Corporate
+- Support for APM - Synthetics - Disable automatic screenshots - API Only
+- Support migration without SSH to DB Host.
+- Support for Patch One-Off Download Support DBCS-EXaCS-ExaCC Update
+- Support for MFT monitoring in Stack Monitoring
+### Bug Fix
+- updated document for content field of vault oci_vault_secret
+- Adding checks for ocpu_count and storage_size_in_gbs
+- Adding rack_serial_number in database_exadata_infrastructure_resource.go
+- Resolved Resource Discovery issue for Terraform Version Greater than 1.3
+
 ## 5.4.0 (July 12, 2023)
 
 ### Added

diff --git a/examples/compute/instance/instance.tf b/examples/compute/instance/instance.tf
@@ -60,6 +60,10 @@ variable "instance_ocpus" {
   default = 1
 }
 
+variable "instance_vcpus" {
+  default = 2
+}
+
 variable "instance_shape_config_memory_in_gbs" {
   default = 1
 }

diff --git a/examples/compute/instance/instance_configuration.tf b/examples/compute/instance/instance_configuration.tf
@@ -0,0 +1,69 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+
+resource "oci_core_instance_configuration" "test_instance_configuration" {
+  compartment_id = var.compartment_ocid
+  display_name   = "TestInstanceConfiguration"
+
+  instance_details {
+    instance_type = "instance_options"
+
+    options {
+      launch_details {
+        compartment_id = var.compartment_ocid
+        shape = var.instance_shape
+
+        shape_config {
+          vcpus = var.instance_vcpus
+          memory_in_gbs = var.instance_shape_config_memory_in_gbs
+        }
+
+        source_details {
+          source_type = "image"
+
+          instance_source_image_filter_details {
+            compartment_id   = var.compartment_ocid
+            operating_system = "Oracle Linux"
+          }
+        }
+
+        create_vnic_details {
+          subnet_id        = oci_core_subnet.test_subnet.id
+          display_name     = "TFExampleInstanceConfigurationVNIC"
+          assign_public_ip = true
+          skip_source_dest_check = false
+        }
+      }
+    }
+  }
+}
+
+resource "oci_core_instance" "test_instance_configuration_instance" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "TestInstanceConfigurationInstance"
+  instance_configuration_id = oci_core_instance_configuration.test_instance_configuration.id
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.test_subnet.id
+    display_name     = "Primaryvnic"
+    assign_public_ip = true
+  }
+
+  metadata = {
+    ssh_authorized_keys = var.ssh_public_key
+    user_data           = base64encode(file("./userdata/bootstrap"))
+  }
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag2.name}" = "awesome-app-server"
+  }
+
+  freeform_tags = {
+    "freeformkey" = "freeformvalue"
+  }
+
+  timeouts {
+    create = "60m"
+  }
+}
diff --git a/examples/container_instances/main.tf b/examples/container_instances/main.tf
@@ -26,7 +26,7 @@ resource "oci_core_network_security_group" "test_network_security_group" {
   vcn_id         = oci_core_vcn.test_vcn.id
   lifecycle {
     ignore_changes = [
-      "defined_tags"]
+    "defined_tags"]
   }
 }
 
@@ -36,31 +36,31 @@ resource "oci_core_vcn" "test_vcn" {
   dns_label      = "testvcn"
   lifecycle {
     ignore_changes = [
-      "defined_tags"]
+    "defined_tags"]
   }
 }
 
 resource "oci_core_subnet" "test_subnet" {
-  cidr_block        = "10.0.0.0/24"
-  compartment_id    = var.compartment_ocid
-  dns_label         = "testsubnet"
-  route_table_id    = oci_core_route_table.test_route_table.id
+  cidr_block     = "10.0.0.0/24"
+  compartment_id = var.compartment_ocid
+  dns_label      = "testsubnet"
+  route_table_id = oci_core_route_table.test_route_table.id
   security_list_ids = [
-    "${oci_core_security_list.test_sec_list.id}"]
-  vcn_id            = oci_core_vcn.test_vcn.id
+  "${oci_core_security_list.test_sec_list.id}"]
+  vcn_id = oci_core_vcn.test_vcn.id
   lifecycle {
     ignore_changes = [
-      "defined_tags"]
+    "defined_tags"]
   }
 }
 
 resource "oci_core_security_list" "test_sec_list" {
   compartment_id = var.compartment_ocid
   vcn_id         = oci_core_vcn.test_vcn.id
   egress_security_rules {
-    destination  = "0.0.0.0/0"
-    protocol     = "all"
-    stateless    = "false"
+    destination = "0.0.0.0/0"
+    protocol    = "all"
+    stateless   = "false"
   }
 
   ingress_security_rules {
@@ -118,55 +118,43 @@ data "oci_identity_availability_domains" "test_availability_domains" {
   compartment_id = var.tenancy_ocid
 }
 
-resource "oci_identity_tag_namespace" "tag-namespace1" {
-  #Required
-  compartment_id = var.tenancy_ocid
-  description    = "example tag namespace"
-  name           = var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"
+resource "time_sleep" "wait_90_seconds" {
+  depends_on = [oci_core_subnet.test_subnet, oci_core_internet_gateway.test_ig]
 
-  is_retired     = false
-}
-
-resource "oci_identity_tag" "tag1" {
-  #Required
-  description      = "example tag"
-  name             = "example-tag"
-  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
-
-  is_retired       = false
+  create_duration = "90s"
 }
 
 resource "oci_container_instances_container_instance" "test_container_instance" {
+  depends_on = [time_sleep.wait_90_seconds]
+
   #Required
-  availability_domain      = data.oci_identity_availability_domains.test_availability_domains.availability_domains.2.name
-  compartment_id           = var.compartment_ocid
+  availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.2.name
+  compartment_id      = var.compartment_ocid
   containers {
     #Required
-    image_url                      = "busybox"
+    image_url = "busybox"
 
     #Optional
-    additional_capabilities = [
-      "CAP_NET_ADMIN"]
     arguments = [
       "-c",
-      "sleep 24h"]
+    "sleep 24h"]
     command = [
-      "/bin/sh"]
+    "/bin/sh"]
     display_name = "displayName"
     environment_variables = {
       "environment" = "variable"
     }
     health_checks {
       #Required
-      health_check_type        = "HTTP"
+      health_check_type = "HTTP"
 
       #Optional
-      failure_action           = "KILL"
-      failure_threshold        = "10"
+      failure_action    = "KILL"
+      failure_threshold = "10"
       headers {
 
         #Optional
-        name = "name"
+        name  = "name"
         value = "value"
       }
       initial_delay_in_seconds = "10"
@@ -186,8 +174,8 @@ resource "oci_container_instances_container_instance" "test_container_instance"
     }
     volume_mounts {
       #Required
-      mount_path   = "/mnt"
-      volume_name  = "volumeName"
+      mount_path  = "/mnt"
+      volume_name = "volumeName"
 
       #Optional
       is_read_only = "false"
@@ -206,44 +194,43 @@ resource "oci_container_instances_container_instance" "test_container_instance"
     subnet_id = oci_core_subnet.test_subnet.id
 
     #Optional
-    defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")
+    defined_tags = map("tf_test_namespace.test_tag", "value")
     display_name = "displayName"
     freeform_tags = {
       "freeformTag" = "freeformTags"
     }
-    hostname_label = "hostnamelabel"
-    is_public_ip_assigned = "true"
-    nsg_ids = []
-    private_ip = "10.0.0.7"
+    hostname_label         = "hostnamelabel"
+    is_public_ip_assigned  = "true"
+    nsg_ids                = []
+    private_ip             = "10.0.0.7"
     skip_source_dest_check = "false"
   }
 
   #Optional
   container_restart_policy = "ALWAYS"
-  defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")
-  display_name = "displayName"
+  defined_tags             = map("tf_test_namespace.test_tag", "value")
+  display_name             = "displayName"
   dns_config {
 
     #Optional
     nameservers = [
-      "8.8.8.8"]
+    "8.8.8.8"]
     options = [
-      "options"]
+    "options"]
     searches = [
-      "search domain"]
+    "search domain"]
   }
   freeform_tags = {
     "bar-key" = "foo-value"
   }
   graceful_shutdown_timeout_in_seconds = "10"
   lifecycle {
-    ignore_changes = [
-      "defined_tags"]
+    ignore_changes = ["defined_tags", "vnics[0].defined_tags"]
   }
-  state           = "ACTIVE"
+  state = "ACTIVE"
   volumes {
     #Required
-    name = "volumeName"
+    name        = "volumeName"
     volume_type = "EMPTYDIR"
 
     #Optional

diff --git a/examples/database/atp-d/exadata.tf b/examples/database/atp-d/exadata.tf
@@ -81,6 +81,7 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
   lifecycle {
     ignore_changes = [
       autonomous_data_storage_size_in_tbs,
+      db_servers,
     ]
   }
 }

diff --git a/examples/database/atp-d/main.tf b/examples/database/atp-d/main.tf
@@ -15,7 +15,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   display_name                         = "example-container-database"
   patch_model                          = "RELEASE_UPDATES"
   db_version                           = "19.18.0.1.0"
-  db_name                              = "acdname"
+  db_name                              = "ACDNAME"
 
   #Optional
   backup_config {
@@ -56,7 +56,6 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
   }
   rotate_key_trigger = "true"
   version_preference = "LATEST_RELEASE_UPDATE"
-  db_version          = "19.18.0.1.0"
 }
 
 variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {

diff --git a/examples/disaster_recovery/dr_plan/dr_plan.tf b/examples/disaster_recovery/dr_plan/dr_plan.tf
@@ -50,6 +50,10 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
   type                   = var.dr_plan_type
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_defined_tags_value}")
   freeform_tags = var.dr_plan_freeform_tags

diff --git a/examples/disaster_recovery/dr_plan/dr_protection_group.tf b/examples/disaster_recovery/dr_plan/dr_protection_group.tf
@@ -81,6 +81,11 @@ resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group"
     peer_id     = oci_disaster_recovery_dr_protection_group.test_peer.id
     peer_region = var.dr_protection_group_association_peer_region
   }
+
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
   freeform_tags = var.dr_protection_group_freeform_tags
 }

diff --git a/examples/disaster_recovery/dr_plan/tag_namespace.tf b/examples/disaster_recovery/dr_plan/tag_namespace.tf
@@ -51,6 +51,10 @@ resource "oci_identity_tag_namespace" "test_tag_namespace" {
   description    = var.tag_namespace_description
   name           = var.tag_namespace_name
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.tag_namespace_defined_tags_value}")
   freeform_tags = var.tag_namespace_freeform_tags

diff --git a/examples/disaster_recovery/dr_plan/volume_group.tf b/examples/disaster_recovery/dr_plan/volume_group.tf
@@ -58,13 +58,17 @@ resource "oci_core_volume_group" "test_volume_group" {
     volume_ids              = oci_core_volume.source_volume_list.*.id
   }
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.volume_group_defined_tags_value}")
   display_name     = var.volume_group_display_name
   freeform_tags    = var.volume_group_freeform_tags
   volume_group_replicas {
     #Required
-    availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
+    availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.1.name
 
     #Optional
     display_name = var.volume_group_volume_group_replicas_display_name

diff --git a/examples/disaster_recovery/dr_plan_execution/dr_plan.tf b/examples/disaster_recovery/dr_plan_execution/dr_plan.tf
@@ -31,6 +31,10 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
   type                   = var.dr_plan_type
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_defined_tags_value}")
   freeform_tags = var.dr_plan_freeform_tags

diff --git a/examples/disaster_recovery/dr_plan_execution/dr_plan_execution.tf b/examples/disaster_recovery/dr_plan_execution/dr_plan_execution.tf
@@ -64,6 +64,10 @@ resource "oci_disaster_recovery_dr_plan_execution" "test_dr_plan_execution" {
   }
   plan_id = oci_disaster_recovery_dr_plan.test_dr_plan.id
 
+  lifecycle {
+    ignore_changes = [defined_tags]
+  }
+
   #Optional
   defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_plan_execution_defined_tags_value}")
   display_name  = var.dr_plan_execution_display_name