Release 3.31.0

Release 3.31.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,17 @@
 ## 3.31.0 (Unreleased)
+
+### Added
+- Support for moving `email sender` resource between compartments. 
+- Support for moving NAT Gateway resource across Compartments.
+
+### Fixed
+- Fix for `defined_tags` property deletion bug
+
+## Notes
+- This release upgrades the Terraform plugin SDK to v0.12.3-0.20190619193004-2ab2796c932c, which fixes 
+how null/empty values are stored in state during import and fixes unnecessary diffs caused by omission of
+Optional/Computed fields.
+
 ## 3.30.0 (June 19, 2019)
 
 ### Added

go.mod

@@ -1,11 +1,9 @@
 module github.com/terraform-providers/terraform-provider-oci
 
 require (
-	github.com/go-ini/ini v0.0.0-20170209042415-ee900ca56593 // indirect
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/hashicorp/terraform v0.12.0-rc1
-	github.com/oracle/oci-go-sdk v5.11.0+incompatible
-	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
+	github.com/hashicorp/terraform v0.12.3-0.20190619193004-2ab2796c932c
+	github.com/oracle/oci-go-sdk v5.12.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

@@ -11,12 +11,11 @@ package provider
 
 import (
 	"context"
+	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	oci_audit "github.com/oracle/oci-go-sdk/audit"
 	oci_common "github.com/oracle/oci-go-sdk/common"
-
-	"time"
 )
 
 func AuditAuditEventsDataSource() *schema.Resource {

oci/audit_audit_events_data_source.go

@@ -12,7 +12,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/oracle/oci-go-sdk/common"
+
+	oci_common "github.com/oracle/oci-go-sdk/common"
 	oci_core "github.com/oracle/oci-go-sdk/core"
 )
 
@@ -159,7 +160,7 @@ func (s *CoreAppCatalogSubscriptionResourceCrud) Create() error {
 
 	if timeRetrieved, ok := s.D.GetOkExists("time_retrieved"); ok {
 		tmp, _ := time.Parse(time.RFC3339Nano, timeRetrieved.(string))
-		request.TimeRetrieved = &common.SDKTime{Time: tmp}
+		request.TimeRetrieved = &oci_common.SDKTime{Time: tmp}
 	}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")

oci/core_app_catalog_subscription_resource.go

@@ -240,6 +240,18 @@ func (s *CoreDhcpOptionsResourceCrud) Create() error {
 	}
 
 	s.Res = &response.DhcpOptions
+
+	// this is needed to make the infrastructure match what is on the config as in some cases during the Create the service adds an option for SearchDomain by default if the user doesn't provide it.
+	updateRequest := oci_core.UpdateDhcpOptionsRequest{}
+	updateRequest.DhcpId = s.Res.Id
+	updateRequest.Options = request.Options
+	updateRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+	updateResponse, err := s.Client.UpdateDhcpOptions(context.Background(), updateRequest)
+	if err != nil {
+		log.Printf("[ERROR] Could not perform an update right after the create of the dhcpOptions: %v", err)
+	}
+	s.Res = &updateResponse.DhcpOptions
+
 	return nil
 }
 

oci/core_dhcp_options_resource.go

@@ -12,17 +12,9 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 
-	core "github.com/oracle/oci-go-sdk/core"
-	"github.com/stretchr/testify/suite"
+	"github.com/oracle/oci-go-sdk/core"
 )
 
-type ResourceCoreDHCPOptionsTestSuite struct {
-	suite.Suite
-	Providers    map[string]terraform.ResourceProvider
-	Config       string
-	ResourceName string
-}
-
 var defaultDhcpOpts = `
 resource "oci_core_default_dhcp_options" "default" {
 	manage_default_resource_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
@@ -54,10 +46,61 @@ var additionalDhcpOption4 = `
 		}
 	}`
 
-func (s *ResourceCoreDHCPOptionsTestSuite) SetupTest() {
-	s.Providers = testAccProviders
-	testAccPreCheck(s.T())
-	s.Config = legacyTestProviderConfig() + `
+//If you set DhcpDnsOption to `VcnLocalPlusInternet`, and you assign a DNS label to the VCN during creation, the search domain name in the VCN's default set of DHCP options is automatically set to the VCN domain
+//To avoid multiple applies we perform an apply after the create in order have the options match what the user has in the config
+//This test makes sure we handle that case correctly and that there is a non empty plan after the apply
+func TestResourceCoreDHCPOptions_avoidServiceDefault(t *testing.T) {
+	httpreplay.SetScenario("TestAccResourceCoreDHCPOptions_avoidServiceDefault")
+	defer httpreplay.SaveScenario()
+
+	provider := testAccProvider
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: legacyTestProviderConfig() + defaultDhcpOpts + `
+					resource "oci_core_virtual_network" "t" {
+						cidr_block     = "10.1.0.0/16"
+						compartment_id = "${var.compartment_id}"
+						display_name   = "testVcn"
+						dns_label      = "tftestvcn"
+					}
+
+					resource "oci_core_dhcp_options" "opt" {
+						compartment_id = "${var.compartment_id}"
+  						vcn_id         = "${oci_core_virtual_network.t.id}"
+  						display_name   = "testDhcpOptions"
+
+  						// required
+  						options {
+ 					    	type        = "DomainNameServer"
+						    server_type = "VcnLocalPlusInternet"
+					    }
+					}`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt", "display_name", "testDhcpOptions"),
+					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt", "options.#", "1"),
+					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt", "options.0.type", "DomainNameServer"),
+					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt", "options.0.server_type", "VcnLocalPlusInternet"),
+				),
+			},
+		},
+	})
+}
+
+func TestResourceCoreDHCPOptions_basic(t *testing.T) {
+	httpreplay.SetScenario("TestAccResourceCoreDHCPOptions_basic")
+	defer httpreplay.SaveScenario()
+
+	var resDefaultId, resOpt4Id, resId2 string
+
+	provider := testAccProvider
+
+	config := legacyTestProviderConfig() + `
 	resource "oci_core_virtual_network" "t" {
 		cidr_block = "10.0.0.0/16"
 		compartment_id = "${var.compartment_id}"
@@ -104,13 +147,12 @@ func (s *ResourceCoreDHCPOptionsTestSuite) SetupTest() {
 			custom_dns_servers = [ "8.8.4.4", "8.8.8.8" ]
 		}
 	}`
-}
-
-func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic() {
-	var resDefaultId, resOpt4Id, resId2 string
 
-	resource.Test(s.T(), resource.TestCase{
-		Providers: s.Providers,
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
 		Steps: []resource.TestStep{
 			// Test invalid options type
 			{
@@ -156,7 +198,7 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 			},
 			// Verify result of strange polymorphic options
 			{
-				Config: s.Config,
+				Config: config,
 				Check:  nil,
 			},
 			{
@@ -181,7 +223,7 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 				ExpectError: regexp.MustCompile("InvalidParameter.*JSON input"),
 			},
 			{
-				Config: s.Config + additionalDhcpOption4 + defaultDhcpOpts,
+				Config: config + additionalDhcpOption4 + defaultDhcpOpts,
 				Check: resource.ComposeAggregateTestCheckFunc(
 
 					resource.TestCheckResourceAttr("oci_core_dhcp_options.opt1", "display_name", "display_name1"),
@@ -259,12 +301,12 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 			},
 			// Verify removing default DHCP options
 			{
-				Config: s.Config + additionalDhcpOption4,
+				Config: config + additionalDhcpOption4,
 				Check:  nil,
 			},
 			// Verify adding default DHCP options again
 			{
-				Config: s.Config + additionalDhcpOption4 + defaultDhcpOpts,
+				Config: config + additionalDhcpOption4 + defaultDhcpOpts,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "options.0.type", "DomainNameServer"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "options.0.server_type", "CustomDnsServer"),
@@ -290,7 +332,7 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 			},
 			// ensure that changing the case for options.?.type (polymorphic discriminator) is a no-op.
 			{
-				Config: s.Config + `
+				Config: config + `
 					resource "oci_core_dhcp_options" "opt4" { # Same as additionalDhcpOption4 but with diff casing for 'type'.
 						compartment_id = "${var.compartment_id}"
 						vcn_id = "${oci_core_virtual_network.t.id}"
@@ -309,7 +351,7 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 			},
 			// Changing to a different vcn should be a ForceNew
 			{
-				Config: s.Config + `
+				Config: config + `
 					resource "oci_core_dhcp_options" "opt4" { # Same as alternate additionalDhcpOption4 above, but with diff vcn.
 						compartment_id = "${var.compartment_id}"
 						vcn_id = "${oci_core_virtual_network.t2.id}"
@@ -337,9 +379,3 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 		},
 	})
 }
-
-func TestResourceCoreDHCPOptionsTestSuite(t *testing.T) {
-	httpreplay.SetScenario("TestResourceCoreDHCPOptionsTestSuite")
-	defer httpreplay.SaveScenario()
-	suite.Run(t, new(ResourceCoreDHCPOptionsTestSuite))
-}

oci/core_dhcp_options_resource_test.go

@@ -25,7 +25,6 @@ func CoreNatGatewayResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 			"vcn_id": {
 				Type:     schema.TypeString,
@@ -207,6 +206,15 @@ func (s *CoreNatGatewayResourceCrud) Get() error {
 }
 
 func (s *CoreNatGatewayResourceCrud) Update() error {
+	if compartment, ok := s.D.GetOkExists("compartment_id"); ok && s.D.HasChange("compartment_id") {
+		oldRaw, newRaw := s.D.GetChange("compartment_id")
+		if newRaw != "" && oldRaw != "" {
+			err := s.updateCompartment(compartment)
+			if err != nil {
+				return err
+			}
+		}
+	}
 	request := oci_core.UpdateNatGatewayRequest{}
 
 	if blockTraffic, ok := s.D.GetOkExists("block_traffic"); ok {
@@ -292,3 +300,21 @@ func (s *CoreNatGatewayResourceCrud) SetData() error {
 
 	return nil
 }
+
+func (s *CoreNatGatewayResourceCrud) updateCompartment(compartment interface{}) error {
+	changeCompartmentRequest := oci_core.ChangeNatGatewayCompartmentRequest{}
+
+	compartmentTmp := compartment.(string)
+	changeCompartmentRequest.CompartmentId = &compartmentTmp
+
+	idTmp := s.D.Id()
+	changeCompartmentRequest.NatGatewayId = &idTmp
+
+	changeCompartmentRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
+
+	_, err := s.Client.ChangeNatGatewayCompartment(context.Background(), changeCompartmentRequest)
+	if err != nil {
+		return err
+	}
+	return nil
+}

oci/core_nat_gateway_resource.go

@@ -61,6 +61,9 @@ func TestCoreNatGatewayResource_basic(t *testing.T) {
 	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
+	compartmentIdU := getEnvSettingWithDefault("compartment_id_for_update", compartmentId)
+	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
+
 	resourceName := "oci_core_nat_gateway.test_nat_gateway"
 	datasourceName := "data.oci_core_nat_gateways.test_nat_gateways"
 	singularDatasourceName := "data.oci_core_nat_gateway.test_nat_gateway"
@@ -116,6 +119,35 @@ func TestCoreNatGatewayResource_basic(t *testing.T) {
 				),
 			},
 
+			// verify update to the compartment (the compartment will be switched back in the next step)
+			{
+				Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + NatGatewayResourceDependencies +
+					generateResourceFromRepresentationMap("oci_core_nat_gateway", "test_nat_gateway", Optional, Create,
+						representationCopyWithNewProperties(natGatewayRepresentation, map[string]interface{}{
+							"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
+						})),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "block_traffic", "false"),
+					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
+					resource.TestCheckResourceAttr(resourceName, "defined_tags.%", "1"),
+					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
+					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttrSet(resourceName, "nat_ip"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
+					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
+					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
+
+					func(s *terraform.State) (err error) {
+						resId2, err = fromInstanceState(s, resourceName, "id")
+						if resId != resId2 {
+							return fmt.Errorf("resource recreated when it was supposed to be updated")
+						}
+						return err
+					},
+				),
+			},
+
 			// verify updates to updatable parameters
 			{
 				Config: config + compartmentIdVariableStr + NatGatewayResourceDependencies +

oci/core_nat_gateway_test.go

@@ -296,7 +296,7 @@ func TestCorePublicIpResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "display_name", displayName),
 					resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 					resource.TestCheckResourceAttr(resourceName, "lifetime", string(oci_core.PublicIpLifetimeReserved)),
-					resource.TestCheckResourceAttr(resourceName, "private_ip_id", ""), // Still defined, but now empty.
+					resource.TestCheckNoResourceAttr(resourceName, "private_ip_id"), // Should not be defined in state
 					resource.TestCheckNoResourceAttr(resourceName, "availability_domain"),
 					resource.TestCheckResourceAttrSet(resourceName, "ip_address"),
 					resource.TestCheckResourceAttr(resourceName, "scope", string(oci_core.PublicIpScopeRegion)),