Merge branch 'main' into feature/network-tags

Author: mrog

.gitignore

@@ -7,6 +7,9 @@
 bin
 testbin/*
 
+pkg/mocks/*
+!pkg/mocks/.keep
+
 # Various build/test artifacts.
 .tiltbuild
 *log

Makefile

@@ -74,7 +74,7 @@ api/%/zz_generated.deepcopy.go: bin/controller-gen $(DEEPCOPY_GEN_INPUTS)
 
 MANAGER_BIN_INPUTS=$(shell find ./controllers ./api ./pkg -name "*mock*" -prune -o -name "*test*" -prune -o -type f -print) main.go go.mod go.sum
 .PHONY: build
-build: binaries generate-deepcopy manifests release-manifests bin/manager bin/mockgen ## Build manager binary.
+build: binaries generate-mocks generate-deepcopy manifests release-manifests ## Build manager binary.
 bin/manager: $(MANAGER_BIN_INPUTS)
 	go fmt ./...
 	go vet ./...
@@ -170,7 +170,7 @@ test: generate-mocks lint generate-deepcopy bin/ginkgo bin/kubectl bin/kube-apis
 		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
 .PHONY: generate-mocks
-generate-mocks: bin/mockgen $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
+generate-mocks: bin/mockgen pkg/mocks/mock_client.go $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
 pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -print)
 	go generate ./...
 

pkg/cloud/client.go

@@ -46,37 +46,36 @@ type client struct {
 	// csA *cloudstack.CloudStackClient
 }
 
+// cloud-config ini structure.
+type config struct {
+	ApiUrl    string `ini:"api-url"`
+	ApiKey    string `ini:"api-key"`
+	SecretKey string `ini:"secret-key"`
+	VerifySSL bool   `ini:"verify-ssl"`
+}
+
 func NewClient(cc_path string) (Client, error) {
 	c := &client{}
-	apiUrl, apiKey, secretKey, err := readAPIConfig(cc_path)
-	if err != nil {
+	cfg := &config{VerifySSL: true}
+	if rawCfg, err := ini.Load(cc_path); err != nil {
 		return nil, errors.Wrapf(err, "Error encountered while reading config at path: %s", cc_path)
+	} 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(cfg); err != nil {
+		return nil, errors.Wrapf(err, "Error encountered while parsing [Global] section from config at path: %s", cc_path)
 	}
 
 	// This is a placeholder for sending non-blocking requests.
 	// c.csA = cloudstack.NewClient(apiUrl, apiKey, secretKey, false)
 	// TODO: attempt a less clunky client liveliness check (not just listing zones).
-	c.cs = cloudstack.NewAsyncClient(apiUrl, apiKey, secretKey, false)
-	_, err = c.cs.Zone.ListZones(c.cs.Zone.NewListZonesParams())
+	c.cs = cloudstack.NewAsyncClient(cfg.ApiUrl, cfg.ApiKey, cfg.SecretKey, cfg.VerifySSL)
+	_, err := c.cs.Zone.ListZones(c.cs.Zone.NewListZonesParams())
 	if err != nil && strings.Contains(err.Error(), "i/o timeout") {
 		return c, errors.Wrap(err, "Timeout while checking CloudStack API Client connectivity.")
 	}
 	return c, errors.Wrap(err, "Error encountered while checking CloudStack API Client connectivity.")
 }
 
-// CloudStack API config reader.
-func readAPIConfig(cc_path string) (string, string, string, error) {
-	cfg, err := ini.Load(cc_path)
-	if err != nil {
-		return "", "", "", err
-	}
-	g := cfg.Section("Global")
-	if len(g.Keys()) == 0 {
-		return "", "", "", errors.New("section Global not found")
-	}
-	return g.Key("api-url").Value(), g.Key("api-key").Value(), g.Key("secret-key").Value(), err
-}
-
 func NewClientFromCSAPIClient(cs *cloudstack.CloudStackClient) Client {
 	c := &client{cs: cs}
 	return c

pkg/cloud/client_test.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cloud_test
+
+import (
+	"fmt"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"gopkg.in/ini.v1"
+)
+
+// Example cloud-config ini structure.
+type Global struct {
+	ApiUrl    string `ini:"api-url"`
+	VerifySSL bool   `ini:"verify-ssl"`
+}
+
+var _ = Describe("Instance", func() {
+
+	var ()
+
+	BeforeEach(func() {
+		// This test fixture is useful for development, but the actual method of parsing is confinded to the client's
+		// new client method. The parsing used here is more of a schema, and we don't need to test another library's
+		// abilities to parse said schema.
+		Skip("Dev test suite.")
+	})
+
+	AfterEach(func() {
+	})
+
+	Context("When fetching an INI config.", func() {
+		It("Handles the positive case.", func() {
+			cfg := &Global{}
+			rawCfg, err := ini.Load("../../cloud-config")
+			Ω(rawCfg.Section("Global")).ShouldNot(BeNil())
+			fmt.Println(rawCfg.Section("Global"))
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(rawCfg.Section("Global").MapTo(cfg)).Should(Succeed())
+			Ω(cfg.VerifySSL).Should(BeFalse())
+			Ω(cfg.ApiUrl).ShouldNot(BeEmpty())
+		})
+	})
+})

pkg/cloud/helpers_test.go

@@ -38,13 +38,14 @@ const (
 
 var _ = Describe("Helpers", func() {
 
-	It("Gets API configuration", func() {
-		Context("For a configuration with the 'Global' section missing", func() {
+	Context("For a configuration with the 'Global' section missing", func() {
+		It("Gets API configuration", func() {
 			filepath := getConfigPath("cloud-config-no-global")
 
 			client, err := cloud.NewClient(filepath)
+
 			Ω(client).Should(BeNil())
-			Ω(err.Error()).Should(ContainSubstring("section Global not found"))
+			Ω(err.Error()).Should(ContainSubstring("Section Global not found"))
 		})
 	})