Upgrade OCI Go SDK to v2.0.6

Gopkg.toml

@@ -1,24 +1,3 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
 ignored = ["k8s.io/client-go/pkg/api/v1"]
 
 # See: https://github.com/golang/dep/issues/1799
@@ -60,7 +39,7 @@ ignored = ["k8s.io/client-go/pkg/api/v1"]
  version = "1.11.1"
 
 [[constraint]]
- version = "v1.6.0"
+ version = "v2.6.0"
  name = "github.com/oracle/oci-go-sdk"
 
 [[override]]

Makefile

@@ -17,11 +17,11 @@ GO_SRC := $(shell find . -name "*.go")
 # Else just equal the build (git hash)
 BUILD := $(shell git describe --tags --dirty --always)
 ifeq ($(DEV_BUILD), true)
-	# If DEV_BUILD is set, use the dev format.
 	VERSION ?= ${BUILD}-${USER}-dev
 else
 	VERSION ?= ${BUILD}
 endif
+
 DIR := dist
 BIN := oci-volume-provisioner
 REGISTRY ?= iad.ocir.io
@@ -39,6 +39,9 @@ SRC_DIRS := cmd pkg # directories which hold app source (not vendored)
 .PHONY: all
 all: gofmt golint govet test build
 
+deps:
+	dep ensure -v
+
 .PHONY: gofmt
 gofmt:
 	@./hack/check-gofmt.sh ${SRC_DIRS}
@@ -112,10 +115,10 @@ endif
 .PHONY: system-test
 system-test: system-test-config
 	docker run -it ${DOCKER_OPTIONS} \
-        -e KUBECONFIG=$(KUBECONFIG) \
-        -v $(KUBECONFIG):$(KUBECONFIG) \
-        -e HTTPS_PROXY=$$HTTPS_PROXY \
-        ${TEST_IMAGE}:${VERSION} ${TEST_IMAGE_ARGS}
+	-e KUBECONFIG=$(KUBECONFIG) \
+	-v $(KUBECONFIG):$(KUBECONFIG) \
+	-e HTTPS_PROXY=$$HTTPS_PROXY \
+	${TEST_IMAGE}:${VERSION} ${TEST_IMAGE_ARGS}
 
 .PHONY: clean
 clean:

pkg/provisioner/block/block.go

@@ -157,7 +157,7 @@ func (block *blockProvisioner) Provision(options controller.VolumeOptions, ad *i
 		return nil, fmt.Errorf("could not determine volume size for PVC")
 	}
 
-	volSizeMB := int(roundUpSize(capacity.Value(), 1024*1024))
+	volSizeMB := int64(roundUpSize(capacity.Value(), 1024*1024))
 
 	logger := block.logger.With(
 		"availabilityDomain", *ad.Name,
@@ -167,7 +167,7 @@ func (block *blockProvisioner) Provision(options controller.VolumeOptions, ad *i
 
 	if volumeRoundingEnabled(options.Parameters) {
 		if block.volumeRoundingEnabled && block.minVolumeSize.Cmp(capacity) == 1 {
-			volSizeMB = int(roundUpSize(block.minVolumeSize.Value(), 1024*1024))
+			volSizeMB = int64(roundUpSize(block.minVolumeSize.Value(), 1024*1024))
 			logger.With("roundedVolumeSize", volSizeMB).Warn("Attempted to provision volume with a capacity less than the minimum. Rounding up to ensure volume creation.")
 			capacity = block.minVolumeSize
 		}
@@ -177,7 +177,7 @@ func (block *blockProvisioner) Provision(options controller.VolumeOptions, ad *i
 		AvailabilityDomain: ad.Name,
 		CompartmentId:      common.String(block.client.CompartmentOCID()),
 		DisplayName:        common.String(fmt.Sprintf("%s%s", provisioner.GetPrefix(), options.PVC.Name)),
-		SizeInMBs:          common.Int(volSizeMB),
+		SizeInMBs:          common.Int64(volSizeMB),
 	}
 
 	if value, ok := options.PVC.Annotations[OCIVolumeBackupID]; ok {