Release v2.2.0

Squashed commit of the following:

commit 840f35432a5d72bda5c45469a2b03bb8dc782b9b
Author: Jason Yin <[email protected]>
Date:   Wed Aug 8 22:13:25 2018 +0000

    Releasing v2.2.0

Author: jasonyin

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## 2.2.0 - 2018-07-26
+### Added
+- Support for fault domains in the Compute service
+- A sample showing how to use Search service from the SDK is available on [Github](https://github.com/oracle/oci-go-sdk/tree/master/example/example_resourcesearch_test.go)
+
 ## 2.1.0 - 2018-07-26
 ### Added
 - Support for the OCI Search service

common/http.go

@@ -10,7 +10,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"path"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -366,8 +365,7 @@ func addToPath(request *http.Request, value reflect.Value, field reflect.StructF
 	if !templatedPathRegex.MatchString(currentURLPath) {
 		Debugln("Marshaling request to path by appending field:", field.Name)
 		allPath := []string{currentURLPath, additionalURLPathPart}
-		newPath := strings.Join(allPath, "/")
-		request.URL.Path = path.Clean(newPath)
+		request.URL.Path = strings.Join(allPath, "/")
 	} else {
 		var fieldName string
 		if fieldName = field.Tag.Get("name"); fieldName == "" {
@@ -376,7 +374,7 @@ func addToPath(request *http.Request, value reflect.Value, field reflect.StructF
 		}
 		urlTemplate := currentURLPath
 		Debugln("Marshaling to path from field:", field.Name, "in template:", urlTemplate)
-		request.URL.Path = path.Clean(strings.Replace(urlTemplate, "{"+fieldName+"}", additionalURLPathPart, -1))
+		request.URL.Path = strings.Replace(urlTemplate, "{"+fieldName+"}", additionalURLPathPart, -1)
 	}
 	return
 }

common/http_test.go

@@ -207,7 +207,7 @@ func TestHttpMarshalerAll(t *testing.T) {
 	body, _ := ioutil.ReadAll(request.Body)
 	json.Unmarshal(body, &content)
 	when := s.When.Format(time.RFC3339)
-	assert.True(t, request.URL.Path == "/101")
+	assert.True(t, request.URL.Path == "//101")
 	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)

common/version.go

@@ -27,6 +27,10 @@ type CreateBootVolumeDetails struct {
 	// This is a mandatory field for a boot volume.
 	SourceDetails BootVolumeSourceDetails `mandatory:"true" json:"sourceDetails"`
 
+	// If provided, specifies the ID of the boot volume backup policy to assign to the newly
+	// created boot volume. If omitted, no policy will be assigned.
+	BackupPolicyId *string `mandatory:"false" json:"backupPolicyId"`
+
 	// Defined tags for this resource. Each key is predefined and scoped to a namespace.
 	// For more information, see Resource Tags (https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
 	// Example: `{"Operations": {"CostCenter": "42"}}`
@@ -53,6 +57,7 @@ func (m CreateBootVolumeDetails) String() string {
 // UnmarshalJSON unmarshals from json
 func (m *CreateBootVolumeDetails) UnmarshalJSON(data []byte) (e error) {
 	model := struct {
+		BackupPolicyId     *string                           `json:"backupPolicyId"`
 		DefinedTags        map[string]map[string]interface{} `json:"definedTags"`
 		DisplayName        *string                           `json:"displayName"`
 		FreeformTags       map[string]string                 `json:"freeformTags"`
@@ -66,6 +71,7 @@ func (m *CreateBootVolumeDetails) UnmarshalJSON(data []byte) (e error) {
 	if e != nil {
 		return
 	}
+	m.BackupPolicyId = model.BackupPolicyId
 	m.DefinedTags = model.DefinedTags
 	m.DisplayName = model.DisplayName
 	m.FreeformTags = model.FreeformTags

core/create_boot_volume_details.go

@@ -62,6 +62,13 @@ type Instance struct {
 	// They are distinguished from 'metadata' fields in that these can be nested JSON objects (whereas 'metadata' fields are string/string maps only).
 	ExtendedMetadata map[string]interface{} `mandatory:"false" json:"extendedMetadata"`
 
+	// The name of the Fault Domain the instance is running in.
+	// A Fault Domain is a logical grouping of hardware and infrastructure within an Availability Domain that can become
+	// unavailable in its entirety either due to hardware failure such as Top-of-rack (TOR) switch failure or due to
+	// planned software maintenance such as security updates that reboot your instances.
+	// Example: `FAULT-DOMAIN-1`
+	FaultDomain *string `mandatory:"false" json:"faultDomain"`
+
 	// 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
@@ -116,6 +123,7 @@ func (m *Instance) UnmarshalJSON(data []byte) (e error) {
 		DefinedTags        map[string]map[string]interface{} `json:"definedTags"`
 		DisplayName        *string                           `json:"displayName"`
 		ExtendedMetadata   map[string]interface{}            `json:"extendedMetadata"`
+		FaultDomain        *string                           `json:"faultDomain"`
 		FreeformTags       map[string]string                 `json:"freeformTags"`
 		ImageId            *string                           `json:"imageId"`
 		IpxeScript         *string                           `json:"ipxeScript"`
@@ -139,6 +147,7 @@ func (m *Instance) UnmarshalJSON(data []byte) (e error) {
 	m.DefinedTags = model.DefinedTags
 	m.DisplayName = model.DisplayName
 	m.ExtendedMetadata = model.ExtendedMetadata
+	m.FaultDomain = model.FaultDomain
 	m.FreeformTags = model.FreeformTags
 	m.ImageId = model.ImageId
 	m.IpxeScript = model.IpxeScript

core/instance.go

@@ -47,6 +47,12 @@ type LaunchInstanceDetails struct {
 	// They are distinguished from 'metadata' fields in that these can be nested JSON objects (whereas 'metadata' fields are string/string maps only).
 	ExtendedMetadata map[string]interface{} `mandatory:"false" json:"extendedMetadata"`
 
+	// The name of the Fault Domain in which to launch an instance.
+	// To get a list of Fault Domains, use the ListFaultDomains
+	// operation in the Identity and Access Management Service API.
+	// Example: `FAULT-DOMAIN-1`
+	FaultDomain *string `mandatory:"false" json:"faultDomain"`
+
 	// 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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm).
@@ -149,6 +155,7 @@ func (m *LaunchInstanceDetails) UnmarshalJSON(data []byte) (e error) {
 		DefinedTags        map[string]map[string]interface{} `json:"definedTags"`
 		DisplayName        *string                           `json:"displayName"`
 		ExtendedMetadata   map[string]interface{}            `json:"extendedMetadata"`
+		FaultDomain        *string                           `json:"faultDomain"`
 		FreeformTags       map[string]string                 `json:"freeformTags"`
 		HostnameLabel      *string                           `json:"hostnameLabel"`
 		ImageId            *string                           `json:"imageId"`
@@ -169,6 +176,7 @@ func (m *LaunchInstanceDetails) UnmarshalJSON(data []byte) (e error) {
 	m.DefinedTags = model.DefinedTags
 	m.DisplayName = model.DisplayName
 	m.ExtendedMetadata = model.ExtendedMetadata
+	m.FaultDomain = model.FaultDomain
 	m.FreeformTags = model.FreeformTags
 	m.HostnameLabel = model.HostnameLabel
 	m.ImageId = model.ImageId

core/launch_instance_details.go

@@ -44,7 +44,7 @@ func ExampleObjectStorage_UploadFile() {
 	defer file.Close()
 	helpers.FatalIfError(e)
 
-	e = putObject(ctx, c, namespace, bname, filename, int(filesize), file, nil)
+	e = putObject(ctx, c, namespace, bname, filename, filesize, file, nil)
 	helpers.FatalIfError(e)
 	defer deleteObject(ctx, c, namespace, bname, filename)
 
@@ -64,7 +64,7 @@ func getNamespace(ctx context.Context, c objectstorage.ObjectStorageClient) stri
 	return *r.Value
 }
 
-func putObject(ctx context.Context, c objectstorage.ObjectStorageClient, namespace, bucketname, objectname string, contentLen int, content io.ReadCloser, metadata map[string]string) error {
+func putObject(ctx context.Context, c objectstorage.ObjectStorageClient, namespace, bucketname, objectname string, contentLen int64, content io.ReadCloser, metadata map[string]string) error {
 	request := objectstorage.PutObjectRequest{
 		NamespaceName: &namespace,
 		BucketName:    &bucketname,

example/example_objectstorage_test.go

@@ -0,0 +1,78 @@
+// Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+// Code generated. DO NOT EDIT.
+
+// Example for Resource Search Service
+//
+// Search for resources across your cloud infrastructure
+
+package example
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/oracle/oci-go-sdk/common"
+	"github.com/oracle/oci-go-sdk/example/helpers"
+	"github.com/oracle/oci-go-sdk/resourcesearch"
+)
+
+func Example_ResourceSearch() {
+	client, err := resourcesearch.NewResourceSearchClientWithConfigurationProvider(common.DefaultConfigProvider())
+	ctx := context.Background()
+	helpers.FatalIfError(err)
+
+	// list resource types
+	listReq := resourcesearch.ListResourceTypesRequest{}
+	listResp, err := client.ListResourceTypes(ctx, listReq)
+	fmt.Println("list resource types")
+
+	for _, element := range listResp.Items {
+		log.Printf("Resource: %s", *element.Name)
+	}
+
+	// get group type details
+	getReq := resourcesearch.GetResourceTypeRequest{
+		Name: common.String("Group"),
+	}
+	getResp, err := client.GetResourceType(context.Background(), getReq)
+	helpers.FatalIfError(err)
+	fmt.Println("get group type details")
+	log.Printf("Resource type: %s", getResp.ResourceType)
+
+	// search resource by freetext
+	searchReq := resourcesearch.SearchResourcesRequest{
+		SearchDetails: resourcesearch.FreeTextSearchDetails{
+			Text: common.String("displayname"),
+		},
+	}
+
+	freeSearchResp, err := client.SearchResources(context.Background(), searchReq)
+	helpers.FatalIfError(err)
+	fmt.Println("search resource by freetext")
+
+	for _, element := range freeSearchResp.Items {
+		log.Printf("Resource: %s", element)
+	}
+
+	searchReq.SearchDetails = resourcesearch.StructuredSearchDetails{
+		MatchingContextType: resourcesearch.SearchDetailsMatchingContextTypeHighlights,
+		Query:               common.String("query all resources"),
+	}
+
+	structureSearchResp, err := client.SearchResources(context.Background(), searchReq)
+	helpers.FatalIfError(err)
+
+	// search resource by structured query
+	fmt.Println("search resource by structured query")
+
+	for _, element := range structureSearchResp.Items {
+		log.Printf("Resource: %s", element)
+	}
+
+	// Output:
+	// list resource types
+	// get group type details
+	// search resource by freetext
+	// search resource by structured query
+}