Changing dir of subscriber (#1947)

* Directory restructuring subscriber

Signed-off-by: Raj Babu Das <raj.das@mayadata.io>

.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
       - run:
           name: Build subscriber docker image
           command: docker build . -f build/Dockerfile -t ${REPONAME}/${SUBSCRIBER_IMAGE}:${IMGTAG}
-          working_directory: ~/project/litmus-portal/backend/subscriber
+          working_directory: ~/project/litmus-portal/cluster-agents/subscriber
       - run:
           name: Save subscriber docker image
           command: docker save -o /tmp/workspace/${SUBSCRIBER_IMAGE}.tar ${REPONAME}/${SUBSCRIBER_IMAGE}:${IMGTAG}

litmus-portal/Makefile

@@ -87,3 +87,12 @@ backend-services-checks:
 		&& echo "Please ensure you are using $$($(GO) version) for formatting code" \
 		&& exit 1; \
 	fi
+	@echo "------------------"
+	@echo "--> Check litmus-portal subscriber [go mod tidy]"
+	@echo "------------------"
+	@tidyRes=$$(cd cluster-agents/subscriber && go mod tidy); \
+	if [ -n "$${tidyRes}" ]; then \
+		echo "go mod tidy checking failed!" && echo "$${tidyRes}" \
+		&& echo "Please ensure you are using $$($(GO) version) for formatting code" \
+		&& exit 1; \
+	fi

litmus-portal/cluster-agents/subscriber/go.mod

@@ -1,4 +1,4 @@
-module github.com/litmuschaos/litmus/litmus-portal/backend/subscriber
+module github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber
 
 go 1.14
 

litmus-portal/cluster-agents/subscriber/pkg/cluster/events/util.go

@@ -7,7 +7,7 @@ import (
 
 	v1alpha13 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	v1alpha12 "github.com/litmuschaos/chaos-operator/pkg/client/clientset/versioned/typed/litmuschaos/v1alpha1"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/serializer/yaml"

litmus-portal/cluster-agents/subscriber/pkg/cluster/events/workflow.go

@@ -7,8 +7,8 @@ import (
 	"github.com/argoproj/argo/pkg/client/clientset/versioned"
 	"github.com/argoproj/argo/pkg/client/informers/externalversions"
 	litmusV1alpha1 "github.com/litmuschaos/chaos-operator/pkg/client/clientset/versioned/typed/litmuschaos/v1alpha1"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/k8s"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/k8s"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/tools/cache"
 )

litmus-portal/cluster-agents/subscriber/pkg/cluster/logs/pod.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/k8s"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/k8s"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"

litmus-portal/cluster-agents/subscriber/pkg/gql/mutations.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
 	"github.com/sirupsen/logrus"
 )
 

litmus-portal/cluster-agents/subscriber/pkg/gql/subscriptions.go

@@ -2,10 +2,10 @@ package gql
 
 import (
 	"encoding/json"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/k8s"
 
 	"github.com/gorilla/websocket"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/cluster/operations"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
 	"github.com/sirupsen/logrus"
 
 	"log"
@@ -85,7 +85,7 @@ func ClusterConnect(clusterData map[string]string) {
 			SendPodLogs(clusterData, podRequest)
 		} else if strings.Index("create update delete get", strings.ToLower(r.Payload.Data.ClusterConnect.Action.RequestType)) >= 0 {
 			logrus.Print("WORKFLOW REQUEST ", r.Payload.Data.ClusterConnect.Action)
-			_, err = operations.ClusterOperations(r.Payload.Data.ClusterConnect.Action.K8SManifest, r.Payload.Data.ClusterConnect.Action.RequestType)
+			_, err = k8s.ClusterOperations(r.Payload.Data.ClusterConnect.Action.K8SManifest, r.Payload.Data.ClusterConnect.Action.RequestType)
 			if err != nil {
 				logrus.WithError(err).Fatal("error performing cluster operation")
 			}

litmus-portal/cluster-agents/subscriber/pkg/gql/util.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/cluster/logs"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/cluster/logs"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
 )
 
 // process event data into proper format acceptable by gql

litmus-portal/cluster-agents/subscriber/pkg/k8s/operations.go

@@ -1,4 +1,4 @@
-package operations
+package k8s
 
 import (
 	"context"
@@ -6,7 +6,6 @@ import (
 	"log"
 
 	yaml_converter "github.com/ghodss/yaml"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/k8s"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -32,7 +31,7 @@ var (
 
 // IsClusterConfirmed checks if the config map with "is_cluster_confirmed" is true or not.
 func IsClusterConfirmed(clusterData map[string]string) (bool, string, error) {
-	clientset, err := k8s.GetGenericK8sClient()
+	clientset, err := GetGenericK8sClient()
 	if err != nil {
 		return false, "", err
 	}
@@ -51,7 +50,7 @@ func IsClusterConfirmed(clusterData map[string]string) (bool, string, error) {
 
 // ClusterRegister function creates litmus-portal config map in the litmus namespace
 func ClusterRegister(clusterData map[string]string) (bool, error) {
-	clientset, err := k8s.GetGenericK8sClient()
+	clientset, err := GetGenericK8sClient()
 	if err != nil {
 		return false, err
 	}
@@ -148,7 +147,7 @@ func ClusterOperations(manifest string, requestType string) (*unstructured.Unstr
 	}
 
 	// Getting dynamic and discovery client
-	discoveryClient, dynamicClient, err := k8s.GetDynamicAndDiscoveryClient()
+	discoveryClient, dynamicClient, err := GetDynamicAndDiscoveryClient()
 	if err != nil {
 		return nil, err
 	}

litmus-portal/cluster-agents/subscriber/subscriber.go

@@ -5,16 +5,14 @@ import (
 	"flag"
 	"os/signal"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/cluster/events"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/cluster/events"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/cluster/operations"
-
 	"log"
 	"os"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/types"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types"
 
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/gql"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/gql"
-	"github.com/litmuschaos/litmus/litmus-portal/backend/subscriber/pkg/k8s"
+	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/k8s"
 )
 
 var (
@@ -32,7 +30,7 @@ func init() {
 	flag.Parse()
 
 	var isConfirmed bool
-	isConfirmed, newKey, err = operations.IsClusterConfirmed(clusterData)
+	isConfirmed, newKey, err = k8s.IsClusterConfirmed(clusterData)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -55,7 +53,7 @@ func init() {
 		if responseInterface.Data.ClusterConfirm.IsClusterConfirmed == true {
 			log.Println("cluster confirmed")
 			clusterData["KEY"] = responseInterface.Data.ClusterConfirm.NewClusterKey
-			operations.ClusterRegister(clusterData)
+			k8s.ClusterRegister(clusterData)
 		} else {
 			log.Fatal("Cluster not confirmed")
 		}