Merge pull request #29 in SDK/oci-go-sdk from merge_to_github2018-04-05-04-46-59 to github (#104)

Release V1.2.0

Author: jasonyin

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## 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)
+- Support for paravirtualized volume attachments in Core Services
+- Support for remote VCN peering across regions
+- Support for variable size boot volumes in Core Services
+- Support for SMTP credentials in the Identity Service
+- Support for tagging Bucket resources in the Object Storage Service
 
 ## 1.1.0 - 2018-03-27
 ### Added
@@ -23,4 +31,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 - Support for Database service
 - Support for IAM service
 - Support for Load Balancing service
-- Suport for Object Storage service
+- Support for Object Storage service

Makefile

@@ -1,6 +1,6 @@
 DOC_SERVER_URL=https:\/\/docs.us-phoenix-1.oraclecloud.com
 
-GEN_TARGETS = identity core objectstorage loadbalancer database audit dns filestorage
+GEN_TARGETS = identity core objectstorage loadbalancer database audit dns filestorage email
 NON_GEN_TARGETS = common common/auth
 TARGETS = $(NON_GEN_TARGETS) $(GEN_TARGETS)
 

common/auth/configuration.go

@@ -42,7 +42,7 @@ func (p instancePrincipalConfigurationProvider) KeyID() (string, error) {
 }
 
 func (p instancePrincipalConfigurationProvider) TenancyOCID() (string, error) {
-	return "", nil
+	return p.keyProvider.TenancyOCID()
 }
 
 func (p instancePrincipalConfigurationProvider) UserOCID() (string, error) {

common/auth/instance_principal_key_provider.go

@@ -27,6 +27,7 @@ const (
 type instancePrincipalKeyProvider struct {
 	regionForFederationClient common.Region
 	federationClient          federationClient
+	tenancyID                 string
 }
 
 // newInstancePrincipalKeyProvider creates and returns an instancePrincipalKeyProvider instance based on
@@ -61,7 +62,7 @@ func newInstancePrincipalKeyProvider() (provider *instancePrincipalKeyProvider,
 	federationClient := newX509FederationClient(
 		region, tenancyID, leafCertificateRetriever, intermediateCertificateRetrievers)
 
-	provider = &instancePrincipalKeyProvider{regionForFederationClient: region, federationClient: federationClient}
+	provider = &instancePrincipalKeyProvider{regionForFederationClient: region, federationClient: federationClient, tenancyID: tenancyID}
 	return
 }
 
@@ -93,3 +94,8 @@ func (p *instancePrincipalKeyProvider) KeyID() (string, error) {
 	}
 	return fmt.Sprintf("ST$%s", securityToken), nil
 }
+
+
+func (p *instancePrincipalKeyProvider) TenancyOCID() (string, error) {
+	return p.tenancyID, nil
+}

common/http.go

@@ -269,11 +269,34 @@ func addToQuery(request *http.Request, value reflect.Value, field reflect.Struct
 
 	//if not mandatory and nil. Omit
 	if !mandatory && isNil(value) {
-		Debugf("Query parameter value is not mandatory and is nil pointer in field: %s. Skipping header", field.Name)
+		Debugf("Query parameter value is not mandatory and is nil pointer in field: %s. Skipping query", field.Name)
 		return
 	}
 
-	if queryParameterValue, e = toStringValue(value, field); e != nil {
+	encoding := strings.ToLower(field.Tag.Get("collectionFormat"))
+	switch encoding {
+	case "csv":
+		if value.Kind() != reflect.Slice && value.Kind() != reflect.Array {
+			e = fmt.Errorf("query paramater is tagged as csv yet its type is neither an Array nor a Slice: %s", field.Name)
+			break
+		}
+
+		numOfElements := value.Len()
+		stringValues := make([]string, numOfElements)
+		for i := 0; i < numOfElements; i++ {
+			stringValues[i], e = toStringValue(value.Index(i), field)
+			if e != nil {
+				break
+			}
+		}
+		queryParameterValue = strings.Join(stringValues, ",")
+	case "":
+		queryParameterValue, e = toStringValue(value, field)
+	default:
+		e = fmt.Errorf("encoding of type %s is not supported for query param: %s", encoding, field.Name)
+	}
+
+	if e != nil {
 		return
 	}
 

common/http_test.go

@@ -28,9 +28,10 @@ type TestupdateUserDetails struct {
 }
 
 type listCompartmentsRequest struct {
-	CompartmentID string `mandatory:"true" contributesTo:"query" name:"compartmentId"`
-	Page          string `mandatory:"false" contributesTo:"query" name:"page"`
-	Limit         int32  `mandatory:"false" contributesTo:"query" name:"limit"`
+	CompartmentID string   `mandatory:"true" contributesTo:"query" name:"compartmentId"`
+	Page          string   `mandatory:"false" contributesTo:"query" name:"page"`
+	Limit         int32    `mandatory:"false" contributesTo:"query" name:"limit"`
+	Fields        []string `mandatory:"true" contributesTo:"query" name:"fields" collectionFormat:"csv"`
 }
 
 type updateUserRequest struct {
@@ -69,13 +70,15 @@ func TestHttpMarshallerInvalidStruct(t *testing.T) {
 }
 
 func TestHttpRequestMarshallerQuery(t *testing.T) {
-	s := listCompartmentsRequest{CompartmentID: "ocid1", Page: "p", Limit: 23}
+	s := listCompartmentsRequest{CompartmentID: "ocid1", Page: "p", Limit: 23, Fields: []string{"one", "two", "three"}}
 	request := MakeDefaultHTTPRequest(http.MethodPost, "/")
-	HTTPRequestMarshaller(s, &request)
+	e := HTTPRequestMarshaller(s, &request)
 	query := request.URL.Query()
+	assert.NoError(t, e)
 	assert.True(t, query.Get("compartmentId") == "ocid1")
 	assert.True(t, query.Get("page") == "p")
 	assert.True(t, query.Get("limit") == "23")
+	assert.True(t, query.Get("fields") == "one,two,three")
 }
 
 func TestMakeDefault(t *testing.T) {
@@ -169,15 +172,19 @@ func TestHttpMarshallerEmptyPath(t *testing.T) {
 
 func TestHttpMarshalerAll(t *testing.T) {
 	desc := "theDescription"
+	type inc string
+	includes := []inc{inc("One"), inc("Two")}
+
 	s := struct {
 		ID      string                `contributesTo:"path"`
 		Name    string                `contributesTo:"query" name:"name"`
 		When    *SDKTime              `contributesTo:"query" name:"when"`
 		Income  float32               `contributesTo:"query" name:"income"`
+		Include []inc                 `contributesTo:"query" name:"includes" collectionFormat:"csv"`
 		Male    bool                  `contributesTo:"header" name:"male"`
 		Details TestupdateUserDetails `contributesTo:"body"`
 	}{
-		"101", "tapir", now(), 3.23, true, TestupdateUserDetails{Description: desc},
+		"101", "tapir", now(), 3.23, includes, true, TestupdateUserDetails{Description: desc},
 	}
 	request := MakeDefaultHTTPRequest(http.MethodPost, "/")
 	e := HTTPRequestMarshaller(s, &request)
@@ -190,6 +197,7 @@ func TestHttpMarshalerAll(t *testing.T) {
 	assert.True(t, request.URL.Query().Get("name") == s.Name)
 	assert.True(t, request.URL.Query().Get("income") == strconv.FormatFloat(float64(s.Income), 'f', 6, 32))
 	assert.True(t, request.URL.Query().Get("when") == when)
+	assert.True(t, request.URL.Query().Get("includes") == "One,Two")
 	assert.Contains(t, content, "description")
 	assert.Equal(t, request.Header.Get("Content-Type"), "application/json")
 	if val, ok := content["description"]; !ok || val != desc {
@@ -678,6 +686,34 @@ func TestEmptyQueryParam(t *testing.T) {
 	assert.NotContains(t, r.URL.RawQuery, "meta")
 }
 
+type responseWithWrongCsvType struct {
+	Meta    string            `contributesTo:"query" omitEmpty:"true" name:"meta"`
+	QParam  string            `contributesTo:"query" omitEmpty:"false" name:"qp"`
+	QParam2 string            `contributesTo:"query" name:"qp2"`
+	QParam3 map[string]string `contributesTo:"query" name:"qp2" collectionFormat:"csv"`
+}
+
+func TestWrongTypeQueryParamEncodingWrongType(t *testing.T) {
+	m := make(map[string]string)
+	m["one"] = "one"
+	s := responseWithWrongCsvType{QParam3: m}
+	_, err := MakeDefaultHTTPRequestWithTaggedStruct("GET", "/", s)
+	assert.Error(t, err)
+}
+
+type responseUnsupportedQueryEncoding struct {
+	Meta    string   `contributesTo:"query" omitEmpty:"true" name:"meta"`
+	QParam  string   `contributesTo:"query" omitEmpty:"false" name:"qp"`
+	QParam2 string   `contributesTo:"query" name:"qp2"`
+	QParam3 []string `contributesTo:"query" name:"qp2" collectionFormat:"xml"`
+}
+
+func TestWrongTypeQueryParamWrongEncoding(t *testing.T) {
+	s := responseUnsupportedQueryEncoding{QParam3: []string{"one ", "two"}}
+	_, err := MakeDefaultHTTPRequestWithTaggedStruct("GET", "/", s)
+	assert.Error(t, err)
+}
+
 func TestOmitFieldsInJson_SimpleStruct(t *testing.T) {
 	type Nested struct {
 		N   *string `mandatory:"false" json:"n"`

common/version.go

@@ -0,0 +1,68 @@
+// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+// Code generated. DO NOT EDIT.
+
+// Core Services API
+//
+// APIs for Networking Service, Compute Service, and Block Volume Service.
+//
+
+package core
+
+import (
+	"encoding/json"
+	"github.com/oracle/oci-go-sdk/common"
+)
+
+// AttachParavirtualizedVolumeDetails The representation of AttachParavirtualizedVolumeDetails
+type AttachParavirtualizedVolumeDetails struct {
+
+	// The OCID of the instance.
+	InstanceId *string `mandatory:"true" json:"instanceId"`
+
+	// The OCID of the volume.
+	VolumeId *string `mandatory:"true" json:"volumeId"`
+
+	// A user-friendly name. Does not have to be unique, and it cannot be changed. Avoid entering confidential information.
+	DisplayName *string `mandatory:"false" json:"displayName"`
+
+	// Whether the attachment was created in read-only mode.
+	IsReadOnly *bool `mandatory:"false" json:"isReadOnly"`
+}
+
+//GetDisplayName returns DisplayName
+func (m AttachParavirtualizedVolumeDetails) GetDisplayName() *string {
+	return m.DisplayName
+}
+
+//GetInstanceId returns InstanceId
+func (m AttachParavirtualizedVolumeDetails) GetInstanceId() *string {
+	return m.InstanceId
+}
+
+//GetIsReadOnly returns IsReadOnly
+func (m AttachParavirtualizedVolumeDetails) GetIsReadOnly() *bool {
+	return m.IsReadOnly
+}
+
+//GetVolumeId returns VolumeId
+func (m AttachParavirtualizedVolumeDetails) GetVolumeId() *string {
+	return m.VolumeId
+}
+
+func (m AttachParavirtualizedVolumeDetails) String() string {
+	return common.PointerString(m)
+}
+
+// MarshalJSON marshals to json representation
+func (m AttachParavirtualizedVolumeDetails) MarshalJSON() (buff []byte, e error) {
+	type MarshalTypeAttachParavirtualizedVolumeDetails AttachParavirtualizedVolumeDetails
+	s := struct {
+		DiscriminatorParam string `json:"type"`
+		MarshalTypeAttachParavirtualizedVolumeDetails
+	}{
+		"paravirtualized",
+		(MarshalTypeAttachParavirtualizedVolumeDetails)(m),
+	}
+
+	return json.Marshal(&s)
+}

core/attach_paravirtualized_volume_details.go

@@ -66,6 +66,10 @@ func (m *attachvolumedetails) UnmarshalPolymorphicJSON(data []byte) (interface{}
 		mm := AttachIScsiVolumeDetails{}
 		err = json.Unmarshal(data, &mm)
 		return mm, err
+	case "paravirtualized":
+		mm := AttachParavirtualizedVolumeDetails{}
+		err = json.Unmarshal(data, &mm)
+		return mm, err
 	default:
 		return m, nil
 	}

core/attach_volume_details.go

@@ -0,0 +1,28 @@
+// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+// Code generated. DO NOT EDIT.
+
+// Core Services API
+//
+// APIs for Networking Service, Compute Service, and Block Volume Service.
+//
+
+package core
+
+import (
+	"github.com/oracle/oci-go-sdk/common"
+)
+
+// ConnectRemotePeeringConnectionsDetails Information about the other remote peering connection (RPC).
+type ConnectRemotePeeringConnectionsDetails struct {
+
+	// The OCID of the RPC you want to peer with.
+	PeerId *string `mandatory:"true" json:"peerId"`
+
+	// The name of the region that contains the RPC you want to peer with.
+	// Example: `us-ashburn-1`
+	PeerRegionName *string `mandatory:"true" json:"peerRegionName"`
+}
+
+func (m ConnectRemotePeeringConnectionsDetails) String() string {
+	return common.PointerString(m)
+}