Candidate for release_v3.33.0

Candidate for release_v3.33.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,18 @@
 ## 3.33.0 (Unreleased)
+
+### Added
+- Support autonomous transaction processing preview mode
+- Support load balancer attachment data source for instance pools
+- Support moving `core_route_table`, `core_security_list`, `core_subnet`, `core_vcn` resources across compartments
+- Support for Granular Security Lists using Network Security Group
+- Support for Granular Security Lists in Load Balancer
+- Support for Network Security Groups in databases
+- Support in autonomous database and object data sources for encoding downloaded binary content as base64. This works around behavior in Terraform v0.12 that could cause binary content to be corrupted if written directly to state.
+
+### Fixed
+- Address panics caused by invalid type assertions in object map conversion. This could potentially affect attributes
+that are maps of string values.
+
 ## 3.32.0 (July 03, 2019)
 
 ### Added
@@ -8,6 +22,7 @@
 
 ### Fixed
 - We were throwing an error for some resources if the resource no longer existed during refresh. This is fixed now. 
+- Change to prevent "has conflicting state of UPDATING" error in multiple dbHomes case
 
 ## 3.31.0 (June 26, 2019)
 

examples/compute/instance_pool/compute.tf

@@ -76,4 +76,11 @@ resource "oci_core_instance_pool" "TFInstancePool" {
     availability_domain = "${data.oci_identity_availability_domain.ad.name}"
     primary_subnet_id   = "${oci_core_subnet.ExampleSubnet.id}"
   }
+
+  load_balancers = {
+    backend_set_name = "${oci_load_balancer_backend_set.test_backend_set.name}"
+    load_balancer_id = "${oci_load_balancer.test_load_balancer.id}"
+    port             = 80
+    vnic_selection   = "primaryvnic"
+  }
 }

examples/compute/instance_pool/datasources.tf

@@ -45,6 +45,11 @@ data "oci_core_instance" "TFInstancePoolInstanceSingularDatasources" {
   instance_id = "${lookup(data.oci_core_instance_pool_instances.TFInstancePoolInstanceDatasources.instances[count.index], "id")}"
 }
 
+data "oci_core_instance_pool_load_balancer_attachment" test_instance_pool_load_balancer_attachment {
+  instance_pool_id                          = "${oci_core_instance_pool.TFInstancePool.id}"
+  instance_pool_load_balancer_attachment_id = "${oci_core_instance_pool.TFInstancePool.load_balancers.0.id}"
+}
+
 output "Pooled instances private IPs" {
   value = ["${data.oci_core_instance.TFInstancePoolInstanceSingularDatasources.*.private_ip}"]
 }
@@ -56,3 +61,7 @@ output "Pooled instances public IPs" {
 output "Pooled instances hostname labels" {
   value = ["${data.oci_core_instance.TFInstancePoolInstanceSingularDatasources.*.hostname_label}"]
 }
+
+output "Load Balancer backend set name" {
+  value = ["${data.oci_core_instance_pool_load_balancer_attachment.test_instance_pool_load_balancer_attachment.backend_set_name}"]
+}

examples/compute/instance_pool/network.tf

@@ -36,3 +36,28 @@ resource "oci_core_route_table" "ExampleRT" {
     network_entity_id = "${oci_core_internet_gateway.ExampleIG.id}"
   }
 }
+
+resource "oci_load_balancer" "test_load_balancer" {
+  shape          = "100Mbps"
+  compartment_id = "${var.compartment_ocid}"
+
+  subnet_ids = [
+    "${oci_core_subnet.ExampleSubnet.id}",
+  ]
+
+  display_name = "test_load_balancer"
+  is_private   = true
+}
+
+resource "oci_load_balancer_backend_set" "test_backend_set" {
+  name             = "lb-bes1"
+  load_balancer_id = "${oci_load_balancer.test_load_balancer.id}"
+  policy           = "ROUND_ROBIN"
+
+  health_checker {
+    port                = "80"
+    protocol            = "HTTP"
+    response_body_regex = ".*"
+    url_path            = "/"
+  }
+}

examples/compute/multi_vnic/multi_vnic.tf

@@ -62,6 +62,15 @@ resource "oci_core_subnet" "ExampleSubnet" {
   dns_label           = "examplesubnet"
 }
 
+resource "oci_core_network_security_group" "ExampleNetworkSecurityGroup" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_virtual_network.ExampleVCN.id}"
+
+  #Optional
+  display_name = "TFExampleNetworkSecurityGroup"
+}
+
 resource "oci_core_instance" "ExampleInstance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
@@ -97,6 +106,7 @@ resource "oci_core_vnic_attachment" "SecondaryVnicAttachment" {
     display_name           = "SecondaryVnic_${count.index}"
     assign_public_ip       = true
     skip_source_dest_check = true
+    nsg_ids                = ["${oci_core_network_security_group.ExampleNetworkSecurityGroup.id}"]
   }
 
   count = "${var.SecondaryVnicCount}"

examples/database/adb/autonomous_data_warehouse_wallet.tf

@@ -6,14 +6,14 @@ resource "random_string" "autonomous_data_warehouse_wallet_password" {
 }
 
 data "oci_database_autonomous_database_wallet" "autonomous_data_warehouse_wallet" {
-  #Required
   autonomous_database_id = "${oci_database_autonomous_database.autonomous_data_warehouse.id}"
   password               = "${random_string.autonomous_data_warehouse_wallet_password.result}"
+  base64_encode_content  = "true"
 }
 
 resource "local_file" "autonomous_data_warehouse_wallet_file" {
-  content  = "${data.oci_database_autonomous_database_wallet.autonomous_data_warehouse_wallet.content}"
-  filename = "${path.module}/autonomous_data_warehouse_wallet.zip"
+  content_base64 = "${data.oci_database_autonomous_database_wallet.autonomous_data_warehouse_wallet.content}"
+  filename       = "${path.module}/autonomous_data_warehouse_wallet.zip"
 }
 
 output "autonomous_data_warehouse_wallet_password" {

examples/database/adb/autonomous_database.tf

@@ -17,11 +17,12 @@ resource "oci_database_autonomous_database" "autonomous_database" {
   db_name                  = "adbdb1"
 
   #Optional
-  db_workload             = "${var.autonomous_database_db_workload}"
-  display_name            = "example_autonomous_database"
-  freeform_tags           = "${var.autonomous_database_freeform_tags}"
-  is_auto_scaling_enabled = "true"
-  license_model           = "${var.autonomous_database_license_model}"
+  db_workload                                    = "${var.autonomous_database_db_workload}"
+  display_name                                   = "example_autonomous_database"
+  freeform_tags                                  = "${var.autonomous_database_freeform_tags}"
+  is_auto_scaling_enabled                        = "true"
+  license_model                                  = "${var.autonomous_database_license_model}"
+  is_preview_version_with_service_terms_accepted = "false"
 }
 
 data "oci_database_autonomous_databases" "autonomous_databases" {

examples/database/adb/autonomous_database_wallet.tf

@@ -6,14 +6,14 @@ resource "random_string" "autonomous_database_wallet_password" {
 }
 
 data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
-  #Required
   autonomous_database_id = "${oci_database_autonomous_database.autonomous_database.id}"
   password               = "${random_string.autonomous_database_wallet_password.result}"
+  base64_encode_content  = "true"
 }
 
 resource "local_file" "autonomous_database_wallet_file" {
-  content  = "${data.oci_database_autonomous_database_wallet.autonomous_database_wallet.content}"
-  filename = "${path.module}/autonomous_database_wallet.zip"
+  content_base64 = "${data.oci_database_autonomous_database_wallet.autonomous_database_wallet.content}"
+  filename       = "${path.module}/autonomous_database_wallet.zip"
 }
 
 output "autonomous_database_wallet_password" {

examples/database/adb/provider.tf

@@ -7,3 +7,7 @@ provider "oci" {
   private_key_path = "${var.private_key_path}"
   region           = "${var.region}"
 }
+
+provider "local" {
+  version = ">=1.3.0" # Need this version of the local provider to support base64 encoded inputs
+}

examples/database/dataguard/vm_shape/dataguard.tf

@@ -113,5 +113,12 @@ resource "oci_database_data_guard_association" "test_data_guard_association" {
   display_name        = "TFExampleDataGuardAssociationVM"
   subnet_id           = "${oci_core_subnet.test_subnet.id}"
   availability_domain = "${oci_core_subnet.test_subnet.availability_domain}"
+  nsg_ids             = ["${oci_core_network_security_group.test_network_security_group.id}"]
   hostname            = "ocidb"
 }
+
+resource "oci_core_network_security_group" "test_network_security_group" {
+  compartment_id = "${var.compartment_ocid}"
+  vcn_id         = "${oci_core_virtual_network.vcn1.id}"
+  display_name   = "tf-example-nsg"
+}