Release merge v3.53.0

Release merge v3.53.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,14 @@
-## 3.52.1 (Unreleased)
+## 3.53.0 (Unreleased)
+
+### Added
+- Support for creating `oci_database_autonomous_database` resource with the specified `whitelisted_ips`
+- Support for `customer_asn` attribute in `core_virtual_circuit` resource
+- Support for fault domains in `core_instance_pool` resource 
+- Support for URL Redirect Feature in `oci_load_balancer_rule_set` resource
+
+### Deprecated
+- Virtual Circuit resource: The `customer_bgp_asn` attribute is now deprecated. Please use the `customer_asn` instead.
+
 ## 3.52.0 (November 13, 2019)
 
 ### Added

examples/compute/instance_pool/instance_pool.tf

@@ -169,6 +169,7 @@ resource "oci_core_instance_pool" "test_instance_pool" {
 
   placement_configurations {
     availability_domain = "${data.oci_identity_availability_domain.ad.name}"
+    fault_domains       = ["FAULT-DOMAIN-1"]
     primary_subnet_id   = "${oci_core_subnet.test_subnet.id}"
   }
 

examples/database/adb/autonomous_database.tf

@@ -23,6 +23,7 @@ resource "oci_database_autonomous_database" "autonomous_database" {
   is_auto_scaling_enabled                        = "true"
   license_model                                  = "${var.autonomous_database_license_model}"
   is_preview_version_with_service_terms_accepted = "false"
+  whitelisted_ips                                = ["1.1.1.1/28"]
 }
 
 data "oci_database_autonomous_databases" "autonomous_databases" {

examples/fast_connect/variables.tf

@@ -32,7 +32,7 @@ variable "virtual_circuit_cross_connect_mappings_vlan" {
   default = 200
 }
 
-variable "virtual_circuit_customer_bgp_asn" {
+variable "virtual_circuit_customer_asn" {
   default = 10
 }
 

examples/fast_connect/virtual_circuit.tf

@@ -20,9 +20,9 @@ resource "oci_core_virtual_circuit" "virtual_circuit_private" {
     vlan                                    = "${var.virtual_circuit_cross_connect_mappings_vlan}"
   }
 
-  customer_bgp_asn = "${var.virtual_circuit_customer_bgp_asn}"
-  display_name     = "${var.virtual_circuit_display_name}"
-  gateway_id       = "${oci_core_drg.drg_private.id}"
+  customer_asn = "${var.virtual_circuit_customer_asn}"
+  display_name = "${var.virtual_circuit_display_name}"
+  gateway_id   = "${oci_core_drg.drg_private.id}"
 
   #provider_service_id = "${oci_core_provider_service.provider_service.id}"
   region = "${var.virtual_circuit_region}"
@@ -41,8 +41,8 @@ resource "oci_core_virtual_circuit" "virtual_circuit_public" {
     vlan                                    = "${var.virtual_circuit_cross_connect_mappings_vlan_public}"
   }
 
-  customer_bgp_asn = "${var.virtual_circuit_customer_bgp_asn}"
-  display_name     = "${var.virtual_circuit_display_name}"
+  customer_asn = "${var.virtual_circuit_customer_asn}"
+  display_name = "${var.virtual_circuit_display_name}"
 
   #provider_service_id = "${oci_core_provider_service.provider_service.id}"
 
@@ -80,7 +80,7 @@ resource "oci_core_virtual_circuit" "virtual_circuit_provider_private_layer2" {
     oracle_bgp_peering_ip   = "${var.virtual_circuit_cross_connect_mappings_oracle_bgp_peering_ip}"
   }
 
-  customer_bgp_asn    = "${var.virtual_circuit_customer_bgp_asn}"
+  customer_asn        = "${var.virtual_circuit_customer_asn}"
   display_name        = "${var.virtual_circuit_display_name}"
   gateway_id          = "${oci_core_drg.drg_provider_layer2.id}"
   provider_service_id = "${data.oci_core_fast_connect_provider_services.fast_connect_provider_services_private_layer2.fast_connect_provider_services.0.id}"

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
 	github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
 	github.com/mitchellh/cli v1.0.0
-	github.com/oracle/oci-go-sdk v12.4.0+incompatible
+	github.com/oracle/oci-go-sdk v12.5.0+incompatible
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0
 	gopkg.in/yaml.v2 v2.2.2

go.sum

@@ -5,6 +5,7 @@ package oci
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -148,6 +149,11 @@ func TestAnalyticsAnalyticsInstanceResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
 						return err
 					},
 				),

oci/analytics_analytics_instance_test.go

@@ -4,6 +4,7 @@ package oci
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -59,6 +60,11 @@ func TestAuditConfigurationResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId, &tenancyId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
 						return err
 					},
 				),

oci/audit_configuration_test.go

@@ -5,6 +5,7 @@ package oci
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -229,6 +230,11 @@ func TestAutoScalingAutoScalingConfigurationResource_basic(t *testing.T) {
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")
+						if isEnableExportCompartment, _ := strconv.ParseBool(getEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
+							if errExport := testExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
+								return errExport
+							}
+						}
 						return err
 					},
 				),