Fix linting errors

Author: prydie

pkg/oci/instances.go

@@ -77,12 +77,12 @@ func extractNodeAddressesFromVNIC(vnic *core.Vnic) ([]api.NodeAddress, error) {
 func (cp *CloudProvider) NodeAddresses(name types.NodeName) ([]api.NodeAddress, error) {
 	glog.V(4).Infof("NodeAddresses(%q) called", name)
 
-	inst, err := cp.client.Instances().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(name))
+	inst, err := cp.client.Compute().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(name))
 	if err != nil {
 		return []api.NodeAddress{}, errors.Wrap(err, "GetInstanceByNodeName")
 	}
 
-	vnic, err := cp.client.Instances().GetPrimaryVNICForInstance(context.TODO(), *inst.Id)
+	vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(context.TODO(), *inst.Id)
 	if err != nil {
 		return []api.NodeAddress{}, errors.Wrap(err, "GetPrimaryVNICForInstance")
 	}
@@ -97,7 +97,7 @@ func (cp *CloudProvider) NodeAddresses(name types.NodeName) ([]api.NodeAddress,
 func (cp *CloudProvider) NodeAddressesByProviderID(providerID string) ([]api.NodeAddress, error) {
 	glog.V(4).Infof("NodeAddressesByProviderID(%q) called", providerID)
 	instanceID := util.MapProviderIDToInstanceID(providerID)
-	vnic, err := cp.client.Instances().GetPrimaryVNICForInstance(context.TODO(), instanceID)
+	vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(context.TODO(), instanceID)
 	if err != nil {
 		return []api.NodeAddress{}, errors.Wrap(err, "GetPrimaryVNICForInstance")
 	}
@@ -111,7 +111,7 @@ func (cp *CloudProvider) ExternalID(nodeName types.NodeName) (string, error) {
 	glog.V(4).Infof("ExternalID(%q) called", nodeName)
 
 	instName := mapNodeNameToInstanceName(nodeName)
-	inst, err := cp.client.Instances().GetInstanceByNodeName(context.TODO(), instName)
+	inst, err := cp.client.Compute().GetInstanceByNodeName(context.TODO(), instName)
 	if client.IsNotFound(err) {
 		glog.Infof("Instance %q was not found. Unable to get ExternalID: %v", instName, err)
 		return "", cloudprovider.InstanceNotFound
@@ -131,7 +131,7 @@ func (cp *CloudProvider) InstanceID(nodeName types.NodeName) (string, error) {
 	glog.V(4).Infof("InstanceID(%q) called", nodeName)
 
 	name := mapNodeNameToInstanceName(nodeName)
-	inst, err := cp.client.Instances().GetInstanceByNodeName(context.TODO(), name)
+	inst, err := cp.client.Compute().GetInstanceByNodeName(context.TODO(), name)
 	if err != nil {
 		return "", errors.Wrap(err, "GetInstanceByNodeName")
 	}
@@ -142,7 +142,7 @@ func (cp *CloudProvider) InstanceID(nodeName types.NodeName) (string, error) {
 func (cp *CloudProvider) InstanceType(name types.NodeName) (string, error) {
 	glog.V(4).Infof("InstanceType(%q) called", name)
 
-	inst, err := cp.client.Instances().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(name))
+	inst, err := cp.client.Compute().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(name))
 	if err != nil {
 		return "", errors.Wrap(err, "GetInstanceByNodeName")
 	}
@@ -154,7 +154,7 @@ func (cp *CloudProvider) InstanceTypeByProviderID(providerID string) (string, er
 	glog.V(4).Infof("InstanceTypeByProviderID(%q) called", providerID)
 
 	instanceID := util.MapProviderIDToInstanceID(providerID)
-	inst, err := cp.client.Instances().GetInstance(context.TODO(), instanceID)
+	inst, err := cp.client.Compute().GetInstance(context.TODO(), instanceID)
 	if err != nil {
 		return "", errors.Wrap(err, "GetInstance")
 	}
@@ -180,7 +180,7 @@ func (cp *CloudProvider) CurrentNodeName(hostname string) (types.NodeName, error
 func (cp *CloudProvider) InstanceExistsByProviderID(providerID string) (bool, error) {
 	glog.V(4).Infof("InstanceExistsByProviderID(%q) called", providerID)
 	instanceID := util.MapProviderIDToInstanceID(providerID)
-	instance, err := cp.client.Instances().GetInstance(context.TODO(), instanceID)
+	instance, err := cp.client.Compute().GetInstance(context.TODO(), instanceID)
 	if client.IsNotFound(err) {
 		return false, nil
 	}

pkg/oci/load_balancer.go

@@ -341,7 +341,7 @@ func (cp *CloudProvider) getSubnetsForNodes(ctx context.Context, nodes []*api.No
 		}
 
 		id := util.MapProviderIDToInstanceID(node.Spec.ProviderID)
-		vnic, err := cp.client.Instances().GetPrimaryVNICForInstance(ctx, id)
+		vnic, err := cp.client.Compute().GetPrimaryVNICForInstance(ctx, id)
 		if err != nil {
 			return nil, err
 		}

pkg/oci/newclient/client.go

@@ -31,7 +31,7 @@ import (
 
 // Interface of consumed OCI API functionality.
 type Interface interface {
-	Instances() InstancesInterface
+	Compute() ComputeInterface
 	LoadBalancer() LoadBalancerInterface
 	Networking() NetworkingInterface
 }
@@ -105,6 +105,6 @@ func (c *client) Networking() NetworkingInterface {
 	return c
 }
 
-func (c *client) Instances() InstancesInterface {
+func (c *client) Compute() ComputeInterface {
 	return c
 }

pkg/oci/newclient/instances.go renamed to pkg/oci/newclient/compute.go

@@ -23,7 +23,9 @@ import (
 	"github.com/pkg/errors"
 )
 
-type InstancesInterface interface {
+// ComputeInterface defines the subset of the OCI compute API utilised by the
+// CCM.
+type ComputeInterface interface {
 	// GetInstance gets information about the specified instance.
 	GetInstance(ctx context.Context, id string) (*core.Instance, error)
 	// GetInstanceByDisplayName gets information about the named instance.

pkg/oci/newclient/vcn.go renamed to pkg/oci/newclient/networking.go

@@ -23,6 +23,7 @@ import (
 	"github.com/pkg/errors"
 )
 
+// NetworkingInterface defines the subset of the OCI compute API utilised by the CCM.
 type NetworkingInterface interface {
 	GetSubnet(ctx context.Context, id string) (*core.Subnet, error)
 	GetSubnetFromCacheByIP(ip string) (*core.Subnet, error)

pkg/oci/zones.go

@@ -49,7 +49,7 @@ func (cp *CloudProvider) GetZone() (cloudprovider.Zone, error) {
 // initialization must be down outside the kubelets.
 func (cp *CloudProvider) GetZoneByProviderID(providerID string) (cloudprovider.Zone, error) {
 	instanceID := util.MapProviderIDToInstanceID(providerID)
-	instance, err := cp.client.Instances().GetInstance(context.TODO(), instanceID)
+	instance, err := cp.client.Compute().GetInstance(context.TODO(), instanceID)
 	if err != nil {
 		return cloudprovider.Zone{}, err
 	}
@@ -64,7 +64,7 @@ func (cp *CloudProvider) GetZoneByProviderID(providerID string) (cloudprovider.Z
 // in the context of external cloud providers where node initialization must be
 // down outside the kubelets.
 func (cp *CloudProvider) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Zone, error) {
-	instance, err := cp.client.Instances().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(nodeName))
+	instance, err := cp.client.Compute().GetInstanceByNodeName(context.TODO(), mapNodeNameToInstanceName(nodeName))
 	if err != nil {
 		return cloudprovider.Zone{}, err
 	}