Migrate Two FA from packngo to metal-go client

Signed-off-by: Ayush Rangwala <[email protected]>
equinix · Jan 24, 2024 · ce17551 · ce17551
1 parent cd49f37
commit ce17551
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/internal/twofa/disable2fa.go b/internal/twofa/disable2fa.go
@@ -21,6 +21,7 @@
 package twofa
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -49,12 +50,12 @@ func (c *Client) Disable() *cobra.Command {
 
 			cmd.SilenceUsage = true
 			if sms {
-				_, err := c.Service.DisableSms(token)
+				_, err := c.TwoFAService.DisableTfaSms(context.Background()).Execute()
 				if err != nil {
 					return fmt.Errorf("Could not disable Two-Factor Authentication via SMS: %w", err)
 				}
 			} else if app {
-				_, err := c.Service.DisableApp(token)
+				_, err := c.TwoFAService.DisableTfaApp(context.Background()).Execute()
 				if err != nil {
 					return fmt.Errorf("Could not disable Two-Factor Authentication via App: %w", err)
 				}

diff --git a/internal/twofa/enable2fa.go b/internal/twofa/enable2fa.go
@@ -21,6 +21,7 @@
 package twofa
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -48,12 +49,12 @@ func (c *Client) Enable() *cobra.Command {
 
 			cmd.SilenceUsage = true
 			if sms {
-				_, err := c.Service.EnableSms(token)
+				_, err := c.TwoFAService.EnableTfaSms(context.Background()).Execute()
 				if err != nil {
 					return fmt.Errorf("Could not enable Two-Factor Authentication: %w", err)
 				}
 			} else if app {
-				_, err := c.Service.EnableApp(token)
+				_, err := c.TwoFAService.EnableTfaApp(context.Background()).Execute()
 				if err != nil {
 					return fmt.Errorf("Could not enable Two-Factor Authentication: %w", err)
 				}

diff --git a/internal/twofa/receive.go b/internal/twofa/receive.go
@@ -21,6 +21,7 @@
 package twofa
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -47,7 +48,7 @@ func (c *Client) Receive() *cobra.Command {
 
 			cmd.SilenceUsage = true
 			if sms {
-				_, err := c.Service.ReceiveSms()
+				_, err := c.OtpService.ReceiveCodes(context.Background()).Execute()
 				if err != nil {
 					return fmt.Errorf("Could not issue token via SMS: %w", err)
 				}
@@ -56,7 +57,7 @@ func (c *Client) Receive() *cobra.Command {
 				return nil
 			}
 
-			otpURI, _, err := c.Service.SeedApp()
+			otpURI, _, err := c.TwoFAService.SeedApp()
 			if err != nil {
 				return fmt.Errorf("Could not get the OTP Seed URI: %w", err)
 			}

diff --git a/internal/twofa/twofa.go b/internal/twofa/twofa.go
@@ -22,14 +22,16 @@ package twofa
 
 import (
 	"github.com/equinix/metal-cli/internal/outputs"
-	"github.com/packethost/packngo"
+
+	metal "github.com/equinix-labs/metal-go/metal/v1"
 	"github.com/spf13/cobra"
 )
 
 type Client struct {
-	Servicer Servicer
-	Service  packngo.TwoFactorAuthService
-	Out      outputs.Outputer
+	Servicer     Servicer
+	TwoFAService *metal.TwoFactorAuthApiService
+	OtpService   *metal.OTPsApiService
+	Out          outputs.Outputer
 }
 
 func (c *Client) NewCommand() *cobra.Command {
@@ -45,7 +47,8 @@ func (c *Client) NewCommand() *cobra.Command {
 					root.PersistentPreRun(cmd, args)
 				}
 			}
-			c.Service = c.Servicer.API(cmd).TwoFactorAuth
+			c.TwoFAService = c.Servicer.MetalAPI(cmd).TwoFactorAuthApi
+			c.OtpService = c.Servicer.MetalAPI(cmd).OTPsApi
 		},
 	}
 
@@ -58,8 +61,10 @@ func (c *Client) NewCommand() *cobra.Command {
 }
 
 type Servicer interface {
-	API(*cobra.Command) *packngo.Client
-	ListOptions(defaultIncludes, defaultExcludes []string) *packngo.ListOptions
+	MetalAPI(*cobra.Command) *metal.APIClient
+	Filters() map[string]string
+	Includes(defaultIncludes []string) (incl []string)
+	Excludes(defaultExcludes []string) (excl []string)
 }
 
 func NewClient(s Servicer, out outputs.Outputer) *Client {