shared template repo to pkg

Shared template repo in pkg

Author: petar-cvit

cyclops-ctrl/Makefile

@@ -162,7 +162,7 @@ local-redis:
 	docker-compose up --detach
 
 group-imports:
-	goimports-reviser -recursive -file-path .
+	goimports -w .
 
 unit-test:
 	go test -v -tags musl,dynamic ./...

cyclops-ctrl/cmd/main/main.go

@@ -3,11 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/git"
 	"os"
 	"strconv"
 	"time"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/git"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/auth"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template/cache"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template/render"
+
 	_ "github.com/joho/godotenv/autoload"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -20,15 +25,11 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/auth"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/handler"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/integrations/helm"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/modulecontroller"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/prometheus"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/telemetry"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template/cache"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template/render"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 
 	cyclopsv1alpha1 "github.com/cyclops-ui/cyclops/cyclops-ctrl/api/v1alpha1"

cyclops-ctrl/cmd/sandbox/main.go

@@ -5,12 +5,14 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"k8s.io/client-go/kubernetes/scheme"
 	"os"
 	"path/filepath"
 
+	"k8s.io/client-go/kubernetes/scheme"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+
 	//"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/remotecommand"

cyclops-ctrl/internal/controller/helm.go

@@ -2,6 +2,9 @@ package controller
 
 import (
 	"fmt"
+	"net/http"
+	"sort"
+
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/integrations/helm"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/mapper"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models"
@@ -10,8 +13,6 @@ import (
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/telemetry"
 	json "github.com/json-iterator/go"
 	"helm.sh/helm/v3/pkg/chartutil"
-	"net/http"
-	"sort"
 
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 	"github.com/gin-gonic/gin"

cyclops-ctrl/internal/controller/modules.go

@@ -9,6 +9,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template"
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template/render"
+
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/git"
 
 	"sigs.k8s.io/yaml"
@@ -20,8 +23,6 @@ import (
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/prometheus"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/telemetry"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template/render"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

cyclops-ctrl/internal/controller/sse/resources.go

@@ -1,11 +1,12 @@
 package sse
 
 import (
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
 	"io"
 	"net/http"
 	"time"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
+
 	"github.com/pkg/errors"
 
 	"github.com/gin-gonic/gin"

cyclops-ctrl/internal/controller/templates.go

@@ -4,14 +4,15 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/template"
+
 	"github.com/gin-gonic/gin"
 	json "github.com/json-iterator/go"
 
 	cyclopsv1alpha1 "github.com/cyclops-ui/cyclops/cyclops-ctrl/api/v1alpha1"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/mapper"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/telemetry"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/template"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 )
 

cyclops-ctrl/internal/controller/tests/templates_test.go

@@ -4,6 +4,10 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptest"
+
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/api/v1alpha1"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models"
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
@@ -13,10 +17,7 @@ import (
 	json "github.com/json-iterator/go"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"io"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"net/http"
-	"net/http/httptest"
 
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/controller"
 	k8smocks "github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/mocks"

cyclops-ctrl/internal/controller/ws/server.go

@@ -1,9 +1,10 @@
 package ws
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
-	"net/http"
 
 	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
 )

cyclops-ctrl/internal/git/writeclient.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/go-logr/logr"
 	path2 "path"
 	"text/template"
 	"time"
 
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/auth"
+	"github.com/go-logr/logr"
+
 	cyclopsv1alpha1 "github.com/cyclops-ui/cyclops/cyclops-ctrl/api/v1alpha1"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/auth"
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/memfs"
 	"github.com/go-git/go-git/v5"