Merge pull request #2059 from oracle/release_gh

Releasing version 5.32.0

Author: NagendraNigade

CHANGELOG.md

@@ -0,0 +1,92 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "vm_multi_attach_instance_shape" {
+  default = "VM.Standard2.1"
+}
+
+resource "oci_core_volume" "test_block_volume_multi_attach" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "test_attach_existing_volume_on_instance_launch_1"
+  size_in_gbs         = var.db_size
+}
+
+resource "oci_core_instance" "test_vm_multi_attach_instance_launch" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "test_vm_multi_attach_instance"
+  shape               = var.vm_multi_attach_instance_shape
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.test_subnet.id
+    display_name     = "primary_vnic"
+    assign_public_ip = true
+    hostname_label   = "tfexampleshinstance"
+  }
+
+  source_details {
+    source_type = "image"
+    source_id = var.instance_image_ocid[var.region]
+    # Apply this to set the size of the boot volume that is created for this 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
+  }
+
+  // Create and attach a volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_create_and_attach_volume_on_launch_1"
+    launch_create_volume_details {
+      volume_creation_type = "ATTRIBUTES"
+      compartment_id = var.compartment_ocid
+      display_name = "test_create_and_attach_volume_on_launch_1"
+      size_in_gbs = var.db_size
+    }
+  }
+
+  // Create and attach a volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_create_and_attach_volume_on_launch_2"
+    launch_create_volume_details {
+      volume_creation_type = "ATTRIBUTES"
+      compartment_id = var.compartment_ocid
+      display_name = "test_create_and_attach_volume_on_launch_2"
+      size_in_gbs = var.db_size
+    }
+  }
+
+  // Attach an existing volume
+  launch_volume_attachments {
+    type = "iscsi"
+    display_name = "test_attach_existing_volume_on_launch"
+    volume_id = oci_core_volume.test_block_volume_multi_attach.id
+  }
+
+  # Apply the following flag only if you wish to preserve the attached boot volume upon destroying this instance
+  # Setting this and destroying the instance will result in a boot volume that should be managed outside of this config.
+  # When changing this value, make sure to run 'terraform apply' so that it takes effect before the resource is destroyed.
+  #preserve_boot_volume = true
+
+  // Since preserve_data_volumes_created_at_launch is a required parameter for instances launched with volumes,
+  // defaulting it to false.
+  preserve_data_volumes_created_at_launch = false
+
+  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"
+  }
+}

examples/compute/instance/vm_multi_attach_instance.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,7 +36,7 @@ resource "oci_core_vcn" "test_vcn" {
   dns_label      = "testvcn"
   lifecycle {
     ignore_changes = [
-    "defined_tags"]
+      "defined_tags"]
   }
 }
 
@@ -46,11 +46,11 @@ resource "oci_core_subnet" "test_subnet" {
   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}"]
+    "${oci_core_security_list.test_sec_list.id}"]
   vcn_id = oci_core_vcn.test_vcn.id
   lifecycle {
     ignore_changes = [
-    "defined_tags"]
+      "defined_tags"]
   }
 }
 
@@ -137,9 +137,9 @@ resource "oci_container_instances_container_instance" "test_container_instance"
     #Optional
     arguments = [
       "-c",
-    "cat /mnt/my_file"]
+      "cat /mnt/my_file"]
     command = [
-    "/bin/sh"]
+      "/bin/sh"]
     display_name = "displayName"
     environment_variables = {
       "environment" = "variable"
@@ -194,6 +194,10 @@ resource "oci_container_instances_container_instance" "test_container_instance"
       is_root_file_system_readonly   = true
       run_as_group                   = 10
       run_as_user                    = 10
+      capabilities {
+        add_capabilities = ["CAP_CHOWN", "CAP_KILL"]
+        drop_capabilities = ["ALL"]
+      }
     }
   }
   shape = "CI.Standard.E4.Flex"
@@ -226,11 +230,11 @@ resource "oci_container_instances_container_instance" "test_container_instance"
 
     #Optional
     nameservers = [
-    "8.8.8.8"]
+      "8.8.8.8"]
     options = [
-    "options"]
+      "options"]
     searches = [
-    "search domain"]
+      "search domain"]
   }
   freeform_tags = {
     "bar-key" = "foo-value"

examples/container_instances/main.tf

@@ -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.60.0
+	github.com/oracle/oci-go-sdk/v65 v65.61.0
 	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

examples/zips/adm.zip

@@ -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.60.0 h1:r0fFFGc7PFbj9MAAJkUY/SU+IWS7HVx7NiiPj9gKzCU=
-github.com/oracle/oci-go-sdk/v65 v65.60.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
+github.com/oracle/oci-go-sdk/v65 v65.61.0 h1:zASJu3G3PVTAqOkHyVoSU3Sfeoir4M0WCLr12+rtCkg=
+github.com/oracle/oci-go-sdk/v65 v65.61.0/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=

examples/zips/aiAnomalyDetection.zip

@@ -7,8 +7,8 @@ import (
 	"log"
 )
 
-const Version = "5.31.0"
-const ReleaseDate = "2024-02-29"
+const Version = "5.32.0"
+const ReleaseDate = "2024-03-06"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)

examples/zips/aiDocument.zip

@@ -155,6 +155,7 @@ var (
 		"vcpus_limit":         acctest.Representation{RepType: acctest.Optional, Create: `1`},
 	}
 	ContainerInstancesContainerInstanceContainersSecurityContextRepresentation = map[string]interface{}{
+		"capabilities":                   acctest.RepresentationGroup{RepType: acctest.Optional, Group: ContainerInstancesContainerInstanceContainersSecurityContextCapabilitiesRepresentation},
 		"is_non_root_user_check_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`},
 		"is_root_file_system_readonly":   acctest.Representation{RepType: acctest.Optional, Create: `false`},
 		"run_as_group":                   acctest.Representation{RepType: acctest.Optional, Create: `10`},
@@ -205,6 +206,10 @@ var (
 		"name":  acctest.Representation{RepType: acctest.Optional, Create: `name`},
 		"value": acctest.Representation{RepType: acctest.Optional, Create: `value`},
 	}
+	ContainerInstancesContainerInstanceContainersSecurityContextCapabilitiesRepresentation = map[string]interface{}{
+		"add_capabilities":  acctest.Representation{RepType: acctest.Optional, Create: []oci_container_instances.ContainerCapabilityTypeEnum{`addCapabilities`}},
+		"drop_capabilities": acctest.Representation{RepType: acctest.Optional, Create: []oci_container_instances.ContainerCapabilityTypeEnum{`dropCapabilities`}},
+	}
 
 	CISecurityListTCPEgressSecurityRulesRepresentation = map[string]interface{}{
 		"destination": acctest.Representation{RepType: acctest.Required, Create: `0.0.0.0/0`},
@@ -437,6 +442,9 @@ func TestContainerInstancesContainerInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.memory_limit_in_gbs", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.vcpus_limit", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.add_capabilities.#", "0"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.drop_capabilities.#", "0"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_non_root_user_check_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_root_file_system_readonly", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.run_as_group", "10"),
@@ -514,6 +522,9 @@ func TestContainerInstancesContainerInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.memory_limit_in_gbs", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.vcpus_limit", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.add_capabilities.#", "0"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.drop_capabilities.#", "0"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_non_root_user_check_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_root_file_system_readonly", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.run_as_group", "10"),
@@ -586,6 +597,9 @@ func TestContainerInstancesContainerInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.memory_limit_in_gbs", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.resource_config.0.vcpus_limit", "1"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.add_capabilities.#", "0"),
+				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.capabilities.0.drop_capabilities.#", "0"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_non_root_user_check_enabled", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.is_root_file_system_readonly", "false"),
 				resource.TestCheckResourceAttr(resourceName, "containers.0.security_context.0.run_as_group", "10"),