Merge pull request #41 from pluralsh/fix-ci.yaml

Fix stupid ci issue

Author: michaeljguarino

.github/workflows/ci.yaml

@@ -63,22 +63,22 @@ jobs:
           check-latest: true
       - uses: golangci/[email protected]
         with:
-          version: v2.1.2
-#  publish-debug-docker:
-#    name: Build and push debug kas containers
-#    runs-on: ubuntu-20.04
-#    permissions:
-#      contents: 'read'
-#      id-token: 'write'
-#      packages: 'write'
-#    strategy:
-#      matrix:
-#        image: [kas-debug, agentk-debug]
-#        include:
-#          - image: kas-debug
-#            dockerfile: ./build/docker/kas.debug.Dockerfile
-#          - image: agentk-debug
-#            dockerfile: ./build/docker/agentk.debug.Dockerfile
+          version: v2.4.0
+  publish-debug-docker:
+    name: Build and push debug kas containers
+    runs-on: ubuntu-latest
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+      packages: 'write'
+    strategy:
+      matrix:
+        image: [kas-debug, agentk-debug]
+        include:
+          - image: kas-debug
+            dockerfile: ./build/docker/kas.debug.Dockerfile
+          - image: agentk-debug
+            dockerfile: ./build/docker/agentk.debug.Dockerfile
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Makefile

@@ -124,32 +124,43 @@ codegen-delete: ## delete generated files
 .PHONY: --mocks
 --mocks:
 	@PATH="${PATH}:$(shell pwd)/build" go generate -x -v \
-		"github.com/pluralsh/kuberentes-agent/cmd/agentk/agentkapp" \
-		"github.com/pluralsh/kuberentes-agent/cmd/kas/kasapp" \
-		"github.com/pluralsh/kuberentes-agent/pkg/module/modagent" \
-		"github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/tunnel" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/redistool" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_agent_registrar" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_agent_tracker" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_cache" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_k8s" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_kubernetes_api" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modagent" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modserver" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modshared" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_redis" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_reverse_tunnel_rpc" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_reverse_tunnel_tunnel" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_rpc" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_stdlib" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_tool" \
-		"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_usage_metrics"
+		"github.com/pluralsh/kubernetes-agent/cmd/agentk/agentkapp" \
+		"github.com/pluralsh/kubernetes-agent/cmd/kas/kasapp" \
+		"github.com/pluralsh/kubernetes-agent/pkg/module/modagent" \
+		"github.com/pluralsh/kubernetes-agent/pkg/module/reverse_tunnel/tunnel" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/redistool" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_agent_registrar" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_agent_tracker" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_cache" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_k8s" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_kubernetes_api" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_modagent" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_modserver" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_modshared" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_redis" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_reverse_tunnel_rpc" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_reverse_tunnel_tunnel" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_rpc" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_stdlib" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_tool" \
+		"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_usage_metrics"
 
 ##@ Tests
 
 .PHONY: test
-test: ## run tests
-	go test ./... -v
+test: tools ## run tests
+	gotestsum --format pkgname -- ./... -v \
+		-race -v -tags="cache"
+
+.PHONY: tools
+tools: ## install required tools
+tools: --tool
+
+.PHONY: --tool
+%--tool: TOOL = .*
+--tool: # INTERNAL: installs tool with name provided via $(TOOL) variable or all tools.
+	@cat tools.go | grep _ | awk -F'"' '$$2 ~ /$(TOOL)/ {print $$2}' | xargs -I {} go install {}
+
 
 .PHONY: lint
 lint: --ensure-tools ## run linters

build/include/config.mk

@@ -21,9 +21,9 @@ ifeq ($(GIT_TAG), )
 	GIT_TAG = v0.0.0
 endif
 
-LDFLAGS := -X "github.com/pluralsh/kuberentes-agent/cmd.Version=$(GIT_TAG)"
-LDFLAGS += -X "github.com/pluralsh/kuberentes-agent/cmd.Commit=$(GIT_COMMIT)"
-LDFLAGS += -X "github.com/pluralsh/kuberentes-agent/cmd.BuildTime=$(BUILD_TIME)"
+LDFLAGS := -X "github.com/pluralsh/kubernetes-agent/cmd.Version=$(GIT_TAG)"
+LDFLAGS += -X "github.com/pluralsh/kubernetes-agent/cmd.Commit=$(GIT_COMMIT)"
+LDFLAGS += -X "github.com/pluralsh/kubernetes-agent/cmd.BuildTime=$(BUILD_TIME)"
 
 .PHONY: --certificate
 --certificate: --secrets --kubeconfig

cmd/agentk/agentkapp/api.go

@@ -7,9 +7,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/errz"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/logz"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/errz"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/grpctool"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/logz"
 )
 
 // agentAPI is an implementation of modagent.API.

cmd/agentk/agentkapp/app.go

@@ -16,26 +16,26 @@ import (
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
 	"go.opentelemetry.io/otel/trace/noop"
 
-	"github.com/pluralsh/kuberentes-agent/cmd"
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/api"
-	"github.com/pluralsh/kuberentes-agent/pkg/entity"
-	rpc2 "github.com/pluralsh/kuberentes-agent/pkg/module/agent_configuration/rpc"
-	agent_registrar_agent "github.com/pluralsh/kuberentes-agent/pkg/module/agent_registrar/agent"
-	kubernetes_api_agent "github.com/pluralsh/kuberentes-agent/pkg/module/kubernetes_api/agent"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
-	observability_agent "github.com/pluralsh/kuberentes-agent/pkg/module/observability/agent"
-	reverse_tunnel_agent "github.com/pluralsh/kuberentes-agent/pkg/module/reverse_tunnel/agent"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/errz"
-	grpctool2 "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/httpz"
-	logz2 "github.com/pluralsh/kuberentes-agent/pkg/tool/logz"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/mathz"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/metric"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/retry"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/tlstool"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/wstunnel"
+	"github.com/pluralsh/kubernetes-agent/cmd"
+	"github.com/pluralsh/kubernetes-agent/pkg/agentcfg"
+	"github.com/pluralsh/kubernetes-agent/pkg/api"
+	"github.com/pluralsh/kubernetes-agent/pkg/entity"
+	rpc2 "github.com/pluralsh/kubernetes-agent/pkg/module/agent_configuration/rpc"
+	agent_registrar_agent "github.com/pluralsh/kubernetes-agent/pkg/module/agent_registrar/agent"
+	kubernetes_api_agent "github.com/pluralsh/kubernetes-agent/pkg/module/kubernetes_api/agent"
+	"github.com/pluralsh/kubernetes-agent/pkg/module/modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/module/modshared"
+	observability_agent "github.com/pluralsh/kubernetes-agent/pkg/module/observability/agent"
+	reverse_tunnel_agent "github.com/pluralsh/kubernetes-agent/pkg/module/reverse_tunnel/agent"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/errz"
+	grpctool2 "github.com/pluralsh/kubernetes-agent/pkg/tool/grpctool"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/httpz"
+	logz2 "github.com/pluralsh/kubernetes-agent/pkg/tool/logz"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/mathz"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/metric"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/retry"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/tlstool"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/wstunnel"
 
 	"github.com/coder/websocket"
 	"github.com/prometheus/client_golang/prometheus"

cmd/agentk/agentkapp/app_internal_server.go

@@ -14,10 +14,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	modagent2 "github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modshared"
-	grpctool2 "github.com/pluralsh/kuberentes-agent/pkg/tool/grpctool"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/logz"
+	modagent2 "github.com/pluralsh/kubernetes-agent/pkg/module/modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/module/modshared"
+	grpctool2 "github.com/pluralsh/kubernetes-agent/pkg/tool/grpctool"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/logz"
 )
 
 type internalServer struct {

cmd/agentk/agentkapp/doc.go

@@ -1,3 +1,3 @@
 package agentkapp
 
-//go:generate mockgen.sh  -destination "mock_for_test.go" -package "agentkapp" "github.com/pluralsh/kuberentes-agent/cmd/agentk/agentkapp" "Runner,LeaderElector"
+//go:generate mockgen.sh  -destination "mock_for_test.go" -package "agentkapp" "github.com/pluralsh/kubernetes-agent/cmd/agentk/agentkapp" "Runner,LeaderElector"

cmd/agentk/agentkapp/leader_election_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/agentcfg"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_modagent"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

cmd/agentk/agentkapp/leader_module_wrapper.go

@@ -3,8 +3,8 @@ package agentkapp
 import (
 	"context"
 
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/agentcfg"
+	"github.com/pluralsh/kubernetes-agent/pkg/module/modagent"
 
 	"k8s.io/apimachinery/pkg/util/wait"
 )

cmd/agentk/agentkapp/leader_module_wrapper_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pluralsh/kuberentes-agent/pkg/agentcfg"
-	"github.com/pluralsh/kuberentes-agent/pkg/module/modagent"
-	"github.com/pluralsh/kuberentes-agent/pkg/tool/testing/mock_modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/agentcfg"
+	"github.com/pluralsh/kubernetes-agent/pkg/module/modagent"
+	"github.com/pluralsh/kubernetes-agent/pkg/tool/testing/mock_modagent"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"