adding more refactoring and unit tests

Author: PatrickLaabs

.github/workflows/gotest-cover.yml

@@ -0,0 +1,29 @@
+name: golangci-lint
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+# Remove all permissions from GH_TOKEN except metadata.
+permissions: {}
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        working-directory:
+          - ""
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # tag=v4.1.6
+      - name: Calculate go version
+        id: vars
+        run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
+      - name: Set up Go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
+        with:
+          go-version: ${{ steps.vars.outputs.go_version }}
+      - name: Go Tests with coverage
+        run: |
+          make test-cover

Makefile

@@ -230,8 +230,8 @@ CAPI_KIND_CLUSTER_NAME ?= capi-test
 
 # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
 
-# Next release is: v0.3.2
-TAG ?= v0.3.2-preview.53
+# Next release is: v1.0.0-preview
+TAG ?= v1.0.0-preview
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64
 

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.53
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview
         name: manager

config/default/manager_image_patch.yaml-e

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.53
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview
         name: manager

controllers/cdk8sappproxy/cdk8sappproxy_git_operator.go

@@ -35,7 +35,7 @@ func (r *Reconciler) prepareSource(ctx context.Context, cdk8sAppProxy *addonsv1a
 			logger.Error(err, addonsv1alpha1.GitCloneFailedCondition, "Failed to clone git repository")
 		}
 
-		retrieveCommitHash, err := gitImpl.Hash(tempDir)
+		retrieveCommitHash, err := gitImpl.Hash(tempDir, cdk8sAppProxy.Spec.GitRepository.Reference)
 		if err != nil {
 			logger.Error(err, addonsv1alpha1.GitHashFailureReason, "Failed to get local git hash")
 		}

controllers/cdk8sappproxy/git/git.go

@@ -14,7 +14,7 @@ import (
 type GitOperator interface {
 	Clone(repoUrl string, directory string, writer *bytes.Buffer) (err error)
 	Poll(repo string, branch string, directory string, writer *bytes.Buffer) (changes bool, err error)
-	Hash(repo string) (hash string, err error)
+	Hash(repo string, branch string) (hash string, err error)
 }
 
 // GitImplementer implements the GitOperator interface.
@@ -54,15 +54,15 @@ func (g *GitImplementer) Poll(repo string, branch string, directory string, writ
 	}
 
 	// Get hash from local repo.
-	localHash, err := g.Hash(directory)
+	localHash, err := g.Hash(directory, branch)
 	if err != nil {
 		fmt.Fprintf(writer, "localGitHash error")
 
 		return changes, err
 	}
 
 	// Get Hash from remote repo
-	remoteHash, err := g.Hash(repo)
+	remoteHash, err := g.Hash(repo, branch)
 	if err != nil {
 		fmt.Fprintf(writer, "remoteGitHash error")
 
@@ -79,11 +79,7 @@ func (g *GitImplementer) Poll(repo string, branch string, directory string, writ
 }
 
 // Hash retrieves the hash of the given repository.
-func (g *GitImplementer) Hash(repo string) (hash string, err error) {
-	//cdk8sAppProxy := &addonsv1alpha1.Cdk8sAppProxy{}
-	//branch := cdk8sAppProxy.Spec.GitRepository.Reference
-	branch := "main"
-
+func (g *GitImplementer) Hash(repo string, branch string) (hash string, err error) {
 	switch {
 	case isUrl(repo):
 		remoterepo := git.NewRemote(nil, &config.RemoteConfig{