Updated with constant for GLOBAL section in INI file.

Author: Joshua Reed

pkg/cloud/client.go

@@ -26,6 +26,8 @@ import (
 
 //go:generate mockgen -destination=../mocks/mock_client.go -package=mocks sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud Client
 
+const GLOBAL = "Global"
+
 type Client interface {
 	VMIface
 	NetworkIface
@@ -55,9 +57,9 @@ func NewClient(ccPath string) (Client, error) {
 	c := &client{config: Config{VerifySSL: true}}
 	if rawCfg, err := ini.Load(ccPath); err != nil {
 		return nil, errors.Wrapf(err, "reading config at path %s", ccPath)
-	} else if g := rawCfg.Section("Global"); len(g.Keys()) == 0 {
+	} else if g := rawCfg.Section(GLOBAL); len(g.Keys()) == 0 {
 		return nil, errors.New("section Global not found")
-	} else if err = rawCfg.Section("Global").StrictMapTo(&c.config); err != nil {
+	} else if err = rawCfg.Section(GLOBAL).StrictMapTo(&c.config); err != nil {
 		return nil, errors.Wrapf(err, "parsing [Global] section from config at path %s", ccPath)
 	}
 

pkg/cloud/cloud_suite_test.go

@@ -31,8 +31,9 @@ import (
 )
 
 var (
-	realCloudClient cloud.Client
-	client          cloud.Client
+	// cloud.Client is our cloud package used to interact with ACS.
+	realCloudClient cloud.Client // Real cloud client is a cloud client connected to a real Apache CloudStack instance.
+	client          cloud.Client // client is simply a pointer to a cloud client object intended to be swapped per test.
 	realCSClient    *cloudstack.CloudStackClient
 	testDomainPath  string // Needed in before and in after suite.
 )

pkg/cloud/isolated_network.go

@@ -247,7 +247,7 @@ func (c *client) GetOrCreateIsolatedNetwork(
 		if err = c.CreateIsolatedNetwork(zone, isoNet); err != nil {
 			return errors.Wrap(err, "creating a new isolated network")
 		}
-	} else {
+	} else { // Network existed and was resolved. Set ID on isoNet CloudStackIsolatedNetwork in case it only had name set.
 		isoNet.Spec.ID = net.ID
 	}
 

test/helpers/client.go

@@ -15,9 +15,9 @@ func NewCSClient() (*cloudstack.CloudStackClient, error) {
 	ccPath := projDir + "/cloud-config"
 	if rawCfg, err := ini.Load(ccPath); err != nil {
 		return nil, errors.Wrapf(err, "reading config at path %s:", ccPath)
-	} else if g := rawCfg.Section("Global"); len(g.Keys()) == 0 {
+	} else if g := rawCfg.Section(cloud.GLOBAL); len(g.Keys()) == 0 {
 		return nil, errors.New("section Global not found")
-	} else if err = rawCfg.Section("Global").StrictMapTo(&conf); err != nil {
+	} else if err = rawCfg.Section(cloud.GLOBAL).StrictMapTo(&conf); err != nil {
 		return nil, errors.Wrapf(err, "parsing [Global] section from config at path %s:", ccPath)
 	}
 	csClient := cloudstack.NewAsyncClient(conf.APIURL, conf.APIKey, conf.SecretKey, conf.VerifySSL)