Review changes

Author: Harvey Lowndes

pkg/oci/ccm.go

@@ -23,7 +23,6 @@ import (
 
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/oracle/oci-go-sdk/common"
 	"github.com/oracle/oci-go-sdk/common/auth"
 	"github.com/pkg/errors"
@@ -88,7 +87,7 @@ func NewCloudProvider(config *Config) (cloudprovider.Interface, error) {
 		return nil, err
 	}
 
-	rateLimiter := newRateLimiter(config.RateLimiter)
+	rateLimiter := newRateLimiter(logger.Sugar(), config.RateLimiter)
 
 	c, err := client.New(logger.Sugar(), cp, &rateLimiter)
 	if err != nil {
@@ -240,8 +239,7 @@ func buildConfigurationProvider(logger *zap.Logger, config *Config) (common.Conf
 
 // newRateLimiter builds and returns a struct containing read and write
 // rate limiters. Defaults are used where no (0) value is provided.
-func newRateLimiter(config *RateLimiterConfig) client.RateLimiter {
-
+func newRateLimiter(logger *zap.SugaredLogger, config *RateLimiterConfig) client.RateLimiter {
 	if config == nil {
 		config = &RateLimiterConfig{}
 	}
@@ -269,11 +267,11 @@ func newRateLimiter(config *RateLimiterConfig) client.RateLimiter {
 			config.RateLimitBucketWrite),
 	}
 
-	glog.V(2).Infof("OCI using read rate limit configuration: QPS=%g, bucket=%d",
+	logger.Infof("OCI using read rate limit configuration: QPS=%g, bucket=%d",
 		config.RateLimitQPSRead,
 		config.RateLimitBucketRead)
 
-	glog.V(2).Infof("OCI using write rate limit configuration: QPS=%g, bucket=%d",
+	logger.Infof("OCI using write rate limit configuration: QPS=%g, bucket=%d",
 		config.RateLimitQPSWrite,
 		config.RateLimitBucketWrite)
 

pkg/oci/ccm_test.go

@@ -16,6 +16,8 @@ package oci
 
 import (
 	"testing"
+
+	"go.uber.org/zap"
 )
 
 func TestBuildRateLimiterWithConfig(t *testing.T) {
@@ -31,7 +33,7 @@ func TestBuildRateLimiterWithConfig(t *testing.T) {
 		RateLimitBucketWrite: bucketWrite,
 	}
 
-	rateLimiter := newRateLimiter(rateLimiterConfig)
+	rateLimiter := newRateLimiter(zap.S(), rateLimiterConfig)
 
 	if rateLimiter.Reader.QPS() != qpsRead {
 		t.Errorf("unexpected QPS (read) value: expected %f but found %f", qpsRead, rateLimiter.Reader.QPS())
@@ -45,7 +47,7 @@ func TestBuildRateLimiterWithConfig(t *testing.T) {
 func TestBuildRateLimiterWithDefaults(t *testing.T) {
 	rateLimiterConfig := &RateLimiterConfig{}
 
-	rateLimiter := newRateLimiter(rateLimiterConfig)
+	rateLimiter := newRateLimiter(zap.S(), rateLimiterConfig)
 
 	if rateLimiter.Reader.QPS() != RateLimitQPSDefault {
 		t.Errorf("unexpected QPS (read) value: expected %f but found %f", RateLimitQPSDefault, rateLimiter.Reader.QPS())

pkg/oci/config_test.go

@@ -1,4 +1,4 @@
-// Copyright 2017 Oracle and/or its affiliates. All rights reserved.
+// Copyright 2018 Oracle and/or its affiliates. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.