Release 3.22.0

Release 3.22.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,12 @@
-## 3.21.1 (Unreleased)
+## 3.22.0 (Unreleased)
+
+### Added
+- Support for `compartment_id` filter in `email_senders` and `email_suppressions` data sources
+- Support for import in dbHomes and dbSystems
+
+### Fixed
+- Backward compatibility for compositeId in Object Storage - Objects and PARs
+
 ## 3.21.0 (April 03, 2019)
 
 ### Added

examples/object_storage/object.tf

@@ -1,7 +1,7 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
 /* This example demonstrates object store object management. It uses Terraforms built-in `file` function to upload a file.
- * 
+ *
  * WARNING: This should only be used with small files. The file helper does stringification so large files
  * may cause terraform to slow, become unresponsive or exceed allowed memory usage.
  */

oci/crud_helpers.go

@@ -419,6 +419,11 @@ func FilterMissingResourceError(sync ResourceVoider, err *error) {
 	}
 }
 
+// In the Exadata case the service return the hostname provided by the service with a suffix
+func dbSystemHostnameDiffSuppress(key string, old string, new string, d *schema.ResourceData) bool {
+	return EqualIgnoreCaseSuppressDiff(key, old, new, d) || strings.HasPrefix(strings.ToLower(old), strings.ToLower(new))
+}
+
 func EqualIgnoreCaseSuppressDiff(key string, old string, new string, d *schema.ResourceData) bool {
 	return strings.EqualFold(old, new)
 }

oci/database_db_home_resource.go

@@ -16,6 +16,9 @@ import (
 
 func DatabaseDbHomeResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: &schema.ResourceTimeout{
 			Create: &TwelveHours,
 			Delete: &TwoHours,
@@ -463,6 +466,9 @@ func (s *DatabaseDbHomeResourceCrud) SetData() error {
 		s.D.Set("database", []interface{}{s.DatabaseToMap(s.Database)})
 	}
 
+	if source, ok := s.D.GetOkExists("source"); !ok || source.(string) == "" {
+		s.D.Set("source", "NONE")
+	}
 	return nil
 }
 

oci/database_db_home_test.go

@@ -241,6 +241,23 @@ func TestDatabaseDbHomeResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 				),
 			},
+			// remove singular datasource from previous step so that it doesn't conflict with import tests
+			{
+				Config: config +
+					compartmentIdVariableStr + DbHomeResourceDependencies +
+					generateResourceFromRepresentationMap("oci_database_db_home", "test_db_home_source_none", Optional, Update, dbHomeRepresentationSourceNone) +
+					generateResourceFromRepresentationMap("oci_database_db_home", "test_db_home_source_db_backup", Optional, Update, dbHomeRepresentationSourceDbBackup),
+			},
+			// verify resource import
+			{
+				Config:            config,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{
+					"database.0.admin_password",
+				},
+				ResourceName: resourceName + "_source_none",
+			},
 		},
 	})
 }

oci/database_db_system_resource.go

@@ -17,6 +17,9 @@ import (
 
 func DatabaseDbSystemResource() *schema.Resource {
 	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Timeouts: &schema.ResourceTimeout{
 			// ZeroTime is a marker so a user supplied default is not overwritten. See CreateDBSystemResource
 			Create: &ZeroTime,
@@ -244,7 +247,7 @@ func DatabaseDbSystemResource() *schema.Resource {
 				Type:             schema.TypeString,
 				Required:         true,
 				ForceNew:         true,
-				DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
+				DiffSuppressFunc: dbSystemHostnameDiffSuppress,
 			},
 			"shape": {
 				Type:     schema.TypeString,
@@ -648,7 +651,7 @@ func (s *DatabaseDbSystemResourceCrud) getDbHomeInfo() error {
 		return err
 	}
 	if getDbHomeResponse.DbHome.LifecycleState == oci_database.DbHomeLifecycleStateTerminated {
-		return fmt.Errorf("the associated dbHome is in a TERMINATED state")
+		return fmt.Errorf("the associated dbHome %s is in a TERMINATED state", *dbHomeId)
 	}
 
 	var databaseId *string
@@ -844,8 +847,9 @@ func (s *DatabaseDbSystemResourceCrud) SetData() error {
 
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
-	// @codegen: Do not set hostname. Refreshing hostname causes undesirable diffs because the service may add a suffix
-	// as in the case of Exadatas. Possible implication when importing the resource.
+	if s.Res.Hostname != nil {
+		s.D.Set("hostname", *s.Res.Hostname)
+	}
 
 	if s.Res.LastPatchHistoryEntryId != nil {
 		s.D.Set("last_patch_history_entry_id", *s.Res.LastPatchHistoryEntryId)
@@ -915,6 +919,10 @@ func (s *DatabaseDbSystemResourceCrud) SetData() error {
 		s.D.Set("db_home", []interface{}{s.DbHomeToMap(s.DbHome)})
 	}
 
+	if source, ok := s.D.GetOkExists("source"); !ok || source.(string) == "" {
+		s.D.Set("source", "NONE")
+	}
+
 	return nil
 }
 
@@ -949,13 +957,6 @@ func (s *DatabaseDbSystemResourceCrud) mapToUpdateDatabaseDetails(fieldKeyFormat
 
 func (s *DatabaseDbSystemResourceCrud) DbHomeToMap(obj *oci_database.DbHome) map[string]interface{} {
 	result := map[string]interface{}{}
-	if obj.CompartmentId != nil {
-		result["compartment_id"] = string(*obj.CompartmentId)
-	}
-
-	if obj.DbSystemId != nil {
-		result["db_system_id"] = string(*obj.DbSystemId)
-	}
 
 	if obj.DbVersion != nil {
 		result["db_version"] = string(*obj.DbVersion)
@@ -1116,6 +1117,18 @@ func (s *DatabaseDbSystemResourceCrud) mapToCreateDatabaseDetails(fieldKeyFormat
 		result.DbWorkload = oci_database.CreateDatabaseDetailsDbWorkloadEnum(dbWorkload.(string))
 	}
 
+	if definedTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "defined_tags")); ok {
+		tmp, err := mapToDefinedTags(definedTags.(map[string]interface{}))
+		if err != nil {
+			return result, fmt.Errorf("unable to convert defined_tags, encountered error: %v", err)
+		}
+		result.DefinedTags = tmp
+	}
+
+	if freeformTags, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "freeform_tags")); ok {
+		result.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
+	}
+
 	if ncharacterSet, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "ncharacter_set")); ok {
 		tmp := ncharacterSet.(string)
 		result.NcharacterSet = &tmp

oci/database_db_system_resource_test.go

@@ -251,7 +251,6 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystemFromB
 					resource.TestCheckResourceAttr(s.ResourceName, "license_model", "LICENSE_INCLUDED"),
 					resource.TestCheckResourceAttr(s.ResourceName, "node_count", "1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.db_version", "12.1.0.2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.display_name", ""),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.admin_password", "BEstrO0ng_#11"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_name", "dbback"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(database.DatabaseLifecycleStateAvailable)),
@@ -319,13 +318,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_basi
 					resource.TestCheckResourceAttr(s.ResourceName, "node_count", "1"),
 					//resource.TestCheckResourceAttr(s.ResourceName, "fault_domains.#", "1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.db_version", "12.1.0.2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.display_name", ""),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.admin_password", "BEstrO0ng_#11"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_name", "aTFdb"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.character_set", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.ncharacter_set", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_workload", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.pdb_name", ""),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(database.DatabaseLifecycleStateAvailable)),
 				),
 			},
@@ -619,8 +613,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
 							"admin_password" = "BEstrO0ng_#11"
 							"db_name" = "aTFdb"
 							character_set = "AL32UTF8"
-							defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
-							freeform_tags = {"Department" = "Finance"}
+							//defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}" // service does not set tags of db tags in create
+							//freeform_tags = {"Department" = "Finance"} // service does not set tags of db tags in create
 							ncharacter_set = "AL16UTF16"
 							db_workload = "OLTP"
 							pdb_name = "pdbName"
@@ -700,8 +694,6 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.admin_password", "BEstrO0ng_#11"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_name", "aTFdb"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.character_set", "AL32UTF8"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.defined_tags.example-tag-namespace-all.example-tag", "originalValue"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.freeform_tags.Department", "Finance"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.ncharacter_set", "AL16UTF16"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_workload", "OLTP"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.pdb_name", "pdbName"),
@@ -1090,13 +1082,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_Exad
 					resource.TestCheckResourceAttr(s.ResourceName, "license_model", "LICENSE_INCLUDED"),
 					resource.TestCheckResourceAttr(s.ResourceName, "node_count", "1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.db_version", "12.1.0.2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.display_name", ""),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.admin_password", "BEstrO0ng_#11"),
 					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_name", "aTFdb"),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.character_set", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.ncharacter_set", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.db_workload", ""),
-					resource.TestCheckResourceAttr(s.ResourceName, "db_home.0.database.0.pdb_name", ""),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(database.DatabaseLifecycleStateAvailable)),
 					resource.TestCheckResourceAttr(s.ResourceName, "time_zone", "US/Pacific"),
 				),

oci/email_sender_test.go

@@ -133,6 +133,7 @@ func TestEmailSenderResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
 
 					resource.TestCheckResourceAttr(datasourceName, "senders.#", "1"),
+					resource.TestCheckResourceAttr(datasourceName, "senders.0.compartment_id", compartmentId),
 					resource.TestCheckResourceAttr(datasourceName, "senders.0.defined_tags.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "senders.0.email_address", "[email protected]"),
 					resource.TestCheckResourceAttr(datasourceName, "senders.0.freeform_tags.%", "1"),

oci/email_senders_data_source.go

@@ -102,7 +102,9 @@ func (s *EmailSendersDataSourceCrud) SetData() error {
 	resources := []map[string]interface{}{}
 
 	for _, r := range s.Res.Items {
-		sender := map[string]interface{}{}
+		sender := map[string]interface{}{
+			"compartment_id": *r.CompartmentId,
+		}
 
 		if r.DefinedTags != nil {
 			sender["defined_tags"] = definedTagsToMap(r.DefinedTags)

oci/email_suppression_test.go

@@ -83,6 +83,7 @@ func TestEmailSuppressionResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "time_created_less_than", "2038-01-01T00:00:00.000Z"),
 
 					resource.TestCheckResourceAttr(datasourceName, "suppressions.#", "1"),
+					resource.TestCheckResourceAttr(datasourceName, "suppressions.0.compartment_id", tenancyId),
 					// email address is converted to lower case by the service
 					resource.TestCheckResourceAttr(datasourceName, "suppressions.0.email_address", "[email protected]"),
 					resource.TestCheckResourceAttrSet(datasourceName, "suppressions.0.time_created"),