Review changes

Author: Harvey Lowndes

pkg/oci/ccm.go

@@ -44,9 +44,9 @@ import (
 )
 
 const (
-	//RateLimitQPSDefault sets a value for the default queries per second.
-	RateLimitQPSDefault = 1.0
-	//RateLimitBucketDefault sets a value for the default token bucket burst size.
+	// RateLimitQPSDefault sets a value for the default queries per second.
+	RateLimitQPSDefault = 20.0
+	// RateLimitBucketDefault sets a value for the default token bucket burst size.
 	RateLimitBucketDefault = 5
 )
 
@@ -81,7 +81,7 @@ func NewCloudProvider(config *Config) (cloudprovider.Interface, error) {
 		return nil, err
 	}
 
-	rateLimiter := buildNewRateLimiter(config.RateLimiter)
+	rateLimiter := newRateLimiter(config.RateLimiter)
 
 	c, err := client.New(cp, &rateLimiter)
 	if err != nil {
@@ -232,7 +232,7 @@ func buildConfigurationProvider(config *Config) (common.ConfigurationProvider, e
 
 // buildNewRateLimiter builds and returns a struct containing read and write
 // rate limiters. Defaults are used where no (0) value is provided.
-func buildNewRateLimiter(config *RateLimiterConfig) client.RateLimiter {
+func newRateLimiter(config *RateLimiterConfig) client.RateLimiter {
 	// Set to default values if configuration not declared
 	if config.RateLimitQPSRead == 0 {
 		config.RateLimitQPSRead = RateLimitQPSDefault

pkg/oci/ccm_test.go

@@ -19,9 +19,9 @@ import (
 )
 
 func TestBuildRateLimiterWithConfig(t *testing.T) {
-	var qpsRead float32 = 6.0
+	qpsRead := float32(6.0)
 	bucketRead := 20
-	var qpsWrite float32 = 8.0
+	qpsWrite := float32(8.0)
 	bucketWrite := 20
 
 	rateLimiterConfig := &RateLimiterConfig{
@@ -31,7 +31,7 @@ func TestBuildRateLimiterWithConfig(t *testing.T) {
 		RateLimitBucketWrite: bucketWrite,
 	}
 
-	rateLimiter := buildNewRateLimiter(rateLimiterConfig)
+	rateLimiter := newRateLimiter(rateLimiterConfig)
 
 	if rateLimiter.Reader.QPS() != qpsRead {
 		t.Errorf("unexpected QPS (read) value: expected %f but found %f", qpsRead, rateLimiter.Reader.QPS())
@@ -45,7 +45,7 @@ func TestBuildRateLimiterWithConfig(t *testing.T) {
 func TestBuildRateLimiterWithDefaults(t *testing.T) {
 	rateLimiterConfig := &RateLimiterConfig{}
 
-	rateLimiter := buildNewRateLimiter(rateLimiterConfig)
+	rateLimiter := newRateLimiter(rateLimiterConfig)
 
 	if rateLimiter.Reader.QPS() != RateLimitQPSDefault {
 		t.Errorf("unexpected QPS (read) value: expected %f but found %f", RateLimitQPSDefault, rateLimiter.Reader.QPS())

pkg/oci/client/compute.go

@@ -58,7 +58,7 @@ func (c *client) getInstanceByDisplayName(ctx context.Context, compartmentID, di
 	)
 	for {
 		if !c.rateLimiter.Reader.TryAccept() {
-			return nil, RateLimitError(false, "getInstanceByDisplayName")
+			return nil, RateLimitError(false, "ListInstances")
 		}
 		resp, err := c.compute.ListInstances(ctx, core.ListInstancesRequest{
 			CompartmentId: &compartmentID,
@@ -89,7 +89,7 @@ func (c *client) getInstanceByDisplayName(ctx context.Context, compartmentID, di
 
 func (c *client) listVNICAttachments(ctx context.Context, req core.ListVnicAttachmentsRequest) (core.ListVnicAttachmentsResponse, error) {
 	if !c.rateLimiter.Reader.TryAccept() {
-		return core.ListVnicAttachmentsResponse{}, RateLimitError(false, "listVNICAttachments")
+		return core.ListVnicAttachmentsResponse{}, RateLimitError(false, "ListVnicAttachments")
 	}
 
 	resp, err := c.compute.ListVnicAttachments(ctx, req)
@@ -129,7 +129,7 @@ func (c *client) GetPrimaryVNICForInstance(ctx context.Context, compartmentID, i
 			}
 
 			// TODO(apryde): Cache map[instanceID]primaryVNICID.
-			vnic, err := c.getVNIC(ctx, *attachment.VnicId)
+			vnic, err := c.GetVNIC(ctx, *attachment.VnicId)
 			if err != nil {
 				return nil, err
 			}
@@ -180,7 +180,7 @@ func (c *client) GetInstanceByNodeName(ctx context.Context, compartmentID, vcnID
 				continue
 			}
 
-			vnic, err := c.getVNIC(ctx, *attachment.VnicId)
+			vnic, err := c.GetVNIC(ctx, *attachment.VnicId)
 			if err != nil {
 				return nil, err
 			}

pkg/oci/client/load_balancer.go

@@ -69,7 +69,7 @@ func (c *client) GetLoadBalancerByName(ctx context.Context, compartmentID, name
 	var page *string
 	for {
 		if !c.rateLimiter.Reader.TryAccept() {
-			return nil, RateLimitError(false, "GetLoadBalancerByName")
+			return nil, RateLimitError(false, "ListLoadBalancers")
 		}
 		resp, err := c.loadbalancer.ListLoadBalancers(ctx, loadbalancer.ListLoadBalancersRequest{
 			CompartmentId: &compartmentID,
@@ -130,7 +130,7 @@ func (c *client) DeleteLoadBalancer(ctx context.Context, id string) (string, err
 
 func (c *client) GetCertificateByName(ctx context.Context, lbID, name string) (*loadbalancer.Certificate, error) {
 	if !c.rateLimiter.Reader.TryAccept() {
-		return nil, RateLimitError(false, "GetCertificateByName")
+		return nil, RateLimitError(false, "ListCertificates")
 	}
 
 	resp, err := c.loadbalancer.ListCertificates(ctx, loadbalancer.ListCertificatesRequest{

pkg/oci/client/networking.go

@@ -32,9 +32,9 @@ type NetworkingInterface interface {
 	UpdateSecurityList(ctx context.Context, request core.UpdateSecurityListRequest) (core.UpdateSecurityListResponse, error)
 }
 
-func (c *client) getVNIC(ctx context.Context, id string) (*core.Vnic, error) {
+func (c *client) GetVNIC(ctx context.Context, id string) (*core.Vnic, error) {
 	if !c.rateLimiter.Reader.TryAccept() {
-		return nil, RateLimitError(false, "getVNIC")
+		return nil, RateLimitError(false, "GetVNIC")
 	}
 
 	resp, err := c.network.GetVnic(ctx, core.GetVnicRequest{