From 2f261647dd6931291a6646331ccea9f1eeaf1a54 Mon Sep 17 00:00:00 2001 From: Raj Babu Das Date: Mon, 14 Sep 2020 20:31:39 +0530 Subject: [PATCH] Changing dir of subscriber (#1947) * Directory restructuring subscriber Signed-off-by: Raj Babu Das --- .circleci/config.yml | 2 +- litmus-portal/Makefile | 9 +++++++++ .../subscriber/build/Dockerfile | 0 .../{backend => cluster-agents}/subscriber/go.mod | 2 +- .../{backend => cluster-agents}/subscriber/go.sum | 0 .../subscriber/pkg/cluster/events/util.go | 2 +- .../subscriber/pkg/cluster/events/workflow.go | 4 ++-- .../subscriber/pkg/cluster/logs/pod.go | 2 +- .../subscriber/pkg/gql/mutations.go | 2 +- .../subscriber/pkg/gql/subscriptions.go | 6 +++--- .../subscriber/pkg/gql/util.go | 4 ++-- .../subscriber/pkg/k8s/client.go | 0 .../subscriber/pkg/k8s/operations.go} | 9 ++++----- .../subscriber/pkg/types/connect.go | 0 .../subscriber/pkg/types/event.go | 0 .../subscriber/pkg/types/log.go | 0 .../subscriber/subscriber.go | 14 ++++++-------- 17 files changed, 31 insertions(+), 25 deletions(-) rename litmus-portal/{backend => cluster-agents}/subscriber/build/Dockerfile (100%) rename litmus-portal/{backend => cluster-agents}/subscriber/go.mod (96%) rename litmus-portal/{backend => cluster-agents}/subscriber/go.sum (100%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/cluster/events/util.go (96%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/cluster/events/workflow.go (96%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/cluster/logs/pod.go (90%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/gql/mutations.go (97%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/gql/subscriptions.go (89%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/gql/util.go (94%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/k8s/client.go (100%) rename litmus-portal/{backend/subscriber/pkg/cluster/operations/cluster.go => cluster-agents/subscriber/pkg/k8s/operations.go} (94%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/types/connect.go (100%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/types/event.go (100%) rename litmus-portal/{backend => cluster-agents}/subscriber/pkg/types/log.go (100%) rename litmus-portal/{backend => cluster-agents}/subscriber/subscriber.go (73%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bc6ad315..2dd329098 100644 --- a/.circleci/config.yml +++ b/.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} diff --git a/litmus-portal/Makefile b/litmus-portal/Makefile index 2abc941bd..c108dedc7 100644 --- a/litmus-portal/Makefile +++ b/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 diff --git a/litmus-portal/backend/subscriber/build/Dockerfile b/litmus-portal/cluster-agents/subscriber/build/Dockerfile similarity index 100% rename from litmus-portal/backend/subscriber/build/Dockerfile rename to litmus-portal/cluster-agents/subscriber/build/Dockerfile diff --git a/litmus-portal/backend/subscriber/go.mod b/litmus-portal/cluster-agents/subscriber/go.mod similarity index 96% rename from litmus-portal/backend/subscriber/go.mod rename to litmus-portal/cluster-agents/subscriber/go.mod index fb176ea7f..0a17d6f4e 100644 --- a/litmus-portal/backend/subscriber/go.mod +++ b/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 diff --git a/litmus-portal/backend/subscriber/go.sum b/litmus-portal/cluster-agents/subscriber/go.sum similarity index 100% rename from litmus-portal/backend/subscriber/go.sum rename to litmus-portal/cluster-agents/subscriber/go.sum diff --git a/litmus-portal/backend/subscriber/pkg/cluster/events/util.go b/litmus-portal/cluster-agents/subscriber/pkg/cluster/events/util.go similarity index 96% rename from litmus-portal/backend/subscriber/pkg/cluster/events/util.go rename to litmus-portal/cluster-agents/subscriber/pkg/cluster/events/util.go index dcefa6156..9075280d8 100644 --- a/litmus-portal/backend/subscriber/pkg/cluster/events/util.go +++ b/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" diff --git a/litmus-portal/backend/subscriber/pkg/cluster/events/workflow.go b/litmus-portal/cluster-agents/subscriber/pkg/cluster/events/workflow.go similarity index 96% rename from litmus-portal/backend/subscriber/pkg/cluster/events/workflow.go rename to litmus-portal/cluster-agents/subscriber/pkg/cluster/events/workflow.go index bd6fb8b94..f3517a12d 100644 --- a/litmus-portal/backend/subscriber/pkg/cluster/events/workflow.go +++ b/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/backend/subscriber/pkg/types" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/k8s" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types" "github.com/sirupsen/logrus" "k8s.io/client-go/tools/cache" ) diff --git a/litmus-portal/backend/subscriber/pkg/cluster/logs/pod.go b/litmus-portal/cluster-agents/subscriber/pkg/cluster/logs/pod.go similarity index 90% rename from litmus-portal/backend/subscriber/pkg/cluster/logs/pod.go rename to litmus-portal/cluster-agents/subscriber/pkg/cluster/logs/pod.go index f792a7d15..ea343866e 100644 --- a/litmus-portal/backend/subscriber/pkg/cluster/logs/pod.go +++ b/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" diff --git a/litmus-portal/backend/subscriber/pkg/gql/mutations.go b/litmus-portal/cluster-agents/subscriber/pkg/gql/mutations.go similarity index 97% rename from litmus-portal/backend/subscriber/pkg/gql/mutations.go rename to litmus-portal/cluster-agents/subscriber/pkg/gql/mutations.go index 45d8d23be..b06d986e9 100644 --- a/litmus-portal/backend/subscriber/pkg/gql/mutations.go +++ b/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" ) diff --git a/litmus-portal/backend/subscriber/pkg/gql/subscriptions.go b/litmus-portal/cluster-agents/subscriber/pkg/gql/subscriptions.go similarity index 89% rename from litmus-portal/backend/subscriber/pkg/gql/subscriptions.go rename to litmus-portal/cluster-agents/subscriber/pkg/gql/subscriptions.go index 4fc815e94..84796e73d 100644 --- a/litmus-portal/backend/subscriber/pkg/gql/subscriptions.go +++ b/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/backend/subscriber/pkg/types" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/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") } diff --git a/litmus-portal/backend/subscriber/pkg/gql/util.go b/litmus-portal/cluster-agents/subscriber/pkg/gql/util.go similarity index 94% rename from litmus-portal/backend/subscriber/pkg/gql/util.go rename to litmus-portal/cluster-agents/subscriber/pkg/gql/util.go index 0e5066565..7a3136f09 100644 --- a/litmus-portal/backend/subscriber/pkg/gql/util.go +++ b/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/backend/subscriber/pkg/types" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/cluster/logs" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/types" ) // process event data into proper format acceptable by gql diff --git a/litmus-portal/backend/subscriber/pkg/k8s/client.go b/litmus-portal/cluster-agents/subscriber/pkg/k8s/client.go similarity index 100% rename from litmus-portal/backend/subscriber/pkg/k8s/client.go rename to litmus-portal/cluster-agents/subscriber/pkg/k8s/client.go diff --git a/litmus-portal/backend/subscriber/pkg/cluster/operations/cluster.go b/litmus-portal/cluster-agents/subscriber/pkg/k8s/operations.go similarity index 94% rename from litmus-portal/backend/subscriber/pkg/cluster/operations/cluster.go rename to litmus-portal/cluster-agents/subscriber/pkg/k8s/operations.go index 446044392..4c3e56056 100644 --- a/litmus-portal/backend/subscriber/pkg/cluster/operations/cluster.go +++ b/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 } diff --git a/litmus-portal/backend/subscriber/pkg/types/connect.go b/litmus-portal/cluster-agents/subscriber/pkg/types/connect.go similarity index 100% rename from litmus-portal/backend/subscriber/pkg/types/connect.go rename to litmus-portal/cluster-agents/subscriber/pkg/types/connect.go diff --git a/litmus-portal/backend/subscriber/pkg/types/event.go b/litmus-portal/cluster-agents/subscriber/pkg/types/event.go similarity index 100% rename from litmus-portal/backend/subscriber/pkg/types/event.go rename to litmus-portal/cluster-agents/subscriber/pkg/types/event.go diff --git a/litmus-portal/backend/subscriber/pkg/types/log.go b/litmus-portal/cluster-agents/subscriber/pkg/types/log.go similarity index 100% rename from litmus-portal/backend/subscriber/pkg/types/log.go rename to litmus-portal/cluster-agents/subscriber/pkg/types/log.go diff --git a/litmus-portal/backend/subscriber/subscriber.go b/litmus-portal/cluster-agents/subscriber/subscriber.go similarity index 73% rename from litmus-portal/backend/subscriber/subscriber.go rename to litmus-portal/cluster-agents/subscriber/subscriber.go index 99c7ceba6..f2258ece3 100644 --- a/litmus-portal/backend/subscriber/subscriber.go +++ b/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/backend/subscriber/pkg/cluster/operations" - + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/cluster/events" "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/backend/subscriber/pkg/k8s" + "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/subscriber/pkg/gql" + "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") }