refactors kubeclient

sighupio · Jul 9, 2021 · 4cacf94 · 4cacf94
1 parent fb93c40
commit 4cacf94
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/cmd/run-server.go b/cmd/run-server.go
@@ -2,15 +2,13 @@ package main
 
 import (
 	"sighupio/permission-manager/internal/config"
-	"sighupio/permission-manager/internal/kubeclient"
 	"sighupio/permission-manager/internal/server"
 )
 
 func main() {
 	cfg := config.New()
-	kc := kubeclient.New()
 
-	s := server.New(kc, *cfg)
+	s := server.New(*cfg)
 	addr := ":" + cfg.Backend.Port
 	s.Logger.Fatal(s.Start(addr))
 }
diff --git a/internal/kubeconfig/create-kubeconfig_test.go b/internal/kubeconfig/create-kubeconfig_test.go
@@ -3,7 +3,6 @@ package kubeconfig
 import (
 	"context"
 	"sighupio/permission-manager/internal/config"
-	"sighupio/permission-manager/internal/kubeclient"
 	"sighupio/permission-manager/internal/resources"
 	"testing"
 
@@ -18,7 +17,7 @@ func TestCreateKubeconfig(t *testing.T) {
 		ControlPlaneAddress: "https://100.200.10.200",
 	}
 
-	rs := resources.NewResourceService(kubeclient.New(), context.TODO())
+	rs := resources.NewResourceService(resources.NewFakeKubeClient(), context.TODO())
 
 	got := CreateKubeConfigYAMLForUser(rs, clusterConfig, "gino", "pangolier")
 

diff --git a/internal/kubeclient/kubeclient.go → internal/resources/kubeclient.go b/internal/kubeclient/kubeclient.go → internal/resources/kubeclient.go
@@ -1,13 +1,14 @@
-package kubeclient
+package resources
 
 import (
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/fake"
 	"log"
 	runtime "sigs.k8s.io/controller-runtime"
 )
 
-// New returns a kubernetes client already configured
-func New() kubernetes.Interface {
+// NewKubeClient returns a kubernetes client already configured
+func NewKubeClient() kubernetes.Interface {
 	config, err := runtime.GetConfig()
 
 	if err != nil {
@@ -22,3 +23,7 @@ func New() kubernetes.Interface {
 
 	return client
 }
+
+func NewFakeKubeClient() kubernetes.Interface {
+	return fake.NewSimpleClientset()
+}
diff --git a/internal/resources/namespace_test.go b/internal/resources/namespace_test.go
@@ -5,11 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"k8s.io/client-go/kubernetes/fake"
 )
 
 func TestListNamespaces(t *testing.T) {
-	kc := fake.NewSimpleClientset()
+	kc := NewFakeKubeClient()
 	ctx := context.Background()
 
 	svc := NewResourceService(kc, ctx)

diff --git a/internal/server/appcontext.go b/internal/server/appcontext.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"github.com/labstack/echo"
-	"k8s.io/client-go/kubernetes"
 	"net/http"
 	"sighupio/permission-manager/internal/config"
 	"sighupio/permission-manager/internal/resources"
@@ -11,7 +10,6 @@ import (
 // AppContext echo context extended with application specific fields
 type AppContext struct {
 	echo.Context
-	Kubeclient      kubernetes.Interface
 	ResourceService resources.ResourceService
 	Config          config.Config
 }

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -14,17 +14,14 @@ import (
 	_ "sighupio/permission-manager/statik"
 
 	"github.com/rakyll/statik/fs"
-	"k8s.io/client-go/kubernetes"
 )
 
-
-
-func New(kubeclient kubernetes.Interface, cfg config.Config) *echo.Echo {
+func New(cfg config.Config) *echo.Echo {
 	e := echo.New()
 
 	e.Validator = &CustomValidator{validator: validator.New()}
 
-	addMiddlewareStack(e, kubeclient, cfg)
+	addMiddlewareStack(e, cfg)
 
 	addRoutes(e)
 
@@ -36,7 +33,7 @@ func New(kubeclient kubernetes.Interface, cfg config.Config) *echo.Echo {
 	return e
 }
 
-func addMiddlewareStack(e *echo.Echo, kubeclient kubernetes.Interface, cfg config.Config) {
+func addMiddlewareStack(e *echo.Echo, cfg config.Config) {
 	basicAuthPassword := os.Getenv("BASIC_AUTH_PASSWORD")
 
 	if basicAuthPassword == "" {
@@ -62,12 +59,10 @@ func addMiddlewareStack(e *echo.Echo, kubeclient kubernetes.Interface, cfg confi
 
 	e.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
-			context := c.Request().Context()
-			rs := resources.NewResourceService(kubeclient, context)
+			rs := resources.NewResourceService(resources.NewKubeClient(), c.Request().Context())
 
 			customContext := &AppContext{
-				Context: c,
-				Kubeclient:      kubeclient,
+				Context:         c,
 				ResourceService: rs,
 				Config:          cfg,
 			}