Merge remote-tracking branch 'bitbucket/github' into release_2019-05-14

Author: rajeshad

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## 5.6.0 - 2019-05-14
+### Added
+- Support for the Seoul (ICN) region
+- Support for logging context fields on data-plane APIs of the Key Management Service
+- Support for reverse pagination on list operations of the Email service
+- Support for configuring backup retention windows on database backups in the Database service
+
 ## 5.5.0 - 2019-05-07
 ### Added
 - Support for the Tokyo (NRT) region

common/common.go

@@ -26,6 +26,8 @@ const (
 	RegionLHR Region = "uk-london-1"
 	//RegionAPTokyo1 region for tokyo
 	RegionAPTokyo1 Region = "ap-tokyo-1"
+	//RegionAPSeoul1 region for seoul
+	RegionAPSeoul1 Region = "ap-seoul-1"
 
 	//RegionUSLangley1 region for langley
 	RegionUSLangley1 Region = "us-langley-1"
@@ -53,6 +55,7 @@ var regionRealm = map[Region]string{
 	RegionLHR:        "oc1",
 	RegionCAToronto1: "oc1",
 	RegionAPTokyo1:   "oc1",
+	RegionAPSeoul1:   "oc1",
 
 	RegionUSLangley1:    "oc2",
 	RegionUSLuke1:       "oc2",
@@ -112,6 +115,8 @@ func StringToRegion(stringRegion string) (r Region) {
 		r = RegionLHR
 	case "ap-tokyo-1":
 		r = RegionAPTokyo1
+	case "ap-seoul-1":
+		r = RegionAPSeoul1
 	case "us-langley-1":
 		r = RegionUSLangley1
 	case "us-luke-1":

common/version.go

@@ -18,6 +18,11 @@ type DbBackupConfig struct {
 
 	// 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.
 	AutoBackupEnabled *bool `mandatory:"false" json:"autoBackupEnabled"`
+
+	// Number of days between the current and the earliest point of recoverability covered by automatic backups.
+	// This value applies to automatic backups only. After a new automatic backup has been created, Oracle removes old automatic backups that are created before the window.
+	// When the value is updated, it is applied to all existing automatic backups.
+	RecoveryWindowInDays *int `mandatory:"false" json:"recoveryWindowInDays"`
 }
 
 func (m DbBackupConfig) String() string {

database/db_backup_config.go

@@ -23,8 +23,9 @@ type ListSendersRequest struct {
 	// The email address of the approved sender.
 	EmailAddress *string `mandatory:"false" contributesTo:"query" name:"emailAddress"`
 
-	// The value of the `opc-next-page` response header from the previous
-	// GET request.
+	// For list pagination. The value of the opc-next-page response header from the previous "List" call.
+	// For important details about how pagination works,
+	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
 	Page *string `mandatory:"false" contributesTo:"query" name:"page"`
 
 	// For list pagination. The maximum number of results per page, or items to return in a
@@ -79,6 +80,11 @@ type ListSendersResponse struct {
 	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
 	OpcNextPage *string `presentIn:"header" name:"opc-next-page"`
 
+	// For list pagination. When this header appears in the response, previous pages
+	// of results exist. For important details about how pagination works,
+	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
+	OpcPrevPage *string `presentIn:"header" name:"opc-prev-page"`
+
 	// The total number of items returned from the request.
 	OpcTotalItems *int `presentIn:"header" name:"opc-total-items"`
 }

email/list_senders_request_response.go

@@ -38,8 +38,9 @@ type ListSuppressionsRequest struct {
 	// **Example:** 2016-12-19T16:39:57.600Z
 	TimeCreatedLessThan *common.SDKTime `mandatory:"false" contributesTo:"query" name:"timeCreatedLessThan"`
 
-	// The value of the `opc-next-page` response header from the previous
-	// GET request.
+	// For list pagination. The value of the opc-next-page response header from the previous "List" call.
+	// For important details about how pagination works,
+	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
 	Page *string `mandatory:"false" contributesTo:"query" name:"page"`
 
 	// For list pagination. The maximum number of results per page, or items to return in a
@@ -93,6 +94,11 @@ type ListSuppressionsResponse struct {
 	// pages of results remain. For important details about how pagination works,
 	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
 	OpcNextPage *string `presentIn:"header" name:"opc-next-page"`
+
+	// For list pagination. When this header appears in the response, previous pages
+	// of results exist. For important details about how pagination works,
+	// see List Pagination (https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
+	OpcPrevPage *string `presentIn:"header" name:"opc-prev-page"`
 }
 
 func (response ListSuppressionsResponse) String() string {

email/list_suppressions_request_response.go

@@ -25,6 +25,10 @@ type DecryptDataDetails struct {
 	// encrypted data. The length of the string representation of the associatedData
 	// must be fewer than 4096 characters.
 	AssociatedData map[string]string `mandatory:"false" json:"associatedData"`
+
+	// Information that can be used to provide context for audit logging. It is a map that contains any addtional
+	// data the users may have and will be added to the audit logs (if audit logging is enabled)
+	LoggingContext map[string]string `mandatory:"false" json:"loggingContext"`
 }
 
 func (m DecryptDataDetails) String() string {

keymanagement/decrypt_data_details.go

@@ -25,6 +25,10 @@ type EncryptDataDetails struct {
 	// encrypted data. The length of the string representation of the associatedData
 	// must be fewer than 4096 characters.
 	AssociatedData map[string]string `mandatory:"false" json:"associatedData"`
+
+	// Information that can be used to provide context for audit logging. It is a map that contains any addtional
+	// data the users may have and will be added to the audit logs (if audit logging is enabled)
+	LoggingContext map[string]string `mandatory:"false" json:"loggingContext"`
 }
 
 func (m EncryptDataDetails) String() string {

keymanagement/encrypt_data_details.go

@@ -27,6 +27,10 @@ type GenerateKeyDetails struct {
 	// encrypted data. The length of the string representation of the associatedData
 	// must be fewer than 4096 characters.
 	AssociatedData map[string]string `mandatory:"false" json:"associatedData"`
+
+	// Information that can be used to provide context for audit logging. It is a map that contains any addtional
+	// data the users may have and will be added to the audit logs (if audit logging is enabled)
+	LoggingContext map[string]string `mandatory:"false" json:"loggingContext"`
 }
 
 func (m GenerateKeyDetails) String() string {

keymanagement/generate_key_details.go

@@ -30,7 +30,7 @@ func NewKmsCryptoClientWithConfigurationProvider(configProvider common.Configura
 	}
 
 	client = KmsCryptoClient{BaseClient: baseClient}
-	client.BasePath = ""
+	client.BasePath = "20180608"
 	client.Host = endpoint
 	err = client.setConfigurationProvider(configProvider)
 	return
@@ -75,7 +75,7 @@ func (client KmsCryptoClient) Decrypt(ctx context.Context, request DecryptReques
 
 // decrypt implements the OCIOperation interface (enables retrying operations)
 func (client KmsCryptoClient) decrypt(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/decrypt")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/decrypt")
 	if err != nil {
 		return nil, err
 	}
@@ -119,7 +119,7 @@ func (client KmsCryptoClient) Encrypt(ctx context.Context, request EncryptReques
 
 // encrypt implements the OCIOperation interface (enables retrying operations)
 func (client KmsCryptoClient) encrypt(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/encrypt")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/encrypt")
 	if err != nil {
 		return nil, err
 	}
@@ -161,7 +161,7 @@ func (client KmsCryptoClient) GenerateDataEncryptionKey(ctx context.Context, req
 
 // generateDataEncryptionKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsCryptoClient) generateDataEncryptionKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/generateDataEncryptionKey")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/generateDataEncryptionKey")
 	if err != nil {
 		return nil, err
 	}

keymanagement/keymanagement_kmscrypto_client.go

@@ -30,7 +30,7 @@ func NewKmsManagementClientWithConfigurationProvider(configProvider common.Confi
 	}
 
 	client = KmsManagementClient{BaseClient: baseClient}
-	client.BasePath = ""
+	client.BasePath = "20180608"
 	client.Host = endpoint
 	err = client.setConfigurationProvider(configProvider)
 	return
@@ -80,7 +80,7 @@ func (client KmsManagementClient) CreateKey(ctx context.Context, request CreateK
 
 // createKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) createKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/keys")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/keys")
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +128,7 @@ func (client KmsManagementClient) CreateKeyVersion(ctx context.Context, request
 
 // createKeyVersion implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) createKeyVersion(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/keys/{keyId}/keyVersions")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/keys/{keyId}/keyVersions")
 	if err != nil {
 		return nil, err
 	}
@@ -176,7 +176,7 @@ func (client KmsManagementClient) DisableKey(ctx context.Context, request Disabl
 
 // disableKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) disableKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/keys/{keyId}/actions/disable")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/keys/{keyId}/actions/disable")
 	if err != nil {
 		return nil, err
 	}
@@ -224,7 +224,7 @@ func (client KmsManagementClient) EnableKey(ctx context.Context, request EnableK
 
 // enableKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) enableKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/keys/{keyId}/actions/enable")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/keys/{keyId}/actions/enable")
 	if err != nil {
 		return nil, err
 	}
@@ -266,7 +266,7 @@ func (client KmsManagementClient) GetKey(ctx context.Context, request GetKeyRequ
 
 // getKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) getKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/keys/{keyId}")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/keys/{keyId}")
 	if err != nil {
 		return nil, err
 	}
@@ -308,7 +308,7 @@ func (client KmsManagementClient) GetKeyVersion(ctx context.Context, request Get
 
 // getKeyVersion implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) getKeyVersion(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/keys/{keyId}/keyVersions/{keyVersionId}")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/keys/{keyId}/keyVersions/{keyVersionId}")
 	if err != nil {
 		return nil, err
 	}
@@ -350,7 +350,7 @@ func (client KmsManagementClient) ListKeyVersions(ctx context.Context, request L
 
 // listKeyVersions implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) listKeyVersions(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/keys/{keyId}/keyVersions")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/keys/{keyId}/keyVersions")
 	if err != nil {
 		return nil, err
 	}
@@ -392,7 +392,7 @@ func (client KmsManagementClient) ListKeys(ctx context.Context, request ListKeys
 
 // listKeys implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) listKeys(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/keys")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/keys")
 	if err != nil {
 		return nil, err
 	}
@@ -436,7 +436,7 @@ func (client KmsManagementClient) UpdateKey(ctx context.Context, request UpdateK
 
 // updateKey implements the OCIOperation interface (enables retrying operations)
 func (client KmsManagementClient) updateKey(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPut, "/20180608/keys/{keyId}")
+	httpRequest, err := request.HTTPRequest(http.MethodPut, "/keys/{keyId}")
 	if err != nil {
 		return nil, err
 	}

keymanagement/keymanagement_kmsmanagement_client.go

@@ -30,7 +30,7 @@ func NewKmsVaultClientWithConfigurationProvider(configProvider common.Configurat
 	}
 
 	client = KmsVaultClient{BaseClient: baseClient}
-	client.BasePath = ""
+	client.BasePath = "20180608"
 	err = client.setConfigurationProvider(configProvider)
 	return
 }
@@ -89,7 +89,7 @@ func (client KmsVaultClient) CancelVaultDeletion(ctx context.Context, request Ca
 
 // cancelVaultDeletion implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) cancelVaultDeletion(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/vaults/{vaultId}/actions/cancelDeletion")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/vaults/{vaultId}/actions/cancelDeletion")
 	if err != nil {
 		return nil, err
 	}
@@ -139,7 +139,7 @@ func (client KmsVaultClient) CreateVault(ctx context.Context, request CreateVaul
 
 // createVault implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) createVault(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/vaults")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/vaults")
 	if err != nil {
 		return nil, err
 	}
@@ -181,7 +181,7 @@ func (client KmsVaultClient) GetVault(ctx context.Context, request GetVaultReque
 
 // getVault implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) getVault(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/vaults/{vaultId}")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/vaults/{vaultId}")
 	if err != nil {
 		return nil, err
 	}
@@ -223,7 +223,7 @@ func (client KmsVaultClient) ListVaults(ctx context.Context, request ListVaultsR
 
 // listVaults implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) listVaults(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodGet, "/20180608/vaults")
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/vaults")
 	if err != nil {
 		return nil, err
 	}
@@ -271,7 +271,7 @@ func (client KmsVaultClient) ScheduleVaultDeletion(ctx context.Context, request
 
 // scheduleVaultDeletion implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) scheduleVaultDeletion(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPost, "/20180608/vaults/{vaultId}/actions/scheduleDeletion")
+	httpRequest, err := request.HTTPRequest(http.MethodPost, "/vaults/{vaultId}/actions/scheduleDeletion")
 	if err != nil {
 		return nil, err
 	}
@@ -315,7 +315,7 @@ func (client KmsVaultClient) UpdateVault(ctx context.Context, request UpdateVaul
 
 // updateVault implements the OCIOperation interface (enables retrying operations)
 func (client KmsVaultClient) updateVault(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
-	httpRequest, err := request.HTTPRequest(http.MethodPut, "/20180608/vaults/{vaultId}")
+	httpRequest, err := request.HTTPRequest(http.MethodPut, "/vaults/{vaultId}")
 	if err != nil {
 		return nil, err
 	}

keymanagement/keymanagement_kmsvault_client.go

@@ -37,7 +37,7 @@ func NewResourceSearchClientWithConfigurationProvider(configProvider common.Conf
 
 // SetRegion overrides the region of this client.
 func (client *ResourceSearchClient) SetRegion(region string) {
-	client.Host = common.StringToRegion(region).Endpoint("query")
+	client.Host = common.StringToRegion(region).EndpointForTemplate("query", "https://query.{region}.{secondLevelDomain}")
 }
 
 // SetConfigurationProvider sets the configuration provider including the region, returns an error if is not valid