removed v1 impl (apart from zones) and fixed tests

Author: okokes-akamai

cloud/linode/instances.go

@@ -17,14 +17,7 @@ type instances struct {
 	client Client
 }
 
-// TODO(PR): providing both APIs to keep the tests green and to enable
-// gradual migration
-type hybridInstances interface {
-	cloudprovider.Instances
-	cloudprovider.InstancesV2
-}
-
-func newInstances(client Client) hybridInstances {
+func newInstances(client Client) cloudprovider.InstancesV2 {
 	return &instances{client}
 }
 
@@ -36,50 +29,6 @@ func (e instanceNoIPAddressesError) Error() string {
 	return fmt.Sprintf("instance %d has no IP addresses", e.id)
 }
 
-func (i *instances) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.NodeAddress, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "node_name", string(name))
-
-	linode, err := linodeByName(ctx, i.client, name)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return nil, err
-	}
-
-	addresses, err := i.nodeAddresses(ctx, linode)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return nil, err
-	}
-
-	return addresses, nil
-}
-
-func (i *instances) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "provider_id", providerID)
-
-	id, err := parseProviderID(providerID)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return nil, err
-	}
-
-	linode, err := linodeByID(ctx, i.client, id)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return nil, err
-	}
-
-	addresses, err := i.nodeAddresses(ctx, linode)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return nil, err
-	}
-
-	return addresses, nil
-}
-
 func (i *instances) nodeAddresses(ctx context.Context, linode *linodego.Instance) ([]v1.NodeAddress, error) {
 	var addresses []v1.NodeAddress
 	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: linode.Label})
@@ -106,110 +55,6 @@ func (i *instances) nodeAddresses(ctx context.Context, linode *linodego.Instance
 	return addresses, nil
 }
 
-func (i *instances) InstanceID(ctx context.Context, nodeName types.NodeName) (string, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "node_name", string(nodeName))
-
-	linode, err := linodeByName(ctx, i.client, nodeName)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return "", err
-	}
-	return strconv.Itoa(linode.ID), nil
-}
-
-func (i *instances) InstanceType(ctx context.Context, nodeName types.NodeName) (string, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "node_name", string(nodeName))
-
-	linode, err := linodeByName(ctx, i.client, nodeName)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return "", err
-	}
-	return linode.Type, nil
-}
-
-func (i *instances) InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "provider_id", providerID)
-
-	id, err := parseProviderID(providerID)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return "", err
-	}
-
-	sentry.SetTag(ctx, "linode_id", strconv.Itoa(id))
-
-	linode, err := linodeByID(ctx, i.client, id)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return "", err
-	}
-	return linode.Type, nil
-}
-
-func (i *instances) AddSSHKeyToAllInstances(_ context.Context, user string, keyData []byte) error {
-	return cloudprovider.NotImplemented
-}
-
-func (i *instances) CurrentNodeName(_ context.Context, hostname string) (types.NodeName, error) {
-	return types.NodeName(hostname), nil
-}
-
-func (i *instances) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "provider_id", providerID)
-
-	id, err := parseProviderID(providerID)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return false, err
-	}
-
-	sentry.SetTag(ctx, "linode_id", strconv.Itoa(id))
-
-	_, err = linodeByID(ctx, i.client, id)
-	if err != nil {
-		if apiError, ok := err.(*linodego.Error); ok && apiError.Code == http.StatusNotFound {
-			return false, nil
-		}
-		sentry.CaptureError(ctx, err)
-		return false, err
-	}
-
-	return true, nil
-}
-
-func (i *instances) InstanceShutdownByProviderID(ctx context.Context, providerID string) (bool, error) {
-	ctx = sentry.SetHubOnContext(ctx)
-	sentry.SetTag(ctx, "provider_id", providerID)
-
-	id, err := parseProviderID(providerID)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return false, err
-	}
-
-	sentry.SetTag(ctx, "linode_id", strconv.Itoa(id))
-
-	instance, err := linodeByID(ctx, i.client, id)
-	if err != nil {
-		sentry.CaptureError(ctx, err)
-		return false, err
-	}
-
-	// An instance is considered to be "shutdown" when it is
-	// in the process of shutting down, or already offline.
-	if instance.Status == linodego.InstanceOffline ||
-		instance.Status == linodego.InstanceShuttingDown {
-		return true, nil
-	}
-
-	return false, nil
-}
-
 func (i *instances) InstanceExists(ctx context.Context, node *v1.Node) (bool, error) {
 	providerID := node.Spec.ProviderID
 
@@ -267,18 +112,29 @@ func (i *instances) InstanceShutdown(ctx context.Context, node *v1.Node) (bool,
 }
 
 func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloudprovider.InstanceMetadata, error) {
-	providerID := node.Spec.ProviderID
-
-	// TODO(okokes): should we at all times rely on providerID or should we include
-	// lookups by node name as well?
-	id, err := parseProviderID(providerID)
-	if err != nil {
-		return nil, err
-	}
+	var (
+		providerID = node.Spec.ProviderID
+		nodeName   = types.NodeName(node.Name)
+		linode     *linodego.Instance
+		err        error
+	)
+
+	// TODO(okokes): abstract this away and reuse it in our other methods here
+	if providerID != "" {
+		id, err := parseProviderID(providerID)
+		if err != nil {
+			return nil, err
+		}
 
-	linode, err := linodeByID(ctx, i.client, id)
-	if err != nil {
-		return nil, err
+		linode, err = linodeByID(ctx, i.client, id)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		linode, err = linodeByName(ctx, i.client, nodeName)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	addresses, err := i.nodeAddresses(ctx, linode)
@@ -290,6 +146,7 @@ func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
 	meta := &cloudprovider.InstanceMetadata{
 		ProviderID:    providerID,
 		NodeAddresses: addresses,
+		InstanceType:  linode.Type,
 		Region:        linode.Region,
 	}