Merge pull request #702 from terraform-providers/release

Release 3.14.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.13.1 (Unreleased)
+## 3.14.0 (Unreleased)
+
+### Added
+- Adding support for the database renaming during restore from incremental backup
+
 ## 3.13.0 (January 23, 2019)
 
 ### Added

oci/audit_configuration_resource.go

@@ -4,6 +4,7 @@ package provider
 
 import (
 	"context"
+	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
@@ -117,6 +118,10 @@ func (s *ConfigurationResourceCrud) Update() error {
 		return err
 	}
 
+	// Workaround: Sleep for some time before polling the configuration. Because update happens asynchronously, polling too
+	// soon may result in service returning stale configuration values.
+	time.Sleep(time.Second * 5)
+
 	// Requests to update the retention policy may succeed instantly but may not see the actual update take effect
 	// until minutes later. Add polling here to return only when the change has taken effect.
 	retentionPolicyFunc := func() bool { return *s.Res.RetentionPeriodDays == *request.RetentionPeriodDays }

oci/database_db_system_resource.go

@@ -718,6 +718,11 @@ func (s *DbSystemResourceCrud) mapToCreateDatabaseFromBackupDetails(fieldKeyForm
 		result.BackupTDEPassword = &tmp
 	}
 
+	if dbName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "db_name")); ok {
+		tmp := dbName.(string)
+		result.DbName = &tmp
+	}
+
 	return result, nil
 }
 
@@ -736,6 +741,10 @@ func CreateDatabaseFromBackupDetailsToMap(obj *oci_database.CreateDatabaseFromBa
 		result["backup_tde_password"] = string(*obj.BackupTDEPassword)
 	}
 
+	if obj.DbName != nil {
+		result["db_name"] = string(*obj.DbName)
+	}
+
 	return result
 }
 

oci/version.go

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