Clean up packngo calls.

Use packet client instead of packngo.client

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

cmd/ci-clean/main.go

@@ -27,6 +27,7 @@ import (
 	"github.com/packethost/packngo"
 	"github.com/spf13/cobra"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
+
 	"sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet"
 )
 
@@ -98,7 +99,7 @@ func cleanup(metalAuthToken, metalProjectID string) error {
 	return kerrors.NewAggregate(errs)
 }
 
-func deleteDevices(metalClient *packngo.Client, devices []packngo.Device) error {
+func deleteDevices(metalClient *packet.Client, devices []packngo.Device) error {
 	var errs []error
 
 	for _, d := range devices {
@@ -119,7 +120,7 @@ func deleteDevices(metalClient *packngo.Client, devices []packngo.Device) error
 	return kerrors.NewAggregate(errs)
 }
 
-func deleteIPs(metalClient *packngo.Client, ips []packngo.IPAddressReservation) error {
+func deleteIPs(metalClient *packet.Client, ips []packngo.IPAddressReservation) error {
 	var errs []error
 
 	for _, ip := range ips {
@@ -147,7 +148,7 @@ func deleteIPs(metalClient *packngo.Client, ips []packngo.IPAddressReservation)
 	return kerrors.NewAggregate(errs)
 }
 
-func deleteKeys(metalClient *packngo.Client, keys []packngo.SSHKey) error {
+func deleteKeys(metalClient *packet.Client, keys []packngo.SSHKey) error {
 	var errs []error
 
 	for _, k := range keys {

pkg/cloud/packet/client.go

@@ -81,7 +81,7 @@ func GetClient() (*Client, error) {
 }
 
 func (p *Client) GetDevice(deviceID string) (*packngo.Device, error) {
-	dev, _, err := p.Client.Devices.Get(deviceID, nil)
+	dev, _, err := p.Devices.Get(deviceID, nil)
 	return dev, err
 }
 
@@ -121,7 +121,7 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 
 	if req.MachineScope.IsControlPlane() {
 		// control plane machines should get the API key injected
-		userDataValues["apiKey"] = p.Client.APIKey
+		userDataValues["apiKey"] = p.APIKey
 
 		if req.ControlPlaneEndpoint != "" {
 			userDataValues["controlPlaneEndpoint"] = req.ControlPlaneEndpoint
@@ -160,7 +160,7 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 
 	// If there are no reservationIDs to process, go ahead and return early
 	if len(reservationIDs) == 0 {
-		dev, _, err := p.Client.Devices.Create(serverCreateOpts)
+		dev, _, err := p.Devices.Create(serverCreateOpts)
 		return dev, err
 	}
 
@@ -171,7 +171,7 @@ func (p *Client) NewDevice(ctx context.Context, req CreateDeviceRequest) (*packn
 
 	for _, resID := range reservationIDs {
 		serverCreateOpts.HardwareReservationID = resID
-		dev, _, err := p.Client.Devices.Create(serverCreateOpts)
+		dev, _, err := p.Devices.Create(serverCreateOpts)
 		if err != nil {
 			lastErr = err
 			continue