From e3986e4a05db1517669727448a91b397cdb1a396 Mon Sep 17 00:00:00 2001 From: Saranya Jena Date: Thu, 6 Jul 2023 15:49:47 +0800 Subject: [PATCH] Updated imports in authentication and event-tracker (#4077) * updated imports Signed-off-by: Saranya-jena * fixed import order Signed-off-by: Saranya-jena --------- Signed-off-by: Saranya-jena --- .github/workflows/push.yml | 2 +- .../api/handlers/grpc/grpc_handler.go | 9 +++++---- .../api/handlers/grpc/grpc_server.go | 4 ++-- .../api/handlers/rest/dex_auth_handler.go | 9 +++++---- .../api/handlers/rest/misc_handlers.go | 4 ++-- .../api/handlers/rest/project_handler.go | 13 +++++++------ .../api/handlers/rest/user_handlers.go | 9 +++++---- chaoscenter/authentication/api/main.go | 19 ++++++++++--------- .../api/middleware/jwt_middlware.go | 5 +++-- .../authentication/api/presenter/rest.go | 2 +- .../authentication/api/routes/dex_router.go | 4 ++-- .../authentication/api/routes/misc_routers.go | 4 ++-- .../api/routes/project_router.go | 6 +++--- .../authentication/api/routes/user_router.go | 6 +++--- .../authentication/api/types/project_types.go | 2 +- chaoscenter/authentication/go.mod | 2 +- .../authentication/pkg/entities/user.go | 3 ++- .../authentication/pkg/project/repository.go | 5 +++-- .../pkg/services/application_service.go | 6 +++--- .../pkg/services/project_service.go | 3 ++- .../pkg/services/transaction_service.go | 5 +++-- .../pkg/services/user_service.go | 2 +- .../authentication/pkg/user/repository.go | 5 +++-- chaoscenter/authentication/pkg/utils/grpc.go | 3 ++- .../pkg/validations/rbac_validator.go | 3 ++- .../authentication/pkg/validations/roles.go | 2 +- chaoscenter/event-tracker/PROJECT | 4 ++-- .../eventtrackerpolicy_controller.go | 4 ++-- .../event-tracker/controllers/suite_test.go | 2 +- chaoscenter/event-tracker/go.mod | 2 +- chaoscenter/event-tracker/main.go | 8 ++++---- chaoscenter/event-tracker/pkg/utils/utils.go | 4 ++-- 32 files changed, 87 insertions(+), 74 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0a5152cd541..ea431f133a7 100644 --- 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 index fb5c89e266d..984677537e7 100644 --- 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 index cd58b8c3c3d..0680d3df3a9 100644 --- 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 index 4d8b6a2a2cc..81ac32ad488 100644 --- 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 index ad7cf0cb503..78f3e6e0b97 100644 --- 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 index 941d51fde09..2157535baaa 100644 --- 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 index 143b4f0d458..75fb3b39dd0 100644 --- 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 index 8c50dc8f77a..879b6cbc723 100644 --- 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 index bc82b3a257d..769817db25f 100644 --- 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 index 63f0d3a3a76..cfa8addabd0 100644 --- 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 index 711efa57ba3..5f3fb9d60a9 100644 --- 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 index 78ef34da271..30edbd04d9b 100644 --- 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 index 038ef0c28af..87d676ff016 100644 --- 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 index 4de8e7597ab..9fa16bfaf25 100644 --- 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 index 4c9fcbbedb7..26d6b571847 100644 --- 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 index 846e0faad39..fe2118f70e8 100644 --- 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 index cb4a3908bc7..5b95ba81fc5 100644 --- 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 index d6d828fdf68..001aa16b936 100644 --- 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 index 5cfbd87604a..83a6e60d605 100644 --- 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 index 5d3b225754c..97d8be4d506 100644 --- 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 index b7891d96b02..14a2a8476eb 100644 --- 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 index 7d41c6cbb7b..f05b6ae5e38 100644 --- 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 index fe4cd74e27e..fa5072474b8 100644 --- 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 index d00f0ba9849..13a6dac8699 100644 --- 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 index 4711e60a8f3..a37b9acca4a 100644 --- 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 index c42fe1a3eb1..eb5c8471586 100644 --- 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 index 77d4d8f19b3..61ac4bbf1f2 100644 --- 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 index 05c3bdd4027..ccc3b8a292e 100644 --- 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 index 9c706e713b6..f33c4527535 100644 --- 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 index 1fdb62162e7..109dabce108 100644 --- 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 diff --git a/chaoscenter/event-tracker/main.go b/chaoscenter/event-tracker/main.go index 07c010254ce..bb981acc695 100644 --- a/chaoscenter/event-tracker/main.go +++ b/chaoscenter/event-tracker/main.go @@ -28,8 +28,8 @@ import ( "time" "github.com/kelseyhightower/envconfig" - "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/pkg/k8s" - "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/pkg/utils" + "github.com/litmuschaos/litmus/chaoscenter/event-tracker/pkg/k8s" + "github.com/litmuschaos/litmus/chaoscenter/event-tracker/pkg/utils" "github.com/sirupsen/logrus" "k8s.io/client-go/informers" @@ -45,8 +45,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - eventtrackerv1 "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/api/v1" - "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/controllers" + eventtrackerv1 "github.com/litmuschaos/litmus/chaoscenter/event-tracker/api/v1" + "github.com/litmuschaos/litmus/chaoscenter/event-tracker/controllers" //+kubebuilder:scaffold:imports ) diff --git a/chaoscenter/event-tracker/pkg/utils/utils.go b/chaoscenter/event-tracker/pkg/utils/utils.go index 9bf6dd2cb08..b9112dd74e5 100644 --- a/chaoscenter/event-tracker/pkg/utils/utils.go +++ b/chaoscenter/event-tracker/pkg/utils/utils.go @@ -11,8 +11,8 @@ import ( "github.com/sirupsen/logrus" "github.com/jmespath/go-jmespath" - litmuschaosv1 "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/api/v1" - "github.com/litmuschaos/litmus/litmus-portal/cluster-agents/event-tracker/pkg/k8s" + litmuschaosv1 "github.com/litmuschaos/litmus/chaoscenter/event-tracker/api/v1" + "github.com/litmuschaos/litmus/chaoscenter/event-tracker/pkg/k8s" v1 "k8s.io/api/apps/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"