Fixes and Makefile

Author: kpfleming

internal/productcore/base.go

@@ -48,13 +48,13 @@ type EnablementStatus struct {
 // used by unit tests to provide mock behaviors
 type EnablementHookFuncs[O any] struct {
 	DisableFunc func(api.Interface, string) error
-	EnableFunc func(api.Interface, string) (O, error)
-	GetFunc func(api.Interface, string) (O, error)
+	EnableFunc  func(api.Interface, string) (O, error)
+	GetFunc     func(api.Interface, string) (O, error)
 }
 
 // ConfigurationHookFuncs is a structure of dependency-injection
 // points used by unit tests to provide mock behaviors
 type ConfigurationHookFuncs[O, I any] struct {
-	GetConfigurationFunc func(api.Interface, string) (O, error)
+	GetConfigurationFunc    func(api.Interface, string) (O, error)
 	UpdateConfigurationFunc func(api.Interface, string, I) (O, error)
 }

internal/productcore/disable.go

@@ -2,6 +2,7 @@ package productcore
 
 import (
 	"io"
+
 	fsterr "github.com/fastly/cli/pkg/errors"
 
 	"github.com/fastly/cli/pkg/argparser"

internal/productcore/enable.go

@@ -2,8 +2,9 @@ package productcore
 
 import (
 	"io"
-	fsterr "github.com/fastly/cli/pkg/errors"
+
 	"github.com/fastly/cli/pkg/argparser"
+	fsterr "github.com/fastly/cli/pkg/errors"
 	"github.com/fastly/cli/pkg/global"
 	"github.com/fastly/cli/pkg/text"
 )

internal/productcore/status.go

@@ -1,13 +1,14 @@
 package productcore
 
 import (
-	"io"
 	"errors"
-	"github.com/fastly/go-fastly/v9/fastly"
-	fsterr "github.com/fastly/cli/pkg/errors"
+	"io"
+
 	"github.com/fastly/cli/pkg/argparser"
+	fsterr "github.com/fastly/cli/pkg/errors"
 	"github.com/fastly/cli/pkg/global"
 	"github.com/fastly/cli/pkg/text"
+	"github.com/fastly/go-fastly/v9/fastly"
 )
 
 // Status is a base type for all 'status' commands.

internal/productcore_test/enablement.go

@@ -12,10 +12,10 @@ import (
 )
 
 type TestEnablementInput[O any] struct {
-	T *testing.T
-	Commands []string
+	T           *testing.T
+	Commands    []string
 	ProductName string
-	Hooks *productcore.EnablementHookFuncs[O]
+	Hooks       *productcore.EnablementHookFuncs[O]
 }
 
 func TestEnablement[O any](i TestEnablementInput[O]) {
@@ -137,7 +137,7 @@ func TestEnablement[O any](i TestEnablementInput[O]) {
 				i.Hooks.GetFunc = func(_ api.Interface, _ string) (o O, err error) {
 					// The API returns a 'Bad Request' error when the
 					// product has not been enabled on the service
-					err =  &fastly.HTTPError{StatusCode: 400}
+					err = &fastly.HTTPError{StatusCode: 400}
 					return
 				}
 			},
@@ -150,7 +150,7 @@ func TestEnablement[O any](i TestEnablementInput[O]) {
 				i.Hooks.GetFunc = func(_ api.Interface, _ string) (o O, err error) {
 					// The API returns a 'Bad Request' error when the
 					// product has not been enabled on the service
-					err =  &fastly.HTTPError{StatusCode: 400}
+					err = &fastly.HTTPError{StatusCode: 400}
 					return
 				}
 			},

pkg/commands/product/botmanagement/product_test.go

@@ -3,17 +3,17 @@ package botmanagement_test
 import (
 	"testing"
 
-	"github.com/fastly/go-fastly/v9/fastly/products/botmanagement"
 	"github.com/fastly/cli/internal/productcore_test"
 	root "github.com/fastly/cli/pkg/commands/product"
 	sub "github.com/fastly/cli/pkg/commands/product/botmanagement"
+	"github.com/fastly/go-fastly/v9/fastly/products/botmanagement"
 )
 
 func TestProductEnablement(t *testing.T) {
 	productcore_test.TestEnablement(productcore_test.TestEnablementInput[*botmanagement.EnableOutput]{
-		T: t,
-		Commands: []string{root.CommandName, sub.CommandName},
+		T:           t,
+		Commands:    []string{root.CommandName, sub.CommandName},
 		ProductName: botmanagement.ProductName,
-		Hooks: &sub.EnablementHooks,
+		Hooks:       &sub.EnablementHooks,
 	})
 }