Merge pull request #3 from MustWin/update-sdk

vendor: update baremetal-sdk

Author: mikejihbe

client/bare_metal_client.go

@@ -157,6 +157,6 @@ type BareMetalClient interface {
 	UpdateUser(id string, opts *baremetal.UpdateIdentityOptions) (res *baremetal.User, e error)
 	UpdateVirtualNetwork(id string, opts *baremetal.IfMatchDisplayNameOptions) (vcn *baremetal.VirtualNetwork, e error)
 	UpdateVolume(id string, opts *baremetal.UpdateOptions) (res *baremetal.Volume, e error)
-	UpdateVolumeBackup(id string, opts *baremetal.UpdateBackupOptions) (vol *baremetal.VolumeBackup, e error)
+	UpdateVolumeBackup(id string, opts *baremetal.IfMatchDisplayNameOptions) (vol *baremetal.VolumeBackup, e error)
 	UploadAPIKey(userID, key string, opts *baremetal.RetryTokenOptions) (apiKey *baremetal.APIKey, e error)
 }

client/mocks/bare_metal_client.go

@@ -1,7 +1,7 @@
 package mocks
 
 import baremetal "github.com/MustWin/baremetal-sdk-go"
-import client "github.com/oracle/terraform-provider-baremetal/client"
+
 import mock "github.com/stretchr/testify/mock"
 
 // BareMetalClient is an autogenerated mock type for the BareMetalClient type
@@ -2977,11 +2977,11 @@ func (_m *BareMetalClient) UpdateVolume(id string, opts *baremetal.UpdateOptions
 }
 
 // UpdateVolumeBackup provides a mock function with given fields: id, opts
-func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.UpdateBackupOptions) (*baremetal.VolumeBackup, error) {
+func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.IfMatchDisplayNameOptions) (*baremetal.VolumeBackup, error) {
 	ret := _m.Called(id, opts)
 
 	var r0 *baremetal.VolumeBackup
-	if rf, ok := ret.Get(0).(func(string, *baremetal.UpdateBackupOptions) *baremetal.VolumeBackup); ok {
+	if rf, ok := ret.Get(0).(func(string, *baremetal.IfMatchDisplayNameOptions) *baremetal.VolumeBackup); ok {
 		r0 = rf(id, opts)
 	} else {
 		if ret.Get(0) != nil {
@@ -2990,7 +2990,7 @@ func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.UpdateB
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(string, *baremetal.UpdateBackupOptions) error); ok {
+	if rf, ok := ret.Get(1).(func(string, *baremetal.IfMatchDisplayNameOptions) error); ok {
 		r1 = rf(id, opts)
 	} else {
 		r1 = ret.Error(1)
@@ -3021,5 +3021,3 @@ func (_m *BareMetalClient) UploadAPIKey(userID string, key string, opts *baremet
 
 	return r0, r1
 }
-
-var _ client.BareMetalClient = (*BareMetalClient)(nil)

core/volume_backup_resource_crud.go

@@ -58,7 +58,7 @@ func (s *VolumeBackupResourceCrud) Get() (e error) {
 }
 
 func (s *VolumeBackupResourceCrud) Update() (e error) {
-	opts := &baremetal.UpdateBackupOptions{}
+	opts := &baremetal.IfMatchDisplayNameOptions{}
 	displayName, ok := s.D.GetOk("display_name")
 	if ok {
 		opts.DisplayName = displayName.(string)

core_volume_backup_test.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/MustWin/baremetal-sdk-go"
-	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
+	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 
 	"github.com/stretchr/testify/suite"
 )
@@ -144,7 +144,7 @@ func (s ResourceCoreVolumeBackupTestSuite) TestUpdateVolumeBackupDisplayName() {
 	deletedRes := &deletedResVal
 	deletedRes.State = baremetal.ResourceTerminated
 
-	opts := &baremetal.UpdateBackupOptions{}
+	opts := &baremetal.IfMatchDisplayNameOptions{}
 	opts.DisplayName = "new_display_name"
 	s.Client.On("UpdateVolumeBackup", "id", opts).Return(res, nil)
 	s.Client.On("GetVolumeBackup", "id").Return(res, nil).Times(2)

vendor/github.com/MustWin/baremetal-sdk-go/Makefile

@@ -315,10 +315,10 @@
 			"revisionTime": "2017-02-01T00:43:30Z"
 		},
 		{
-			"checksumSHA1": "q7sNDDQOLVldBMnCjLt2TqtiPIE=",
+			"checksumSHA1": "Z5k3FbEQycqfu0Y/WtuV1zE/yqE=",
 			"path": "github.com/MustWin/baremetal-sdk-go",
-			"revision": "1a3103a9916bda38973c427d117ae4e19dd66bea",
-			"revisionTime": "2017-03-07T20:36:27Z"
+			"revision": "496d0fe63ba8342535e639d9116e8dc243780b1e",
+			"revisionTime": "2017-03-20T18:17:09Z"
 		},
 		{
 			"checksumSHA1": "Aqy8/FoAIidY/DeQ5oTYSZ4YFVc=",