fix remarks

.github/workflows/integration_test.yml

@@ -1,3 +1,5 @@
+name: integration
+
 on:
   push:
     branches: [ master, dev ]
@@ -29,7 +31,13 @@ jobs:
       - name: Run tests
         env:
           NAMESPACE: ${{ matrix.namespace }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
+          make build
+
+          VERSION=$(cat ./version.txt)
+          docker build -t weaveworks/policy-agent:${VERSION} .
+
           cd integration
           bash deploy.sh
           go test -v ./...

Makefile

@@ -73,7 +73,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 -v ./... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v ./internal/... ./controllers/... ./pkg/... -coverprofile cover.out
 
 ##@ Build
 

integration/deploy.sh

@@ -2,6 +2,8 @@ echo "[*] Creating test cluster ..."
 kind delete cluster --name test
 kind create cluster --name test
 
+kind load docker-image weaveworks/policy-agent:${VERSION} --name test
+
 kubectl create namespace flux-system
 
 echo "[*] Installing cert-manager ..."
@@ -18,4 +20,3 @@ kubectl apply -f data/state
 
 echo "[*] Installing policy agent helm chart on namespace ${NAMESPACE} ..."
 helm install policy-agent ../helm -n ${NAMESPACE} -f ../helm/values.yaml -f data/values.yaml --create-namespace --wait --timeout 60s
-

integration/test_test.go

@@ -3,6 +3,8 @@ package integration
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -22,8 +24,12 @@ const (
 	missingOwnerLabelPolicy          = "weave.policies.missing-owner-label"
 )
 
-func TestA(t *testing.T) {
-	config, err := clientcmd.BuildConfigFromFlags("", "/home/ahsayde/.kube/config")
+func TestIntegration(t *testing.T) {
+	homeDir, err := os.UserHomeDir()
+	assert.Nil(t, err)
+
+	kubeConfigPath := filepath.Join(homeDir, ".kube", "config")
+	config, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
 	if err != nil {
 		panic(err)
 	}
@@ -45,9 +51,7 @@ func TestA(t *testing.T) {
 		}
 
 		policies, err := listPolicies(ctx, cl)
-		if err != nil {
-			t.Fatal(err)
-		}
+		assert.Nil(t, err)
 
 		assert.Equal(t, len(policies.Items), 3)
 
@@ -66,9 +70,7 @@ func TestA(t *testing.T) {
 		}
 
 		events, err := listViolationEvents(ctx, cl, opts)
-		if err != nil {
-			t.Fatal(err)
-		}
+		assert.Nil(t, err)
 
 		assert.Equal(t, len(events.Items), 4)
 
@@ -86,9 +88,7 @@ func TestA(t *testing.T) {
 
 	t.Run("check admission results", func(t *testing.T) {
 		err := kubectl("apply", "-f", "data/resources/admission_test_resources.yaml")
-		if err == nil {
-			t.Error(err)
-		}
+		assert.NotNil(t, err)
 
 		time.Sleep(2 * time.Second)
 

internal/terraform/terraform.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	TypeTerraform = "Terraform"
+	TypeTFAdmission = "TFAdmission"
 )
 
 type Response struct {

main.go

@@ -388,7 +388,7 @@ func main() {
 			validator := validation.NewOPAValidator(
 				policiesSource,
 				false,
-				terraform.TypeTerraform,
+				terraform.TypeTFAdmission,
 				config.AccountID,
 				config.ClusterID,
 				terraformSinks...,