Updated imports in authentication and event-tracker (#4077)

* updated imports Signed-off-by: Saranya-jena <saranya.jena@harness.io> * fixed import order Signed-off-by: Saranya-jena <saranya.jena@harness.io> --------- Signed-off-by: Saranya-jena <saranya.jena@harness.io>
litmuschaos · Jul 6, 2023 · e3986e4 · e3986e4
1 parent aae38cd
commit e3986e4
Show file tree

Hide file tree

Showing 32 changed files with 87 additions and 74 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -58,7 +58,7 @@ jobs:
           echo export AUTHENTICATION_SERVER_IMAGE="litmusportal-auth-server" >> env-vars
           echo export FRONTEND_IMAGE="litmusportal-frontend" >> env-vars
           echo export SUBSCRIBER_IMAGE="litmusportal-subscriber" >> env-vars
-          # echo export EVENT_TRACKER="litmusportal-event-tracker" >> env-vars
+          echo export EVENT_TRACKER="litmusportal-event-tracker" >> env-vars
           # echo export UPGRADE_AGENT_CP="upgrade-agent-cp" >> env-vars
           # echo export DEX_SERVER="litmusportal-dex-server" >> env-vars
 

diff --git a/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go b/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go
@@ -2,12 +2,13 @@ package grpc
 
 import (
 	"context"
-	"litmus/litmus-portal/authentication/api/middleware"
-	"litmus/litmus-portal/authentication/api/presenter/protos"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/validations"
 	"strconv"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/middleware"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter/protos"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/validations"
+
 	log "github.com/sirupsen/logrus"
 
 	"github.com/golang-jwt/jwt"

diff --git a/chaoscenter/authentication/api/handlers/grpc/grpc_server.go b/chaoscenter/authentication/api/handlers/grpc/grpc_server.go
@@ -1,8 +1,8 @@
 package grpc
 
 import (
-	"litmus/litmus-portal/authentication/api/presenter/protos"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter/protos"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 )
 
 type ServerGrpc struct {

diff --git a/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go b/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go
@@ -2,13 +2,14 @@ package rest
 
 import (
 	"context"
-	"litmus/litmus-portal/authentication/api/presenter"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/services"
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"net/http"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"

diff --git a/chaoscenter/authentication/api/handlers/rest/misc_handlers.go b/chaoscenter/authentication/api/handlers/rest/misc_handlers.go
@@ -1,8 +1,8 @@
 package rest
 
 import (
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"

diff --git a/chaoscenter/authentication/api/handlers/rest/project_handler.go b/chaoscenter/authentication/api/handlers/rest/project_handler.go
@@ -1,16 +1,17 @@
 package rest
 
 import (
-	"litmus/litmus-portal/authentication/api/presenter"
-	"litmus/litmus-portal/authentication/api/types"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/services"
-	"litmus/litmus-portal/authentication/pkg/utils"
-	"litmus/litmus-portal/authentication/pkg/validations"
 	"net/http"
 	"strconv"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/types"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/validations"
+
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"

diff --git a/chaoscenter/authentication/api/handlers/rest/user_handlers.go b/chaoscenter/authentication/api/handlers/rest/user_handlers.go
@@ -1,13 +1,14 @@
 package rest
 
 import (
-	"litmus/litmus-portal/authentication/api/presenter"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/services"
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"strconv"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"

diff --git a/chaoscenter/authentication/api/main.go b/chaoscenter/authentication/api/main.go
@@ -3,19 +3,20 @@ package main
 import (
 	"flag"
 	"fmt"
-	grpcHandler "litmus/litmus-portal/authentication/api/handlers/grpc"
-	grpcPresenter "litmus/litmus-portal/authentication/api/presenter/protos"
-	"litmus/litmus-portal/authentication/api/routes"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/misc"
-	"litmus/litmus-portal/authentication/pkg/project"
-	"litmus/litmus-portal/authentication/pkg/services"
-	"litmus/litmus-portal/authentication/pkg/user"
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"net"
 	"runtime"
 	"time"
 
+	grpcHandler "github.com/litmuschaos/litmus/chaoscenter/authentication/api/handlers/grpc"
+	grpcPresenter "github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter/protos"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/routes"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/misc"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/project"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/user"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	"google.golang.org/grpc"
 
 	"github.com/gin-contrib/cors"

diff --git a/chaoscenter/authentication/api/middleware/jwt_middlware.go b/chaoscenter/authentication/api/middleware/jwt_middlware.go
@@ -2,8 +2,9 @@ package middleware
 
 import (
 	"fmt"
-	"litmus/litmus-portal/authentication/api/presenter"
-	"litmus/litmus-portal/authentication/pkg/utils"
+
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"

diff --git a/chaoscenter/authentication/api/presenter/rest.go b/chaoscenter/authentication/api/presenter/rest.go
@@ -1,6 +1,6 @@
 package presenter
 
-import "litmus/litmus-portal/authentication/pkg/utils"
+import "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
 
 // ErrorResponseStruct defines the structure for error responses
 type ErrorResponseStruct struct {

diff --git a/chaoscenter/authentication/api/routes/dex_router.go b/chaoscenter/authentication/api/routes/dex_router.go
@@ -1,8 +1,8 @@
 package routes
 
 import (
-	"litmus/litmus-portal/authentication/api/handlers/rest"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/handlers/rest"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/chaoscenter/authentication/api/routes/misc_routers.go b/chaoscenter/authentication/api/routes/misc_routers.go
@@ -1,8 +1,8 @@
 package routes
 
 import (
-	"litmus/litmus-portal/authentication/api/handlers/rest"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/handlers/rest"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/chaoscenter/authentication/api/routes/project_router.go b/chaoscenter/authentication/api/routes/project_router.go
@@ -1,9 +1,9 @@
 package routes
 
 import (
-	"litmus/litmus-portal/authentication/api/handlers/rest"
-	"litmus/litmus-portal/authentication/api/middleware"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/handlers/rest"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/middleware"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/chaoscenter/authentication/api/routes/user_router.go b/chaoscenter/authentication/api/routes/user_router.go
@@ -1,9 +1,9 @@
 package routes
 
 import (
-	"litmus/litmus-portal/authentication/api/handlers/rest"
-	"litmus/litmus-portal/authentication/api/middleware"
-	"litmus/litmus-portal/authentication/pkg/services"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/handlers/rest"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/api/middleware"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/chaoscenter/authentication/api/types/project_types.go b/chaoscenter/authentication/api/types/project_types.go
@@ -1,6 +1,6 @@
 package types
 
-import "litmus/litmus-portal/authentication/pkg/entities"
+import "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
 
 // Project contains the required fields to be returned by GET APIs
 type Project struct {

diff --git a/chaoscenter/authentication/go.mod b/chaoscenter/authentication/go.mod
@@ -1,4 +1,4 @@
-module litmus/litmus-portal/authentication
+module github.com/litmuschaos/litmus/chaoscenter/authentication
 
 go 1.20
 

diff --git a/chaoscenter/authentication/pkg/entities/user.go b/chaoscenter/authentication/pkg/entities/user.go
@@ -1,10 +1,11 @@
 package entities
 
 import (
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"net/mail"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	"github.com/golang-jwt/jwt"
 	"github.com/sirupsen/logrus"
 )

diff --git a/chaoscenter/authentication/pkg/project/repository.go b/chaoscenter/authentication/pkg/project/repository.go
@@ -3,12 +3,13 @@ package project
 import (
 	"context"
 	"errors"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"log"
 	"strconv"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"

diff --git a/chaoscenter/authentication/pkg/services/application_service.go b/chaoscenter/authentication/pkg/services/application_service.go
@@ -1,9 +1,9 @@
 package services
 
 import (
-	"litmus/litmus-portal/authentication/pkg/misc"
-	"litmus/litmus-portal/authentication/pkg/project"
-	"litmus/litmus-portal/authentication/pkg/user"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/misc"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/project"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/user"
 
 	"go.mongodb.org/mongo-driver/mongo"
 )

diff --git a/chaoscenter/authentication/pkg/services/project_service.go b/chaoscenter/authentication/pkg/services/project_service.go
@@ -2,7 +2,8 @@ package services
 
 import (
 	"context"
-	"litmus/litmus-portal/authentication/pkg/entities"
+
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

diff --git a/chaoscenter/authentication/pkg/services/transaction_service.go b/chaoscenter/authentication/pkg/services/transaction_service.go
@@ -2,11 +2,12 @@ package services
 
 import (
 	"context"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/utils"
 	"strconv"
 	"time"
 
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
+
 	log "github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/mongo"
 )

diff --git a/chaoscenter/authentication/pkg/services/user_service.go b/chaoscenter/authentication/pkg/services/user_service.go
@@ -1,7 +1,7 @@
 package services
 
 import (
-	"litmus/litmus-portal/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
 )
 
 // Service creates a service for user authentication operations

diff --git a/chaoscenter/authentication/pkg/user/repository.go b/chaoscenter/authentication/pkg/user/repository.go
@@ -2,8 +2,9 @@ package user
 
 import (
 	"context"
-	"litmus/litmus-portal/authentication/pkg/entities"
-	"litmus/litmus-portal/authentication/pkg/utils"
+
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils"
 
 	"github.com/google/uuid"
 

diff --git a/chaoscenter/authentication/pkg/utils/grpc.go b/chaoscenter/authentication/pkg/utils/grpc.go
@@ -2,9 +2,10 @@ package utils
 
 import (
 	"context"
-	grpc2 "litmus/litmus-portal/authentication/api/presenter/protos"
 	"os"
 
+	grpc2 "github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter/protos"
+
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 )

diff --git a/chaoscenter/authentication/pkg/validations/rbac_validator.go b/chaoscenter/authentication/pkg/validations/rbac_validator.go
@@ -2,7 +2,8 @@ package validations
 
 import (
 	"errors"
-	"litmus/litmus-portal/authentication/pkg/services"
+
+	"github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services"
 
 	log "github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/bson"

diff --git a/chaoscenter/authentication/pkg/validations/roles.go b/chaoscenter/authentication/pkg/validations/roles.go
@@ -1,6 +1,6 @@
 package validations
 
-import "litmus/litmus-portal/authentication/pkg/entities"
+import "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities"
 
 var MutationRbacRules = map[string][]string{
 	"sendInvitation":   {string(entities.RoleOwner)},

diff --git a/chaoscenter/event-tracker/PROJECT b/chaoscenter/event-tracker/PROJECT
@@ -2,7 +2,7 @@ domain: litmuschaos.io
 layout:
 - go.kubebuilder.io/v3
 projectName: event-tracker
-repo: github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker
+repo: github.com/litmuschaos/litmus/chaoscenter/event-tracker
 resources:
 - api:
     crdVersion: v1
@@ -11,6 +11,6 @@ resources:
   domain: litmuschaos.io
   group: eventtracker
   kind: EventTrackerPolicy
-  path: github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/api/v1
+  path: github.com/litmuschaos/litmus/chaoscenter/event-tracker/api/v1
   version: v1
 version: "3"
diff --git a/chaoscenter/event-tracker/controllers/eventtrackerpolicy_controller.go b/chaoscenter/event-tracker/controllers/eventtrackerpolicy_controller.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/pkg/utils"
+	"github.com/litmuschaos/litmus/chaoscenter/event-tracker/pkg/utils"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/api/errors"
 
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	eventtrackerv1 "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/api/v1"
+	eventtrackerv1 "github.com/litmuschaos/litmus/chaoscenter/event-tracker/api/v1"
 )
 
 // EventTrackerPolicyReconciler reconciles a EventTrackerPolicy object

diff --git a/chaoscenter/event-tracker/controllers/suite_test.go b/chaoscenter/event-tracker/controllers/suite_test.go
@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	eventtrackerv1 "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/api/v1"
+	eventtrackerv1 "github.com/litmuschaos/litmus/chaoscenter/event-tracker/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/chaoscenter/event-tracker/go.mod b/chaoscenter/event-tracker/go.mod
@@ -1,4 +1,4 @@
-module github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker
+module github.com/litmuschaos/litmus/chaoscenter/event-tracker
 
 go 1.20