Merge pull request #1183 from terraform-providers/release_gh

Releasing version 3.94.0

Author: abhilash-av

CHANGELOG.md

@@ -1,4 +1,15 @@
 ## 3.94.0 (Unreleased)
+
+### Added
+- Support for ExaCC Customer Contacts
+- Support for KMS Software Keys added
+- Open mode and Permission level added to autonomous database resource
+- Support for Flexible Infrastructure - Flexible Memory
+- Support for resizing of boot_volume in `oci_core_instance` resource
+
+### Fixed
+- Fix logging to provide better feedback to the user to contact service when there are 401 and 500 status codes as response
+
 ## 3.93.0 (September 16, 2020)
 
 ### Added

examples/compute/instance/instance.tf

@@ -50,13 +50,17 @@ variable "num_paravirtualized_volumes_per_instance" {
 }
 
 variable "instance_shape" {
-  default = "VM.Standard2.1"
+  default = "VM.Standard.E3.Flex"
 }
 
 variable "instance_ocpus" {
   default = 1
 }
 
+variable "instance_shape_config_memory_in_gbs" {
+  default = 1.1
+}
+
 variable "instance_image_ocid" {
   type = map(string)
 
@@ -70,6 +74,16 @@ variable "instance_image_ocid" {
   }
 }
 
+variable "flex_instance_image_ocid" {
+  type = map(string)
+  default = {
+    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaa6hooptnlbfwr5lwemqjbu3uqidntrlhnt45yihfj222zahe7p3wq"
+    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaa6tp7lhyrcokdtf7vrbmxyp2pctgg4uxvt4jz4vc47qoc2ec4anha"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaadvi77prh3vjijhwe5xbd6kjg3n5ndxjcpod6om6qaiqeu3csof7a"
+    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaw5gvriwzjhzt2tnylrfnpanz5ndztyrv3zpwhlzxdbkqsjfkwxaq"
+  }
+}
+
 variable "db_size" {
   default = "50" # size in GBs
 }
@@ -90,7 +104,8 @@ resource "oci_core_instance" "test_instance" {
   shape               = var.instance_shape
 
   shape_config {
-    ocpus = var.instance_ocpus
+    ocpus = "${var.instance_ocpus}"
+    memory_in_gbs = "${var.instance_shape_config_memory_in_gbs}"
   }
 
   create_vnic_details {
@@ -102,7 +117,7 @@ resource "oci_core_instance" "test_instance" {
 
   source_details {
     source_type = "image"
-    source_id   = var.instance_image_ocid[var.region]
+    source_id = var.flex_instance_image_ocid[var.region]
     # Apply this to set the size of the boot volume that's 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".

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -33,20 +33,27 @@ provider "oci" {
 resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   #Required
   admin_network_cidr          = "192.168.0.0/16"
-  cloud_control_plane_server1 = "192.168.19.1"
-  cloud_control_plane_server2 = "192.168.19.2"
+  cloud_control_plane_server1 = "10.32.88.1"
+  cloud_control_plane_server2 = "10.32.88.3"
   compartment_id              = var.compartment_id
   display_name                = "tstExaInfra"
-  dns_server                  = ["192.168.10.10"]
-  gateway                     = "192.168.20.1"
-  infini_band_network_cidr    = "10.172.0.0/19"
-  netmask                     = "255.255.0.0"
-  ntp_server                  = ["192.168.10.20"]
+  dns_server                  = ["10.231.225.65"]
+  gateway                     = "10.32.88.5"
+  infini_band_network_cidr    = "10.31.8.0/21"
+  netmask                     = "255.255.255.0"
+  ntp_server                  = ["10.231.225.76"]
   shape                       = "ExadataCC.Quarter3.100"
   time_zone                   = "US/Pacific"
   activation_file             = "activation.zip"
 
   #Optional
+  contacts = {
+    "email"        = "[email protected]"
+    "is_primary"   = "true"
+    "name"         = "name"
+    "phone_number" = "1234567891"
+  }
+
   corporate_proxy = "http://192.168.19.1:80"
   defined_tags = {
     "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"

examples/storage/block/volume_grow/volume_grow.tf

@@ -188,3 +188,27 @@ data "oci_identity_availability_domain" "ad" {
   compartment_id = var.tenancy_ocid
   ad_number      = 1
 }
+
+resource "null_resource" "remote-exec-boot-volume-rescan" {
+  depends_on = ["oci_core_instance.test_instance"]
+
+  provisioner "remote-exec" {
+    connection {
+      agent       = false
+      timeout     = "30m"
+      host        = "${oci_core_instance.test_instance.public_ip}"
+      user        = "opc"
+      private_key = "${file(var.ssh_private_key)}"
+    }
+
+    inline = [
+      "touch ~/IMadeAFile.Right.Here",
+      "sudo dd iflag=direct if=/dev/sda of=/dev/null count=1",
+      "echo '1' | sudo tee /sys/class/block/sda/device/rescan",
+    ]
+  }
+
+  triggers = {
+    always_run = "${oci_core_instance.test_instance.source_details.0.boot_volume_size_in_gbs}"
+  }
+}

go.mod

@@ -7,11 +7,13 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk/v25 v25.0.0
+	github.com/oracle/oci-go-sdk/v25 v25.1.0
 	github.com/stretchr/objx v0.1.1 // indirect
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.6.1
 	gopkg.in/yaml.v2 v2.2.2
 )
 
 // Uncomment this line to get OCI Go SDK from local source instead of github
 //replace github.com/oracle/oci-go-sdk => ../../oracle/oci-go-sdk
+
+replace github.com/oracle/oci-go-sdk/v25 => ../../oracle/oci-go-sdk

oci/core_image_shape_data_source.go

@@ -27,6 +27,27 @@ func CoreImageShapeDataSource() *schema.Resource {
 				Required: true,
 			},
 			// Computed
+			"memory_constraints": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"max_in_gbs": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"min_in_gbs": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"ocpu_constraints": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -105,6 +126,12 @@ func (s *CoreImageShapeDataSourceCrud) SetData() error {
 
 	s.D.SetId(GenerateDataSourceID())
 
+	if s.Res.MemoryConstraints != nil {
+		s.D.Set("memory_constraints", []interface{}{ImageMemoryConstraintsToMap(s.Res.MemoryConstraints)})
+	} else {
+		s.D.Set("memory_constraints", nil)
+	}
+
 	if s.Res.OcpuConstraints != nil {
 		s.D.Set("ocpu_constraints", []interface{}{ImageOcpuConstraintsToMap(s.Res.OcpuConstraints)})
 	} else {
@@ -118,6 +145,20 @@ func (s *CoreImageShapeDataSourceCrud) SetData() error {
 	return nil
 }
 
+func ImageMemoryConstraintsToMap(obj *oci_core.ImageMemoryConstraints) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.MaxInGBs != nil {
+		result["max_in_gbs"] = int(*obj.MaxInGBs)
+	}
+
+	if obj.MinInGBs != nil {
+		result["min_in_gbs"] = int(*obj.MinInGBs)
+	}
+
+	return result
+}
+
 func ImageOcpuConstraintsToMap(obj *oci_core.ImageOcpuConstraints) map[string]interface{} {
 	result := map[string]interface{}{}
 

oci/core_image_shapes_data_source.go

@@ -37,6 +37,29 @@ func CoreImageShapesDataSource() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"memory_constraints": {
+							Type:     schema.TypeList,
+							Computed: true,
+							MaxItems: 1,
+							MinItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"max_in_gbs": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"min_in_gbs": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+								},
+							},
+						},
 						"ocpu_constraints": {
 							Type:     schema.TypeList,
 							Computed: true,
@@ -133,6 +156,12 @@ func (s *CoreImageShapesDataSourceCrud) SetData() error {
 			"image_id": *r.ImageId,
 		}
 
+		if r.MemoryConstraints != nil {
+			imageShape["memory_constraints"] = []interface{}{ImageMemoryConstraintsToMap(r.MemoryConstraints)}
+		} else {
+			imageShape["memory_constraints"] = nil
+		}
+
 		if r.OcpuConstraints != nil {
 			imageShape["ocpu_constraints"] = []interface{}{ImageOcpuConstraintsToMap(r.OcpuConstraints)}
 		} else {