Merge pull request #21 from Smirl/better-tests

Better tests

Author: Smirl

.github/workflows/test.yaml

@@ -0,0 +1,22 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Run tests
+        run: make test

.gitignore

@@ -23,3 +23,5 @@ testbin
 *.swp
 *.swo
 *~
+
+.vscode/

Makefile

@@ -57,7 +57,7 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out -test.v
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out -test.v -ginkgo.v
 
 ##@ Build
 

controllers/digitalocean/floatingipbinding_controller_test.go

@@ -17,18 +17,62 @@ limitations under the License.
 package digitalocean
 
 import (
+	"time"
+
+	"github.com/digitalocean/godo"
+	"github.com/jarcoal/httpmock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	digitaloceanv1beta1 "github.com/smirl/digitalocean-floating-ip-controller/apis/digitalocean/v1beta1"
 )
 
+type floatingIPRoot struct {
+	FloatingIP *godo.FloatingIP `json:"floating_ip"`
+}
+type actionRoot struct {
+	Event *godo.Action `json:"action"`
+}
+
+const TestIP string = "1.2.3.4"
+
+var (
+	node1 = v1.Node{
+		ObjectMeta: metav1.ObjectMeta{Name: "node1"},
+		Spec:       v1.NodeSpec{ProviderID: "digitalocean://12345678"},
+	}
+	getResponseUnassigned = floatingIPRoot{
+		FloatingIP: &godo.FloatingIP{IP: TestIP},
+	}
+	// getResponseAssigned = floatingIPRoot{
+	// 	FloatingIP: &godo.FloatingIP{IP: TestIP, Droplet: &godo.Droplet{ID: 12345678}},
+	// }
+	assignResponse = actionRoot{Event: &godo.Action{}}
+)
+
 var _ = Context("Floating IP Controller", func() {
 
 	Describe("when a new resources is created", func() {
-		It("should create a floating ip", func() {
+		It("should assign a floating ip to a node", func() {
+
+			By("Adding Node")
+			Expect(k8sClient.Create(ctx, &node1)).Should(Succeed(), "failed to create test binding")
+
+			By("Adding httpmocks")
+			httpmock.RegisterResponder(
+				"GET",
+				"/v2/floating_ips/1.2.3.4",
+				httpmock.NewJsonResponderOrPanic(200, getResponseUnassigned),
+			)
+			httpmock.RegisterResponder(
+				"POST",
+				"/v2/floating_ips/1.2.3.4/actions",
+				httpmock.NewJsonResponderOrPanic(200, assignResponse),
+			)
+
 			By("Creating a binding")
 			key := client.ObjectKey{
 				Name:      "floatingipbinding-sample",
@@ -44,7 +88,19 @@ var _ = Context("Floating IP Controller", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, binding)).Should(Succeed(), "failed to create test binding")
+			Expect(httpmock.GetCallCountInfo()).To(HaveLen(2))
+
+			By("Checking the status has updated")
+			Eventually(
+				func() bool {
+					binding := &digitaloceanv1beta1.FloatingIPBinding{}
+					Expect(k8sClient.Get(ctx, key, binding)).Should(Succeed(), "failed to get binding")
+					return binding.Status.AssignedDropletName == "node1" && binding.Status.AssignedDropletID == 12345678
+				},
+				time.Second*1, time.Millisecond*100,
+			).Should(BeTrue(), "Certificate should be set")
 		})
+
 	})
 
 })

controllers/digitalocean/suite_test.go

@@ -72,7 +72,7 @@ var _ = BeforeSuite(func() {
 
 	//+kubebuilder:scaffold:scheme
 
-	httpClient := http.Client{Transport: http.DefaultTransport.(*http.Transport).Clone()}
+	httpClient := http.Client{Transport: &http.Transport{}}
 	httpmock.ActivateNonDefault(&httpClient)
 	doClient := godo.NewClient(&httpClient)