Merge pull request #839 from SoftLayer/counterfeiter

Updated managers to use counterfeiter build directive.

Author: allmightyspiff

bin/buildAndDeploy.py

@@ -62,6 +62,7 @@ def runTests() -> None:
         if re.match(r"fixtrues|vendor", mod) is None:
             clean_mods.append(mod)
 
+    ## GO VET
     go_vet = ['go', 'vet'] +  clean_mods
     # Not using the 'real' command here because this looks neater.
 
@@ -70,7 +71,20 @@ def runTests() -> None:
         subprocess.run(go_vet, check=True)
     except subprocess.CalledProcessError as e:
         print(f"[red]>>> Go Vet failed <<<")
-        sys.exit(e.returncode)    
+        sys.exit(e.returncode)
+
+    ## GO GENERATE
+    go_generate = ['go', 'generate', './...']
+    # Not using the 'real' command here because this looks neater.
+
+    print(f'[turquoise2]Running: go generate ./...')
+    try:
+        subprocess.run(go_generate, check=True)
+    except subprocess.CalledProcessError as e:
+        print(f"[red]>>> Go Generate failed <<<")
+        sys.exit(e.returncode)
+
+    ## GO TEST
     go_test = ['go', 'test'] +  clean_mods
     print(f'[turquoise2]Running: go test $(go list ./... | grep -v "fixtures" | grep -v "vendor")')
     try:

plugin/managers/account.go

@@ -11,6 +11,7 @@ import (
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/utils"
 )
 
+//counterfeiter:generate -o ../testhelpers/ . AccountManager
 type AccountManager interface {
 	SummaryByDatacenter() (map[string]map[string]int, error)
 	GetBandwidthPools() ([]datatypes.Network_Bandwidth_Version1_Allotment, error)

plugin/managers/bandwidth.go

@@ -10,6 +10,7 @@ import (
 	. "github.ibm.com/SoftLayer/softlayer-cli/plugin/i18n"
 )
 
+//counterfeiter:generate -o ../testhelpers/ . BandwidthManager
 type BandwidthManager interface {
 	GetLocationGroup() ([]datatypes.Location_Group, error)
 	CreatePool(name string, regionId int) (datatypes.Network_Bandwidth_Version1_Allotment, error)

plugin/managers/callapi.go

@@ -9,6 +9,7 @@ import (
 	"github.com/softlayer/softlayer-go/sl"
 )
 
+//counterfeiter:generate -o ../testhelpers/ . CallAPIManager
 type CallAPIManager interface {
 	CallAPI(string, string, sl.Options, string) ([]byte, error)
 }

plugin/managers/cdn.go

@@ -11,6 +11,7 @@ import (
 	"github.com/softlayer/softlayer-go/sl"
 )
 
+//counterfeiter:generate -o ../testhelpers/ . CdnManager
 type CdnManager interface {
 	GetNetworkCdnMarketplaceConfigurationMapping() ([]datatypes.Container_Network_CdnMarketplace_Configuration_Mapping, error)
 	DeleteCDN(uniqueId string) ([]datatypes.Container_Network_CdnMarketplace_Configuration_Mapping, error)

plugin/managers/dedicatedhost.go

@@ -33,6 +33,7 @@ const (
 var existDatacenter = false
 
 // Manages SoftLayer Dedicated host.
+//counterfeiter:generate -o ../testhelpers/ . DedicatedHostManager
 type DedicatedHostManager interface {
 	ListGuests(identifier int, cpu int, domain string, hostname string, memory int, tags []string, mask string) ([]datatypes.Virtual_Guest, error)
 	GenerateOrderTemplate(size, hostname, domain, datacenter string, billing string, routerId int) (datatypes.Container_Product_Order_Virtual_DedicatedHost, error)

plugin/managers/dns.go

@@ -19,7 +19,7 @@ const (
 )
 
 // Manage SoftLayer DNS.
-// See product information here: http://www.softlayer.com/DOMAIN-SERVICES
+//counterfeiter:generate -o ../testhelpers/ . DNSManager
 type DNSManager interface {
 	GetZoneIdFromName(zoneName string) (int, error)
 	ListZones() ([]datatypes.Dns_Domain, error)

plugin/managers/email.go

@@ -9,6 +9,7 @@ import (
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
 )
 
+//counterfeiter:generate -o ../testhelpers/ . EmailManager
 type EmailManager interface {
 	GetNetworkMessageDeliveryAccounts(mask string) ([]datatypes.Network_Message_Delivery_Email_Sendgrid, error)
 	GetAccountOverview(emailId int) (datatypes.Container_Network_Message_Delivery_Email_Sendgrid_Account, error)