diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f3167aef56..c2400a00873 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/oci/audit_configuration_resource.go b/oci/audit_configuration_resource.go index 4223abcb013..e48463200f3 100644 --- a/oci/audit_configuration_resource.go +++ b/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 } diff --git a/oci/database_db_system_resource.go b/oci/database_db_system_resource.go index 8e00f86ed7e..5f58a9085e7 100644 --- a/oci/database_db_system_resource.go +++ b/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 } diff --git a/oci/version.go b/oci/version.go index 0bd9f2a1971..07ca6a56328 100644 --- a/oci/version.go +++ b/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) diff --git a/vendor/github.com/oracle/oci-go-sdk/CHANGELOG.md b/vendor/github.com/oracle/oci-go-sdk/CHANGELOG.md index 8530c4bbb78..8c6763e24fa 100644 --- a/vendor/github.com/oracle/oci-go-sdk/CHANGELOG.md +++ b/vendor/github.com/oracle/oci-go-sdk/CHANGELOG.md @@ -4,9 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) +## 3.5.0 - 2019-01-24 +### Added + +- Support for renaming databases during restore-from-backup operations in the Database service +- Built-in logging now supports log levels. More information about the changes can be found in the [go-docs page](https://godoc.org/github.com/oracle/oci-go-sdk#hdr-Logging_and_Debugging) +- Support for calling Oracle Cloud Infrastructure services in the ca-toronto-1 region + ## 3.4.0 - 2019-01-10 ### Added -- Support for device attributes on volumes in the Block Storage service +- Support for device attributes on volume attachments in the Compute service - Support for custom header rulesets in the Load Balancing service diff --git a/vendor/github.com/oracle/oci-go-sdk/common/auth/instance_principal_key_provider.go b/vendor/github.com/oracle/oci-go-sdk/common/auth/instance_principal_key_provider.go index d2c19917436..12b580deba4 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/auth/instance_principal_key_provider.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/auth/instance_principal_key_provider.go @@ -52,7 +52,7 @@ func newInstancePrincipalKeyProvider(modifier func(common.HTTPRequestDispatcher) if region, err = getRegionForFederationClient(client, regionURL); err != nil { err = fmt.Errorf("failed to get the region name from %s: %s", regionURL, err.Error()) - common.Logln(err) + common.Logf("%v\n", err) return nil, err } diff --git a/vendor/github.com/oracle/oci-go-sdk/common/client.go b/vendor/github.com/oracle/oci-go-sdk/common/client.go index 8cf6dcf226b..db96ff73557 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/client.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/client.go @@ -289,13 +289,14 @@ func (client BaseClient) CallWithDetails(ctx context.Context, request *http.Requ IfDebug(func() { dumpBody := true if request.ContentLength > maxBodyLenForDebug { - Logln("not dumping body too big") + Debugf("not dumping body too big\n") dumpBody = false } + dumpBody = dumpBody && defaultLogger.LogLevel() == verboseLogging if dump, e := httputil.DumpRequestOut(request, dumpBody); e == nil { - Logf("Dump Request %v", string(dump)) + Debugf("Dump Request %s", string(dump)) } else { - Debugln(e) + Debugf("%v\n", e) } }) @@ -304,20 +305,21 @@ func (client BaseClient) CallWithDetails(ctx context.Context, request *http.Requ IfDebug(func() { if err != nil { - Logln(err) + Debugf("%v\n", err) return } dumpBody := true if response.ContentLength > maxBodyLenForDebug { - Logln("not dumping body too big") + Debugf("not dumping body too big\n") dumpBody = false } + dumpBody = dumpBody && defaultLogger.LogLevel() == verboseLogging if dump, e := httputil.DumpResponse(response, dumpBody); e == nil { - Logf("Dump Response %v", string(dump)) + Debugf("Dump Response %s", string(dump)) } else { - Debugln(e) + Debugf("%v\n", e) } }) diff --git a/vendor/github.com/oracle/oci-go-sdk/common/common.go b/vendor/github.com/oracle/oci-go-sdk/common/common.go index 362c00c4c39..256a76d5b62 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/common.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/common.go @@ -14,6 +14,8 @@ type Region string const ( //RegionSEA region SEA RegionSEA Region = "sea" + //RegionCAToronto1 region for toronto + RegionCAToronto1 Region = "ca-toronto-1" //RegionPHX region PHX RegionPHX Region = "us-phoenix-1" //RegionIAD region IAD @@ -29,10 +31,11 @@ var realm = map[string]string{ } var regionRealm = map[Region]string{ - RegionPHX: "oc1", - RegionIAD: "oc1", - RegionFRA: "oc1", - RegionLHR: "oc1", + RegionPHX: "oc1", + RegionIAD: "oc1", + RegionFRA: "oc1", + RegionLHR: "oc1", + RegionCAToronto1: "oc1", } // Endpoint returns a endpoint for a service @@ -74,6 +77,8 @@ func StringToRegion(stringRegion string) (r Region) { switch strings.ToLower(stringRegion) { case "sea": r = RegionSEA + case "ca-toronto-1": + r = RegionCAToronto1 case "phx", "us-phoenix-1": r = RegionPHX case "iad", "us-ashburn-1": diff --git a/vendor/github.com/oracle/oci-go-sdk/common/http.go b/vendor/github.com/oracle/oci-go-sdk/common/http.go index 3c102298363..2b4b9c72eb6 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/http.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/http.go @@ -246,7 +246,7 @@ func removeNilFieldsInJSONWithTaggedStruct(rawJSON []byte, value reflect.Value) func addToBody(request *http.Request, value reflect.Value, field reflect.StructField) (e error) { Debugln("Marshaling to body from field:", field.Name) if request.Body != nil { - Logln("The body of the request is already set. Structure: ", field.Name, " will overwrite it") + Logf("The body of the request is already set. Structure: %s will overwrite it\n", field.Name) } tag := field.Tag encoding := tag.Get("encoding") @@ -263,7 +263,6 @@ func addToBody(request *http.Request, value reflect.Value, field reflect.StructF if e != nil { return } - Debugf("Marshaled body is: %s", string(marshaled)) bodyBytes := bytes.NewReader(marshaled) request.ContentLength = int64(bodyBytes.Len()) request.Header.Set(requestHeaderContentLength, strconv.FormatInt(request.ContentLength, 10)) @@ -276,7 +275,7 @@ func addToBody(request *http.Request, value reflect.Value, field reflect.StructF } func addToQuery(request *http.Request, value reflect.Value, field reflect.StructField) (e error) { - Debugln("Marshaling to query from field:", field.Name) + Debugln("Marshaling to query from field: ", field.Name) if request.URL == nil { request.URL = &url.URL{} } @@ -385,7 +384,7 @@ func addToPath(request *http.Request, value reflect.Value, field reflect.StructF return } urlTemplate := currentURLPath - Debugln("Marshaling to path from field:", field.Name, "in template:", urlTemplate) + Debugln("Marshaling to path from field: ", field.Name, " in template: ", urlTemplate) request.URL.Path = strings.Replace(urlTemplate, "{"+fieldName+"}", additionalURLPathPart, -1) } return @@ -405,7 +404,7 @@ func setWellKnownHeaders(request *http.Request, headerName, headerValue string) } func addToHeader(request *http.Request, value reflect.Value, field reflect.StructField) (e error) { - Debugln("Marshaling to header from field:", field.Name) + Debugln("Marshaling to header from field: ", field.Name) if request.Header == nil { request.Header = http.Header{} } @@ -532,7 +531,7 @@ func structToRequestPart(request *http.Request, val reflect.Value) (err error) { case "body": err = addToBody(request, sv, sf) case "": - Debugln(sf.Name, "does not contain contributes tag. Skipping.") + Debugln(sf.Name, " does not contain contributes tag. Skipping.") default: err = fmt.Errorf("can not marshal field: %s. It needs to contain valid contributesTo tag", sf.Name) } @@ -564,7 +563,7 @@ func HTTPRequestMarshaller(requestStruct interface{}, httpRequest *http.Request) return } - Debugln("Marshaling to Request:", val.Type().Name()) + Debugln("Marshaling to Request: ", val.Type().Name()) err = structToRequestPart(httpRequest, *val) return } @@ -793,7 +792,7 @@ func valueFromJSONBody(response *http.Response, value *reflect.Value, unmarshale } func addFromBody(response *http.Response, value *reflect.Value, field reflect.StructField, unmarshaler PolymorphicJSONUnmarshaler) (err error) { - Debugln("Unmarshaling from body to field:", field.Name) + Debugln("Unmarshaling from body to field: ", field.Name) if response.Body == nil { Debugln("Unmarshaling body skipped due to nil body content for field: ", field.Name) return nil @@ -831,7 +830,7 @@ func addFromBody(response *http.Response, value *reflect.Value, field reflect.St } func addFromHeader(response *http.Response, value *reflect.Value, field reflect.StructField) (err error) { - Debugln("Unmarshaling from header to field:", field.Name) + Debugln("Unmarshaling from header to field: ", field.Name) var headerName string if headerName = field.Tag.Get("name"); headerName == "" { return fmt.Errorf("unmarshaling response to a header requires the 'name' tag for field: %s", field.Name) @@ -896,7 +895,7 @@ func responseToStruct(response *http.Response, val *reflect.Value, unmarshaler P case "body": err = addFromBody(response, &sv, sf, unmarshaler) case "": - Debugln(sf.Name, "does not contain presentIn tag. Skipping") + Debugln(sf.Name, " does not contain presentIn tag. Skipping") default: err = fmt.Errorf("can not unmarshal field: %s. It needs to contain valid presentIn tag", sf.Name) } diff --git a/vendor/github.com/oracle/oci-go-sdk/common/log.go b/vendor/github.com/oracle/oci-go-sdk/common/log.go index 9cb8ec560fa..eea35c4d611 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/log.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/log.go @@ -7,58 +7,164 @@ import ( "io/ioutil" "log" "os" + "strings" "sync" ) -// Simple logging proxy to distinguish control for logging messages +//sdkLogger an interface for logging in the SDK +type sdkLogger interface { + //LogLevel returns the log level of sdkLogger + LogLevel() int + + //Log logs v with the provided format if the current log level is loglevel + Log(logLevel int, format string, v ...interface{}) error +} + +//noLogging no logging messages +const noLogging = 0 + +//infoLogging minimal logging messages +const infoLogging = 1 + +//debugLogging some logging messages +const debugLogging = 2 + +//verboseLogging all logging messages +const verboseLogging = 3 + +//defaultSDKLogger the default implementation of the sdkLogger +type defaultSDKLogger struct { + currentLoggingLevel int + verboseLogger *log.Logger + debugLogger *log.Logger + infoLogger *log.Logger + nullLogger *log.Logger +} + +//defaultLogger is the defaultLogger in the SDK +var defaultLogger sdkLogger +var loggerLock sync.Mutex + +//initializes the SDK defaultLogger as a defaultLogger +func init() { + l, _ := newSDKLogger() + setSDKLogger(l) +} + +//setSDKLogger sets the logger used by the sdk +func setSDKLogger(logger sdkLogger) { + loggerLock.Lock() + defaultLogger = logger + loggerLock.Unlock() +} + +// newSDKLogger creates a defaultSDKLogger // Debug logging is turned on/off by the presence of the environment variable "OCI_GO_SDK_DEBUG" -var debugLog = log.New(os.Stderr, "DEBUG ", log.Ldate|log.Ltime|log.Lshortfile) -var mainLog = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile) -var isDebugLogEnabled bool -var checkDebug sync.Once - -func setOutputForEnv() { - checkDebug.Do(func() { - isDebugLogEnabled = *new(bool) - _, isDebugLogEnabled = os.LookupEnv("OCI_GO_SDK_DEBUG") - - if !isDebugLogEnabled { - debugLog.SetOutput(ioutil.Discard) +// The value of the "OCI_GO_SDK_DEBUG" environment variable controls the logging level. +// "null" outputs no log messages +// "i" or "info" outputs minimal log messages +// "d" or "debug" outputs some logs messages +// "v" or "verbose" outputs all logs messages, including body of requests +func newSDKLogger() (defaultSDKLogger, error) { + logger := defaultSDKLogger{} + + logger.currentLoggingLevel = noLogging + logger.verboseLogger = log.New(os.Stderr, "VERBOSE ", log.Ldate|log.Ltime|log.Lshortfile) + logger.debugLogger = log.New(os.Stderr, "DEBUG ", log.Ldate|log.Ltime|log.Lshortfile) + logger.infoLogger = log.New(os.Stderr, "INFO ", log.Ldate|log.Ltime|log.Lshortfile) + logger.nullLogger = log.New(ioutil.Discard, "", log.Ldate|log.Ltime|log.Lshortfile) + + configured, isLogEnabled := os.LookupEnv("OCI_GO_SDK_DEBUG") + + // If env variable not present turn logging of + if !isLogEnabled { + logger.currentLoggingLevel = noLogging + } else { + + switch strings.ToLower(configured) { + case "null": + logger.currentLoggingLevel = noLogging + break + case "i", "info": + logger.currentLoggingLevel = infoLogging + break + //1 here for backwards compatibility + case "d", "debug", "1": + logger.currentLoggingLevel = debugLogging + break + case "v", "verbose": + logger.currentLoggingLevel = verboseLogging + break + default: + logger.currentLoggingLevel = infoLogging } - }) + } + + logger.infoLogger.Println("logger level set to: ", logger.currentLoggingLevel) + return logger, nil +} + +func (l defaultSDKLogger) getLoggerForLevel(logLevel int) *log.Logger { + if logLevel > l.currentLoggingLevel { + return l.nullLogger + } + + switch logLevel { + case noLogging: + return l.nullLogger + case infoLogging: + return l.infoLogger + case debugLogging: + return l.debugLogger + case verboseLogging: + return l.verboseLogger + default: + return l.nullLogger + } +} + +//LogLevel returns the current debug level +func (l defaultSDKLogger) LogLevel() int { + return l.currentLoggingLevel +} + +func (l defaultSDKLogger) Log(logLevel int, format string, v ...interface{}) error { + logger := l.getLoggerForLevel(logLevel) + logger.Output(4, fmt.Sprintf(format, v...)) + return nil +} + +//Logln logs v appending a new line at the end +//Deprecated +func Logln(v ...interface{}) { + defaultLogger.Log(infoLogging, "%v\n", v...) +} + +// Logf logs v with the provided format +func Logf(format string, v ...interface{}) { + defaultLogger.Log(infoLogging, format, v...) } // Debugf logs v with the provided format if debug mode is set func Debugf(format string, v ...interface{}) { - setOutputForEnv() - debugLog.Output(3, fmt.Sprintf(format, v...)) + defaultLogger.Log(debugLogging, format, v...) } // Debug logs v if debug mode is set func Debug(v ...interface{}) { - setOutputForEnv() - debugLog.Output(3, fmt.Sprint(v...)) + m := fmt.Sprint(v...) + defaultLogger.Log(debugLogging, "%s", m) } // Debugln logs v appending a new line if debug mode is set func Debugln(v ...interface{}) { - setOutputForEnv() - debugLog.Output(3, fmt.Sprintln(v...)) + m := fmt.Sprint(v...) + defaultLogger.Log(debugLogging, "%s\n", m) } // IfDebug executes closure if debug is enabled func IfDebug(fn func()) { - if isDebugLogEnabled { + if defaultLogger.LogLevel() >= debugLogging { fn() } } - -// Logln logs v appending a new line at the end -func Logln(v ...interface{}) { - mainLog.Output(3, fmt.Sprintln(v...)) -} - -// Logf logs v with the provided format -func Logf(format string, v ...interface{}) { - mainLog.Output(3, fmt.Sprintf(format, v...)) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/common/version.go b/vendor/github.com/oracle/oci-go-sdk/common/version.go index c0e56478e97..b6b6f28b079 100644 --- a/vendor/github.com/oracle/oci-go-sdk/common/version.go +++ b/vendor/github.com/oracle/oci-go-sdk/common/version.go @@ -11,7 +11,7 @@ import ( const ( major = "3" - minor = "4" + minor = "5" patch = "0" tag = "" ) diff --git a/vendor/github.com/oracle/oci-go-sdk/database/create_database_from_backup_details.go b/vendor/github.com/oracle/oci-go-sdk/database/create_database_from_backup_details.go index 0260f0c78d2..ffe0762a205 100644 --- a/vendor/github.com/oracle/oci-go-sdk/database/create_database_from_backup_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/database/create_database_from_backup_details.go @@ -23,6 +23,9 @@ type CreateDatabaseFromBackupDetails struct { // A strong password for SYS, SYSTEM, PDB Admin and TDE Wallet. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, \#, or -. AdminPassword *string `mandatory:"true" json:"adminPassword"` + + // The display name of the database to be created from the backup. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. + DbName *string `mandatory:"false" json:"dbName"` } func (m CreateDatabaseFromBackupDetails) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/oci.go b/vendor/github.com/oracle/oci-go-sdk/oci.go index e989762e1bc..a064a5574eb 100644 --- a/vendor/github.com/oracle/oci-go-sdk/oci.go +++ b/vendor/github.com/oracle/oci-go-sdk/oci.go @@ -222,7 +222,15 @@ Logging and Debugging The SDK has a built-in logging mechanism used internally. The internal logging logic is used to record the raw http requests, responses and potential errors when (un)marshalling request and responses. -To expose debugging logs, set the environment variable "OCI_GO_SDK_DEBUG" to "1", or some other non empty string. +Built-in logging in the SDK is controlled via the environment variable "OCI_GO_SDK_DEBUG" and its contents. The below are possible values for the "OCI_GO_SDK_DEBUG" variable +1. "info" or "i" enables all info logging messages +2. "debug" or "d", or "1" enables all debug and info logging messages +3. "verbose" or "v" enables all verbose, debug and info logging messages +4. "null" turns all logging messages off. + +If the value of the environment variable does not match any of the above then default logging level is "info". +If the environment variable is not present then no logging messages are emitted. + Retry diff --git a/vendor/vendor.json b/vendor/vendor.json index 28551a5d23d..885445eea09 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -684,13 +684,13 @@ "revisionTime": "2018-03-08T00:51:04Z" }, { - "checksumSHA1": "bR06l5TSk7dKfKOWmFcQ8UApUp8=", + "checksumSHA1": "RJE6DGQx9hXxAHeiS7e2ZsXF74Y=", "path": "github.com/oracle/oci-go-sdk", - "revision": "ed3815483589bcd6598fddfd86cfd09756818653", - "revisionTime": "2019-01-10T17:32:59Z", + "revision": "a1f356c89d2bee324e378240255c68ba7c49ed00", + "revisionTime": "2019-01-24T17:55:03Z", "tree": true, - "version": "=v3.4.0", - "versionExact": "v3.4.0" + "version": "=v3.5.0", + "versionExact": "v3.5.0" }, { "checksumSHA1": "LuFv4/jlrmFNnDb/5SCSEPAM9vU=", diff --git a/website/docs/d/database_autonomous_data_warehouse.html.markdown b/website/docs/d/database_autonomous_data_warehouse.html.markdown index 32be1bfffdb..7c6595a7548 100644 --- a/website/docs/d/database_autonomous_data_warehouse.html.markdown +++ b/website/docs/d/database_autonomous_data_warehouse.html.markdown @@ -34,7 +34,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Data Warehouse. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Data Warehouse. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/d/database_autonomous_data_warehouses.html.markdown b/website/docs/d/database_autonomous_data_warehouses.html.markdown index d9fa1dbd725..6755bbffcd8 100644 --- a/website/docs/d/database_autonomous_data_warehouses.html.markdown +++ b/website/docs/d/database_autonomous_data_warehouses.html.markdown @@ -46,7 +46,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Data Warehouse. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Data Warehouse. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/d/database_autonomous_database.html.markdown b/website/docs/d/database_autonomous_database.html.markdown index 45f0fd38d73..84db4ab05af 100644 --- a/website/docs/d/database_autonomous_database.html.markdown +++ b/website/docs/d/database_autonomous_database.html.markdown @@ -34,7 +34,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Autonomous Database. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Database. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/d/database_autonomous_databases.html.markdown b/website/docs/d/database_autonomous_databases.html.markdown index c3d3e155835..357976dbe3f 100644 --- a/website/docs/d/database_autonomous_databases.html.markdown +++ b/website/docs/d/database_autonomous_databases.html.markdown @@ -46,7 +46,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Autonomous Database. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Database. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/r/database_autonomous_data_warehouse.html.markdown b/website/docs/r/database_autonomous_data_warehouse.html.markdown index 48d438578a2..92266b4f30e 100644 --- a/website/docs/r/database_autonomous_data_warehouse.html.markdown +++ b/website/docs/r/database_autonomous_data_warehouse.html.markdown @@ -55,7 +55,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Data Warehouse. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Data Warehouse. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/r/database_autonomous_database.html.markdown b/website/docs/r/database_autonomous_database.html.markdown index 6987f2ad309..bc99f3c9023 100644 --- a/website/docs/r/database_autonomous_database.html.markdown +++ b/website/docs/r/database_autonomous_database.html.markdown @@ -55,7 +55,7 @@ The following attributes are exported: * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment. * `connection_strings` - The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. - * `all_connection_strings` - All connection strings to use to connect to the Autonomous Database. + * `all_connection_strings` - Returns all connection strings that can be used to connect to the Autonomous Database. For more information, please see [Predefined Database Service Names for Autonomous Transaction Processing](https://docs.oracle.com/en/cloud/paas/atp-cloud/atpug/connect-predefined.html#GUID-9747539B-FD46-44F1-8FF8-F5AC650F15BE) * `high` - The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. * `low` - The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. * `medium` - The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. diff --git a/website/docs/r/database_db_system.html.markdown b/website/docs/r/database_db_system.html.markdown index 1625be84dba..7a6939a8ee1 100644 --- a/website/docs/r/database_db_system.html.markdown +++ b/website/docs/r/database_db_system.html.markdown @@ -113,7 +113,7 @@ The following arguments are supported: AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS * `db_backup_config` - (Applicable when source=NONE) * `auto_backup_enabled` - (Applicable when source=NONE) If set to true, configures automatic backups. If you previously used RMAN or dbcli to configure backups and then you switch to using the Console or the API for backups, a new backup configuration is created and associated with your database. This means that you can no longer rely on your previously configured unmanaged backups to work. - * `db_name` - (Required when source=NONE) The database name. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. + * `db_name` - (Required when source=NONE, Applicable when source=DB_BACKUP) The display name of the database. It must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. * `db_workload` - (Applicable when source=NONE) The database workload type. * `defined_tags` - (Applicable when source=NONE) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` * `freeform_tags` - (Applicable when source=NONE) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` @@ -140,7 +140,7 @@ The following arguments are supported: To get a list of shapes, use the [ListDbSystemShapes](https://docs.cloud.oracle.com/iaas/api/#/en/database/20160918/DbSystemShapeSummary/ListDbSystemShapes) operation. * `source` - (Optional) The source of the database: NONE for creating a new database. DB_BACKUP for creating a new database by restoring from a backup. The default is NONE. * `sparse_diskgroup` - (Optional) If true, Sparse Diskgroup is configured for Exadata dbsystem. If False, Sparse diskgroup is not configured. -* `ssh_public_keys` - (Required) (Updatable) The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. +* `ssh_public_keys` - (Required) (Updatable) The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 40,000 characters. * `subnet_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. **Subnet Restrictions:**