Merge pull request #1109 from terraform-providers/v.3.83.0-hotfix

Reverted the default value to true for assign_public_ip in oci_core_instance resource

Author: parrneet

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.84.0 (Unreleased)
+## 3.83.1 (Unreleased)
+
+### Fixed
+- Reverted the default value to `true` for `assign_public_ip` in `oci_core_instance` resource
+
 ## 3.83.0 (July 01, 2020)
 
 ### Added

oci/core_instance_resource.go

@@ -101,7 +101,7 @@ func CoreInstanceResource() *schema.Resource {
 							// values for boolean nested objects correctly.
 							Type:     schema.TypeString,
 							Optional: true,
-							Default:  "false",
+							Default:  "true",
 							ValidateFunc: func(v interface{}, k string) ([]string, []error) {
 								// Verify that we can parse the string value as a bool value.
 								var es []error

oci/core_instance_test.go

@@ -116,7 +116,6 @@ resource "oci_core_instance" "test_instance" {
 		generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
 			"dns_label": Representation{repType: Required, create: `dnslabel`},
 		})) +
-		generateResourceFromRepresentationMap("oci_core_vlan", "test_vlan", Required, Create, vlanRepresentation) +
 		AvailabilityDomainConfig +
 		DefinedTagsDependencies +
 		KeyResourceDependencyConfig

oci/core_vnic_attachment_test.go

@@ -20,10 +20,10 @@ import (
 
 var (
 	VnicAttachmentRequiredOnlyResource = VnicAttachmentResourceDependencies +
-		generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Required, Create, vnicAttachmentRepresentationSubnet)
+		generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Required, Create, vnicAttachmentRepresentation)
 
 	VnicAttachmentResourceConfig = VnicAttachmentResourceDependencies +
-		generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Create, vnicAttachmentRepresentationSubnet)
+		generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Create, vnicAttachmentRepresentation)
 
 	vnicAttachmentDataSourceRepresentation = map[string]interface{}{
 		"compartment_id":      Representation{repType: Required, create: `${var.compartment_id}`},
@@ -42,6 +42,7 @@ var (
 		"nic_index":           Representation{repType: Optional, create: `0`},
 	}
 	vnicAttachmentCreateVnicDetailsRepresentation = map[string]interface{}{
+		"subnet_id":              Representation{repType: Required, create: `${oci_core_subnet.test_subnet.id}`},
 		"assign_public_ip":       Representation{repType: Optional, create: `false`},
 		"defined_tags":           Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"display_name":           Representation{repType: Optional, create: `displayName`},
@@ -50,8 +51,6 @@ var (
 		"nsg_ids":                Representation{repType: Optional, create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, update: []string{}},
 		"private_ip":             Representation{repType: Optional, create: `10.0.0.5`},
 		"skip_source_dest_check": Representation{repType: Optional, create: `false`},
-		"subnet_id":              Representation{repType: Required, create: `${oci_core_subnet.test_subnet.id}`},
-		"vlan_id":                Representation{repType: Required, create: `${oci_core_vlan.test_vlan.id}`},
 	}
 
 	VnicAttachmentResourceDependencies = OciImageIdsVariable +
@@ -63,7 +62,6 @@ var (
 		generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Required, Create, representationCopyWithNewProperties(vcnRepresentation, map[string]interface{}{
 			"dns_label": Representation{repType: Required, create: `dnslabel`},
 		})) +
-		generateResourceFromRepresentationMap("oci_core_vlan", "test_vlan", Required, Create, vlanRepresentation) +
 		AvailabilityDomainConfig +
 		DefinedTagsDependencies
 )
@@ -91,7 +89,7 @@ func TestCoreVnicAttachmentResource_basic(t *testing.T) {
 			// verify create
 			{
 				Config: config + compartmentIdVariableStr + VnicAttachmentResourceDependencies +
-					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Required, Create, vnicAttachmentRepresentationSubnet),
+					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Required, Create, vnicAttachmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "create_vnic_details.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "create_vnic_details.0.subnet_id"),
@@ -106,7 +104,7 @@ func TestCoreVnicAttachmentResource_basic(t *testing.T) {
 			// verify create with optionals
 			{
 				Config: config + compartmentIdVariableStr + VnicAttachmentResourceDependencies +
-					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Create, vnicAttachmentRepresentationSubnet),
+					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Create, vnicAttachmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
 					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
@@ -135,7 +133,7 @@ func TestCoreVnicAttachmentResource_basic(t *testing.T) {
 				Config: config +
 					generateDataSourceFromRepresentationMap("oci_core_vnic_attachments", "test_vnic_attachments", Optional, Update, vnicAttachmentDataSourceRepresentation) +
 					compartmentIdVariableStr + VnicAttachmentResourceDependencies +
-					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Update, vnicAttachmentRepresentationSubnet),
+					generateResourceFromRepresentationMap("oci_core_vnic_attachment", "test_vnic_attachment", Optional, Update, vnicAttachmentRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(datasourceName, "instance_id"),

oci/version.go

@@ -7,7 +7,7 @@ import (
 	"log"
 )
 
-const Version = "3.83.0"
+const Version = "3.83.1"
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)