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 008dcb1ba7f..984677537e7 100644 --- a/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go +++ b/chaoscenter/authentication/api/handlers/grpc/grpc_handler.go @@ -2,11 +2,12 @@ package grpc import ( "context" + "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" - "strconv" log "github.com/sirupsen/logrus" diff --git a/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go b/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go index ece89a1189c..81ac32ad488 100644 --- a/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go +++ b/chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go @@ -2,12 +2,13 @@ package rest import ( "context" + "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" - "net/http" - "time" "github.com/coreos/go-oidc/v3/oidc" "github.com/gin-gonic/gin" diff --git a/chaoscenter/authentication/api/handlers/rest/project_handler.go b/chaoscenter/authentication/api/handlers/rest/project_handler.go index 0917943df49..2157535baaa 100644 --- a/chaoscenter/authentication/api/handlers/rest/project_handler.go +++ b/chaoscenter/authentication/api/handlers/rest/project_handler.go @@ -1,15 +1,16 @@ package rest import ( + "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" - "net/http" - "strconv" - "time" "github.com/gin-gonic/gin" "github.com/google/uuid" diff --git a/chaoscenter/authentication/api/handlers/rest/user_handlers.go b/chaoscenter/authentication/api/handlers/rest/user_handlers.go index ba641910a60..75fb3b39dd0 100644 --- a/chaoscenter/authentication/api/handlers/rest/user_handlers.go +++ b/chaoscenter/authentication/api/handlers/rest/user_handlers.go @@ -1,12 +1,13 @@ package rest import ( + "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" - "strconv" - "time" "github.com/gin-gonic/gin" "github.com/google/uuid" diff --git a/chaoscenter/authentication/api/main.go b/chaoscenter/authentication/api/main.go index 464a0a2512e..879b6cbc723 100644 --- a/chaoscenter/authentication/api/main.go +++ b/chaoscenter/authentication/api/main.go @@ -3,6 +3,10 @@ package main import ( "flag" "fmt" + "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" @@ -12,9 +16,6 @@ import ( "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/user" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" - "net" - "runtime" - "time" "google.golang.org/grpc" diff --git a/chaoscenter/authentication/api/middleware/jwt_middlware.go b/chaoscenter/authentication/api/middleware/jwt_middlware.go index 9da3c1c8975..769817db25f 100644 --- a/chaoscenter/authentication/api/middleware/jwt_middlware.go +++ b/chaoscenter/authentication/api/middleware/jwt_middlware.go @@ -2,6 +2,7 @@ package middleware import ( "fmt" + "github.com/litmuschaos/litmus/chaoscenter/authentication/api/presenter" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" diff --git a/chaoscenter/authentication/pkg/entities/user.go b/chaoscenter/authentication/pkg/entities/user.go index 09da1172f94..5b95ba81fc5 100644 --- a/chaoscenter/authentication/pkg/entities/user.go +++ b/chaoscenter/authentication/pkg/entities/user.go @@ -1,10 +1,11 @@ package entities import ( - "github.com/litmuschaos/litmus/chaoscenter/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 cf83cd64222..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" - "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" - "github.com/litmuschaos/litmus/chaoscenter/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/project_service.go b/chaoscenter/authentication/pkg/services/project_service.go index a6acbd1426b..97d8be4d506 100644 --- a/chaoscenter/authentication/pkg/services/project_service.go +++ b/chaoscenter/authentication/pkg/services/project_service.go @@ -2,6 +2,7 @@ package services import ( "context" + "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" "go.mongodb.org/mongo-driver/bson" diff --git a/chaoscenter/authentication/pkg/services/transaction_service.go b/chaoscenter/authentication/pkg/services/transaction_service.go index 3100ff2aa0a..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" - "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" - "github.com/litmuschaos/litmus/chaoscenter/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/user/repository.go b/chaoscenter/authentication/pkg/user/repository.go index d41b3a7265b..fa5072474b8 100644 --- a/chaoscenter/authentication/pkg/user/repository.go +++ b/chaoscenter/authentication/pkg/user/repository.go @@ -2,6 +2,7 @@ package user import ( "context" + "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/entities" "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/utils" diff --git a/chaoscenter/authentication/pkg/utils/grpc.go b/chaoscenter/authentication/pkg/utils/grpc.go index ba681fe89a3..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 "github.com/litmuschaos/litmus/chaoscenter/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 793e54b9a8c..a37b9acca4a 100644 --- a/chaoscenter/authentication/pkg/validations/rbac_validator.go +++ b/chaoscenter/authentication/pkg/validations/rbac_validator.go @@ -2,6 +2,7 @@ package validations import ( "errors" + "github.com/litmuschaos/litmus/chaoscenter/authentication/pkg/services" log "github.com/sirupsen/logrus"