Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated imports in authentication and event-tracker #4077

Merged
merged 2 commits into from
Jul 6, 2023
Merged

Updated imports in authentication and event-tracker #4077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9dae72
updated imports
Saranya-jena Jul 6, 2023
5831975
fixed import order
Saranya-jena Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions chaoscenter/authentication/api/handlers/grpc/grpc_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/authentication/api/handlers/grpc/grpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions chaoscenter/authentication/api/handlers/rest/dex_auth_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/authentication/api/handlers/rest/misc_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
13 changes: 7 additions & 6 deletions chaoscenter/authentication/api/handlers/rest/project_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 5 additions & 4 deletions chaoscenter/authentication/api/handlers/rest/user_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
19 changes: 10 additions & 9 deletions chaoscenter/authentication/api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions chaoscenter/authentication/api/middleware/jwt_middlware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/authentication/api/presenter/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/authentication/api/routes/dex_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/authentication/api/routes/misc_routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions chaoscenter/authentication/api/routes/project_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions chaoscenter/authentication/api/routes/user_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/authentication/api/types/project_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/authentication/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module litmus/litmus-portal/authentication
module github.com/litmuschaos/litmus/chaoscenter/authentication

go 1.20

Expand Down
3 changes: 2 additions & 1 deletion chaoscenter/authentication/pkg/entities/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
5 changes: 3 additions & 2 deletions chaoscenter/authentication/pkg/project/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions chaoscenter/authentication/pkg/services/application_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion chaoscenter/authentication/pkg/services/project_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions chaoscenter/authentication/pkg/services/transaction_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/authentication/pkg/services/user_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions chaoscenter/authentication/pkg/user/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion chaoscenter/authentication/pkg/utils/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion chaoscenter/authentication/pkg/validations/rbac_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/authentication/pkg/validations/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)},
Expand Down
4 changes: 2 additions & 2 deletions chaoscenter/event-tracker/PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
4 changes: 2 additions & 2 deletions chaoscenter/event-tracker/controllers/eventtrackerpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/event-tracker/controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion chaoscenter/event-tracker/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down