Releasing version V1.3.0 (#107)

Author: jasonyin

.gitignore

@@ -10,3 +10,4 @@
 .vscode/*
 target/
 bin/
+temp/

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+
+## 1.3.0 - 2018-04-19
+### Added
+- Support for retry on OCI service APIs. Example can be found on [Github](https://github.com/oracle/oci-go-sdk/tree/master/example/example_retry_test.go)
+- Support for tagging DbSystem and Database resources in the Database Service
+- Support for filtering by DbSystemId in ListDbVersions operation in Database Service
+
+### Fixed
+- Fixed a request signing bug for PatchZoneRecords API
+- Fixed a bug in DebugLn
+
 ## 1.2.0 - 2018-04-05
 ### Added
 - Support for Email Delivery Service. Example can be found on [Github](https://github.com/oracle/oci-go-sdk/tree/master/example/example_email_test.go)

audit/audit_client.go

@@ -60,54 +60,117 @@ func (client *AuditClient) ConfigurationProvider() *common.ConfigurationProvider
 
 // GetConfiguration Get the configuration
 func (client AuditClient) GetConfiguration(ctx context.Context, request GetConfigurationRequest) (response GetConfigurationResponse, err error) {
-	httpRequest, err := common.MakeDefaultHTTPRequestWithTaggedStruct(http.MethodGet, "/configuration", request)
+	var ociResponse common.OCIResponse
+	policy := common.NoRetryPolicy()
+	if request.RetryPolicy() != nil {
+		policy = *request.RetryPolicy()
+	}
+	ociResponse, err = common.Retry(ctx, request, client.getConfiguration, policy)
 	if err != nil {
 		return
 	}
+	if convertedResponse, ok := ociResponse.(GetConfigurationResponse); ok {
+		response = convertedResponse
+	} else {
+		err = fmt.Errorf("failed to convert OCIResponse into GetConfigurationResponse")
+	}
+	return
+}
+
+// getConfiguration implements the OCIOperation interface (enables retrying operations)
+func (client AuditClient) getConfiguration(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/configuration")
+	if err != nil {
+		return nil, err
+	}
 
-	httpResponse, err := client.Call(ctx, &httpRequest)
+	var response GetConfigurationResponse
+	var httpResponse *http.Response
+	httpResponse, err = client.Call(ctx, &httpRequest)
 	defer common.CloseBodyIfValid(httpResponse)
 	response.RawResponse = httpResponse
 	if err != nil {
-		return
+		return response, err
 	}
 
 	err = common.UnmarshalResponse(httpResponse, &response)
-	return
+	return response, err
 }
 
 // ListEvents Returns all audit events for the specified compartment that were processed within the specified time range.
 func (client AuditClient) ListEvents(ctx context.Context, request ListEventsRequest) (response ListEventsResponse, err error) {
-	httpRequest, err := common.MakeDefaultHTTPRequestWithTaggedStruct(http.MethodGet, "/auditEvents", request)
+	var ociResponse common.OCIResponse
+	policy := common.NoRetryPolicy()
+	if request.RetryPolicy() != nil {
+		policy = *request.RetryPolicy()
+	}
+	ociResponse, err = common.Retry(ctx, request, client.listEvents, policy)
 	if err != nil {
 		return
 	}
+	if convertedResponse, ok := ociResponse.(ListEventsResponse); ok {
+		response = convertedResponse
+	} else {
+		err = fmt.Errorf("failed to convert OCIResponse into ListEventsResponse")
+	}
+	return
+}
 
-	httpResponse, err := client.Call(ctx, &httpRequest)
+// listEvents implements the OCIOperation interface (enables retrying operations)
+func (client AuditClient) listEvents(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
+	httpRequest, err := request.HTTPRequest(http.MethodGet, "/auditEvents")
+	if err != nil {
+		return nil, err
+	}
+
+	var response ListEventsResponse
+	var httpResponse *http.Response
+	httpResponse, err = client.Call(ctx, &httpRequest)
 	defer common.CloseBodyIfValid(httpResponse)
 	response.RawResponse = httpResponse
 	if err != nil {
-		return
+		return response, err
 	}
 
 	err = common.UnmarshalResponse(httpResponse, &response)
-	return
+	return response, err
 }
 
 // UpdateConfiguration Update the configuration
 func (client AuditClient) UpdateConfiguration(ctx context.Context, request UpdateConfigurationRequest) (response UpdateConfigurationResponse, err error) {
-	httpRequest, err := common.MakeDefaultHTTPRequestWithTaggedStruct(http.MethodPut, "/configuration", request)
+	var ociResponse common.OCIResponse
+	policy := common.NoRetryPolicy()
+	if request.RetryPolicy() != nil {
+		policy = *request.RetryPolicy()
+	}
+	ociResponse, err = common.Retry(ctx, request, client.updateConfiguration, policy)
 	if err != nil {
 		return
 	}
+	if convertedResponse, ok := ociResponse.(UpdateConfigurationResponse); ok {
+		response = convertedResponse
+	} else {
+		err = fmt.Errorf("failed to convert OCIResponse into UpdateConfigurationResponse")
+	}
+	return
+}
+
+// updateConfiguration implements the OCIOperation interface (enables retrying operations)
+func (client AuditClient) updateConfiguration(ctx context.Context, request common.OCIRequest) (common.OCIResponse, error) {
+	httpRequest, err := request.HTTPRequest(http.MethodPut, "/configuration")
+	if err != nil {
+		return nil, err
+	}
 
-	httpResponse, err := client.Call(ctx, &httpRequest)
+	var response UpdateConfigurationResponse
+	var httpResponse *http.Response
+	httpResponse, err = client.Call(ctx, &httpRequest)
 	defer common.CloseBodyIfValid(httpResponse)
 	response.RawResponse = httpResponse
 	if err != nil {
-		return
+		return response, err
 	}
 
 	err = common.UnmarshalResponse(httpResponse, &response)
-	return
+	return response, err
 }

audit/get_configuration_request_response.go

@@ -13,12 +13,26 @@ type GetConfigurationRequest struct {
 
 	// ID of the root compartment (tenancy)
 	CompartmentId *string `mandatory:"true" contributesTo:"query" name:"compartmentId"`
+
+	// Metadata about the request. This information will not be transmitted to the service, but
+	// represents information that the SDK will consume to drive retry behavior.
+	RequestMetadata common.RequestMetadata
 }
 
 func (request GetConfigurationRequest) String() string {
 	return common.PointerString(request)
 }
 
+// HTTPRequest implements the OCIRequest interface
+func (request GetConfigurationRequest) HTTPRequest(method, path string) (http.Request, error) {
+	return common.MakeDefaultHTTPRequestWithTaggedStruct(method, path, request)
+}
+
+// RetryPolicy implements the OCIRetryableRequest interface. This retrieves the specified retry policy.
+func (request GetConfigurationRequest) RetryPolicy() *common.RetryPolicy {
+	return request.RequestMetadata.RetryPolicy
+}
+
 // GetConfigurationResponse wrapper for the GetConfiguration operation
 type GetConfigurationResponse struct {
 
@@ -32,3 +46,8 @@ type GetConfigurationResponse struct {
 func (response GetConfigurationResponse) String() string {
 	return common.PointerString(response)
 }
+
+// HTTPResponse implements the OCIResponse interface
+func (response GetConfigurationResponse) HTTPResponse() *http.Response {
+	return response.RawResponse
+}

audit/list_events_request_response.go

@@ -30,12 +30,26 @@ type ListEventsRequest struct {
 	// Unique Oracle-assigned identifier for the request.
 	// If you need to contact Oracle about a particular request, please provide the request ID.
 	OpcRequestId *string `mandatory:"false" contributesTo:"header" name:"opc-request-id"`
+
+	// Metadata about the request. This information will not be transmitted to the service, but
+	// represents information that the SDK will consume to drive retry behavior.
+	RequestMetadata common.RequestMetadata
 }
 
 func (request ListEventsRequest) String() string {
 	return common.PointerString(request)
 }
 
+// HTTPRequest implements the OCIRequest interface
+func (request ListEventsRequest) HTTPRequest(method, path string) (http.Request, error) {
+	return common.MakeDefaultHTTPRequestWithTaggedStruct(method, path, request)
+}
+
+// RetryPolicy implements the OCIRetryableRequest interface. This retrieves the specified retry policy.
+func (request ListEventsRequest) RetryPolicy() *common.RetryPolicy {
+	return request.RequestMetadata.RetryPolicy
+}
+
 // ListEventsResponse wrapper for the ListEvents operation
 type ListEventsResponse struct {
 
@@ -58,3 +72,8 @@ type ListEventsResponse struct {
 func (response ListEventsResponse) String() string {
 	return common.PointerString(response)
 }
+
+// HTTPResponse implements the OCIResponse interface
+func (response ListEventsResponse) HTTPResponse() *http.Response {
+	return response.RawResponse
+}

audit/update_configuration_request_response.go

@@ -16,12 +16,26 @@ type UpdateConfigurationRequest struct {
 
 	// The configuration properties
 	UpdateConfigurationDetails `contributesTo:"body"`
+
+	// Metadata about the request. This information will not be transmitted to the service, but
+	// represents information that the SDK will consume to drive retry behavior.
+	RequestMetadata common.RequestMetadata
 }
 
 func (request UpdateConfigurationRequest) String() string {
 	return common.PointerString(request)
 }
 
+// HTTPRequest implements the OCIRequest interface
+func (request UpdateConfigurationRequest) HTTPRequest(method, path string) (http.Request, error) {
+	return common.MakeDefaultHTTPRequestWithTaggedStruct(method, path, request)
+}
+
+// RetryPolicy implements the OCIRetryableRequest interface. This retrieves the specified retry policy.
+func (request UpdateConfigurationRequest) RetryPolicy() *common.RetryPolicy {
+	return request.RequestMetadata.RetryPolicy
+}
+
 // UpdateConfigurationResponse wrapper for the UpdateConfiguration operation
 type UpdateConfigurationResponse struct {
 
@@ -39,3 +53,8 @@ type UpdateConfigurationResponse struct {
 func (response UpdateConfigurationResponse) String() string {
 	return common.PointerString(response)
 }
+
+// HTTPResponse implements the OCIResponse interface
+func (response UpdateConfigurationResponse) HTTPResponse() *http.Response {
+	return response.RawResponse
+}

cmd/genver/main.go

@@ -42,7 +42,7 @@ func main() {
 		Tag                 string
 	}{
 		getEnvOrDefault(majorVer, "0"),
-		getEnvOrDefault(minorVer, "0" ),
+		getEnvOrDefault(minorVer, "0"),
 		getEnvOrDefault(patchVer, "0"),
 		getEnvOrDefault(tag, ""),
 	}

cmd/genver/version_template.go

@@ -95,7 +95,6 @@ func (p *instancePrincipalKeyProvider) KeyID() (string, error) {
 	return fmt.Sprintf("ST$%s", securityToken), nil
 }
 
-
 func (p *instancePrincipalKeyProvider) TenancyOCID() (string, error) {
 	return p.tenancyID, nil
-}
+}