From 62aa794b843f2c1f6393c86519459e2e890a6e27 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 1 Oct 2019 17:47:43 +0200 Subject: [PATCH] Move internal/auth to pkg/auth --- compose/commands/exporter.go | 2 +- compose/commands/importer.go | 2 +- compose/provision-config.go | 2 +- compose/repository/repository.go | 2 +- compose/rest/attachment.go | 2 +- compose/rest/router.go | 2 +- compose/service/attachment.go | 2 +- compose/service/automation_runner.go | 2 +- compose/service/automation_script.go | 2 +- compose/service/import_session.go | 3 ++- compose/service/record.go | 2 +- compose/service/service.go | 2 +- compose/service/system_role.go | 2 +- compose/service/system_user.go | 2 +- internal/payload/outgoing.go | 2 +- internal/permissions/service.go | 2 +- messaging/provision-config.go | 2 +- messaging/repository/repository.go | 2 +- messaging/rest/activity.go | 2 +- messaging/rest/attachment.go | 2 +- messaging/rest/channel.go | 7 ++++--- messaging/rest/router.go | 2 +- messaging/service/access_control.go | 2 +- messaging/service/channel.go | 2 +- messaging/service/message.go | 2 +- messaging/service/webhook.go | 2 +- messaging/service/webhook_test.go | 5 +++-- messaging/websocket/session.go | 2 +- messaging/websocket/session_incoming_channel.go | 2 +- messaging/websocket/websocket.go | 2 +- pkg/api/server.go | 2 +- {internal => pkg}/auth/error.go | 0 {internal => pkg}/auth/identity.go | 0 {internal => pkg}/auth/identity_context.go | 0 {internal => pkg}/auth/interfaces.go | 0 {internal => pkg}/auth/jwt.go | 0 {internal => pkg}/auth/middleware.go | 0 {internal => pkg}/auth/signer.go | 0 pkg/automation/service.go | 2 +- pkg/cli/helpers.go | 2 +- system/commands/auth.go | 2 +- system/commands/importer.go | 2 +- system/commands/sink.go | 2 +- system/grpc/server.go | 2 +- system/grpc/users_service.go | 2 +- system/provision-config.go | 2 +- system/repository/repository.go | 4 ++-- system/rest/auth.go | 2 +- system/rest/auth_external.go | 2 +- system/rest/auth_internal.go | 2 +- system/rest/reminder.go | 3 ++- system/rest/router.go | 2 +- system/rest/sink.go | 2 +- system/service/automation_runner.go | 2 +- system/service/automation_script.go | 2 +- system/service/reminder.go | 5 +++-- system/service/service.go | 2 +- system/service/user.go | 2 +- tests/compose/main_test.go | 2 +- tests/compose/provision_test.go | 2 +- tests/helpers/auth.go | 2 +- tests/messaging/main_test.go | 2 +- tests/messaging/provision_test.go | 2 +- tests/system/main_test.go | 2 +- tests/system/provision_test.go | 2 +- 65 files changed, 68 insertions(+), 63 deletions(-) rename {internal => pkg}/auth/error.go (100%) rename {internal => pkg}/auth/identity.go (100%) rename {internal => pkg}/auth/identity_context.go (100%) rename {internal => pkg}/auth/interfaces.go (100%) rename {internal => pkg}/auth/jwt.go (100%) rename {internal => pkg}/auth/middleware.go (100%) rename {internal => pkg}/auth/signer.go (100%) diff --git a/compose/commands/exporter.go b/compose/commands/exporter.go index e580ddc64..e24d5679a 100644 --- a/compose/commands/exporter.go +++ b/compose/commands/exporter.go @@ -16,8 +16,8 @@ import ( "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/deinterfacer" diff --git a/compose/commands/importer.go b/compose/commands/importer.go index 7672580ed..d09f784f5 100644 --- a/compose/commands/importer.go +++ b/compose/commands/importer.go @@ -12,7 +12,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" ) diff --git a/compose/provision-config.go b/compose/provision-config.go index afa8168fb..3fc7ff336 100644 --- a/compose/provision-config.go +++ b/compose/provision-config.go @@ -9,7 +9,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/importer" "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/compose" diff --git a/compose/repository/repository.go b/compose/repository/repository.go index 2d5fbd679..a164c950f 100644 --- a/compose/repository/repository.go +++ b/compose/repository/repository.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" "gopkg.in/Masterminds/squirrel.v1" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/rh" ) diff --git a/compose/rest/attachment.go b/compose/rest/attachment.go index 441705390..fcb31e6fe 100644 --- a/compose/rest/attachment.go +++ b/compose/rest/attachment.go @@ -12,7 +12,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/rest/request" "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/pkg/errors" ) diff --git a/compose/rest/router.go b/compose/rest/router.go index 1c4a8f655..93831805d 100644 --- a/compose/rest/router.go +++ b/compose/rest/router.go @@ -4,7 +4,7 @@ import ( "github.com/go-chi/chi" "github.com/cortezaproject/corteza-server/compose/rest/handlers" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" ) func MountRoutes(r chi.Router) { diff --git a/compose/service/attachment.go b/compose/service/attachment.go index 41057a982..576074c52 100644 --- a/compose/service/attachment.go +++ b/compose/service/attachment.go @@ -19,8 +19,8 @@ import ( "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/store" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/compose/service/automation_runner.go b/compose/service/automation_runner.go index 286299b2e..d586c2084 100644 --- a/compose/service/automation_runner.go +++ b/compose/service/automation_runner.go @@ -12,7 +12,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/proto" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/automation/corredor" "github.com/cortezaproject/corteza-server/pkg/sentry" diff --git a/compose/service/automation_script.go b/compose/service/automation_script.go index 5bae6d6b3..6ecf27d99 100644 --- a/compose/service/automation_script.go +++ b/compose/service/automation_script.go @@ -6,8 +6,8 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" ) diff --git a/compose/service/import_session.go b/compose/service/import_session.go index a27eef4cd..ce84adc4f 100644 --- a/compose/service/import_session.go +++ b/compose/service/import_session.go @@ -5,9 +5,10 @@ import ( "sync" "time" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/titpetric/factory" + "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/compose/service/record.go b/compose/service/record.go index feac98f7d..ffced208b 100644 --- a/compose/service/record.go +++ b/compose/service/record.go @@ -15,7 +15,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/decoder" "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/compose/service/service.go b/compose/service/service.go index 2d30ab81f..725c9e167 100644 --- a/compose/service/service.go +++ b/compose/service/service.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/repository" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/automation/corredor" "github.com/cortezaproject/corteza-server/pkg/cli/options" diff --git a/compose/service/system_role.go b/compose/service/system_role.go index 522cfbc9c..2acd96b7f 100644 --- a/compose/service/system_role.go +++ b/compose/service/system_role.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc/metadata" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/proto" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/compose/service/system_user.go b/compose/service/system_user.go index 7a5dcd4b3..14e8aba6e 100644 --- a/compose/service/system_user.go +++ b/compose/service/system_user.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/proto" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/internal/payload/outgoing.go b/internal/payload/outgoing.go index cd796a718..680ce97e6 100644 --- a/internal/payload/outgoing.go +++ b/internal/payload/outgoing.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" messagingTypes "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" systemTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/internal/permissions/service.go b/internal/permissions/service.go index c6e13fe63..d760b6a4b 100644 --- a/internal/permissions/service.go +++ b/internal/permissions/service.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/provision-config.go b/messaging/provision-config.go index 082be4e43..6626e9dc8 100644 --- a/messaging/provision-config.go +++ b/messaging/provision-config.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/importer" "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/messaging" diff --git a/messaging/repository/repository.go b/messaging/repository/repository.go index 9b6fc6495..bf695b7b2 100644 --- a/messaging/repository/repository.go +++ b/messaging/repository/repository.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" "gopkg.in/Masterminds/squirrel.v1" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" ) type ( diff --git a/messaging/rest/activity.go b/messaging/rest/activity.go index 14dd92a1b..bfd34c30f 100644 --- a/messaging/rest/activity.go +++ b/messaging/rest/activity.go @@ -5,10 +5,10 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/rest/request" "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" ) var _ = errors.Wrap diff --git a/messaging/rest/attachment.go b/messaging/rest/attachment.go index 074d213ac..42c1b5d3e 100644 --- a/messaging/rest/attachment.go +++ b/messaging/rest/attachment.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/rest/request" "github.com/cortezaproject/corteza-server/messaging/service" + "github.com/cortezaproject/corteza-server/pkg/auth" ) var _ = errors.Wrap diff --git a/messaging/rest/channel.go b/messaging/rest/channel.go index 9556d36da..e3000e547 100644 --- a/messaging/rest/channel.go +++ b/messaging/rest/channel.go @@ -3,14 +3,15 @@ package rest import ( "context" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/pkg/errors" + "github.com/titpetric/factory/resputil" + "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/rest/request" "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" - "github.com/pkg/errors" - "github.com/titpetric/factory/resputil" + "github.com/cortezaproject/corteza-server/pkg/auth" ) var _ = errors.Wrap diff --git a/messaging/rest/router.go b/messaging/rest/router.go index d0851b32f..83c9a0714 100644 --- a/messaging/rest/router.go +++ b/messaging/rest/router.go @@ -3,8 +3,8 @@ package rest import ( "github.com/go-chi/chi" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/rest/handlers" + "github.com/cortezaproject/corteza-server/pkg/auth" ) func MountRoutes(r chi.Router) { diff --git a/messaging/service/access_control.go b/messaging/service/access_control.go index b981bda9e..8c8213241 100644 --- a/messaging/service/access_control.go +++ b/messaging/service/access_control.go @@ -3,9 +3,9 @@ package service import ( "context" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" ) type ( diff --git a/messaging/service/channel.go b/messaging/service/channel.go index 61ad37cfe..53edbed5d 100644 --- a/messaging/service/channel.go +++ b/messaging/service/channel.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/organization" ) diff --git a/messaging/service/message.go b/messaging/service/message.go index b252b35bc..acef21e63 100644 --- a/messaging/service/message.go +++ b/messaging/service/message.go @@ -10,10 +10,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/messaging/service/webhook.go b/messaging/service/webhook.go index cd312aa27..5f09774e2 100644 --- a/messaging/service/webhook.go +++ b/messaging/service/webhook.go @@ -12,11 +12,11 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/internal/store" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/messaging/service/webhook_test.go b/messaging/service/webhook_test.go index aa4a1153d..e7df90a71 100644 --- a/messaging/service/webhook_test.go +++ b/messaging/service/webhook_test.go @@ -8,11 +8,12 @@ import ( "strings" "testing" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/stretchr/testify/require" + "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" - "github.com/stretchr/testify/require" + "github.com/cortezaproject/corteza-server/pkg/auth" ) func TestOutgoingWebhook(t *testing.T) { diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go index 7f86c6592..2a21f1eb4 100644 --- a/messaging/websocket/session.go +++ b/messaging/websocket/session.go @@ -10,11 +10,11 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/websocket/session_incoming_channel.go b/messaging/websocket/session_incoming_channel.go index 4312b7e53..d20e5931c 100644 --- a/messaging/websocket/session_incoming_channel.go +++ b/messaging/websocket/session_incoming_channel.go @@ -3,11 +3,11 @@ package websocket import ( "context" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/incoming" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/auth" ) func (s *Session) channelJoin(ctx context.Context, p *incoming.ChannelJoin) error { diff --git a/messaging/websocket/websocket.go b/messaging/websocket/websocket.go index 650ab61dc..9e068f119 100644 --- a/messaging/websocket/websocket.go +++ b/messaging/websocket/websocket.go @@ -8,7 +8,7 @@ import ( "github.com/titpetric/factory/resputil" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/pkg/api/server.go b/pkg/api/server.go index 237df70c1..b68d2e171 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -16,7 +16,7 @@ import ( "github.com/titpetric/factory/resputil" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli/options" "github.com/cortezaproject/corteza-server/pkg/version" ) diff --git a/internal/auth/error.go b/pkg/auth/error.go similarity index 100% rename from internal/auth/error.go rename to pkg/auth/error.go diff --git a/internal/auth/identity.go b/pkg/auth/identity.go similarity index 100% rename from internal/auth/identity.go rename to pkg/auth/identity.go diff --git a/internal/auth/identity_context.go b/pkg/auth/identity_context.go similarity index 100% rename from internal/auth/identity_context.go rename to pkg/auth/identity_context.go diff --git a/internal/auth/interfaces.go b/pkg/auth/interfaces.go similarity index 100% rename from internal/auth/interfaces.go rename to pkg/auth/interfaces.go diff --git a/internal/auth/jwt.go b/pkg/auth/jwt.go similarity index 100% rename from internal/auth/jwt.go rename to pkg/auth/jwt.go diff --git a/internal/auth/middleware.go b/pkg/auth/middleware.go similarity index 100% rename from internal/auth/middleware.go rename to pkg/auth/middleware.go diff --git a/internal/auth/signer.go b/pkg/auth/signer.go similarity index 100% rename from internal/auth/signer.go rename to pkg/auth/signer.go diff --git a/pkg/automation/service.go b/pkg/automation/service.go index 60823ade7..a6cf3c9f2 100644 --- a/pkg/automation/service.go +++ b/pkg/automation/service.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/handle" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/pkg/cli/helpers.go b/pkg/cli/helpers.go index 96bd04031..d6552595b 100644 --- a/pkg/cli/helpers.go +++ b/pkg/cli/helpers.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/http" "github.com/cortezaproject/corteza-server/internal/mail" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli/options" ) diff --git a/system/commands/auth.go b/system/commands/auth.go index a67948511..f8e276cdb 100644 --- a/system/commands/auth.go +++ b/system/commands/auth.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/titpetric/factory" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/system/auth/external" "github.com/cortezaproject/corteza-server/system/repository" diff --git a/system/commands/importer.go b/system/commands/importer.go index 609586ea3..684f43999 100644 --- a/system/commands/importer.go +++ b/system/commands/importer.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/system/importer" ) diff --git a/system/commands/sink.go b/system/commands/sink.go index 6440922ac..379ae8ae5 100644 --- a/system/commands/sink.go +++ b/system/commands/sink.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" ) diff --git a/system/grpc/server.go b/system/grpc/server.go index 153d647dd..a86df4b04 100644 --- a/system/grpc/server.go +++ b/system/grpc/server.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/proto" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/grpc/users_service.go b/system/grpc/users_service.go index d0c14fb82..7f6153e83 100644 --- a/system/grpc/users_service.go +++ b/system/grpc/users_service.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/proto" "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types" diff --git a/system/provision-config.go b/system/provision-config.go index db6957112..e83a9e4e2 100644 --- a/system/provision-config.go +++ b/system/provision-config.go @@ -8,8 +8,8 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/system" diff --git a/system/repository/repository.go b/system/repository/repository.go index a47b8bdba..830842ec8 100644 --- a/system/repository/repository.go +++ b/system/repository/repository.go @@ -5,9 +5,9 @@ import ( "github.com/lann/builder" "github.com/titpetric/factory" - squirrel "gopkg.in/Masterminds/squirrel.v1" + "gopkg.in/Masterminds/squirrel.v1" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" ) type ( diff --git a/system/rest/auth.go b/system/rest/auth.go index 79501059d..5f7c477bb 100644 --- a/system/rest/auth.go +++ b/system/rest/auth.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/rest/request" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/rest/auth_external.go b/system/rest/auth_external.go index a161384c7..e6d9420f4 100644 --- a/system/rest/auth_external.go +++ b/system/rest/auth_external.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types" diff --git a/system/rest/auth_internal.go b/system/rest/auth_internal.go index 5f2431ce4..1c9862691 100644 --- a/system/rest/auth_internal.go +++ b/system/rest/auth_internal.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/payload" "github.com/cortezaproject/corteza-server/internal/payload/outgoing" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/rest/request" "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types" diff --git a/system/rest/reminder.go b/system/rest/reminder.go index 19c602fea..7284a44ac 100644 --- a/system/rest/reminder.go +++ b/system/rest/reminder.go @@ -6,9 +6,10 @@ import ( "github.com/cortezaproject/corteza-server/pkg/rh" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/titpetric/factory/resputil" + "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types" diff --git a/system/rest/router.go b/system/rest/router.go index e1e54c0f6..82b14bf25 100644 --- a/system/rest/router.go +++ b/system/rest/router.go @@ -3,7 +3,7 @@ package rest import ( "github.com/go-chi/chi" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/rest/handlers" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/rest/sink.go b/system/rest/sink.go index aba58ce7c..db3dfc789 100644 --- a/system/rest/sink.go +++ b/system/rest/sink.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/service/automation_runner.go b/system/service/automation_runner.go index d348295a7..f69e5e92b 100644 --- a/system/service/automation_runner.go +++ b/system/service/automation_runner.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - intAuth "github.com/cortezaproject/corteza-server/internal/auth" + intAuth "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/automation/corredor" mailTrigger "github.com/cortezaproject/corteza-server/pkg/automation/mail" diff --git a/system/service/automation_script.go b/system/service/automation_script.go index d5ece6978..c3c47e386 100644 --- a/system/service/automation_script.go +++ b/system/service/automation_script.go @@ -6,8 +6,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - intAuth "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" + intAuth "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/logger" ) diff --git a/system/service/reminder.go b/system/service/reminder.go index 178eda7b1..d4a0fff16 100644 --- a/system/service/reminder.go +++ b/system/service/reminder.go @@ -6,9 +6,10 @@ import ( "github.com/cortezaproject/corteza-server/system/repository" - intAuth "github.com/cortezaproject/corteza-server/internal/auth" - "github.com/cortezaproject/corteza-server/system/types" "github.com/titpetric/factory" + + intAuth "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/system/types" ) type ( diff --git a/system/service/service.go b/system/service/service.go index b9832bc85..08eb49936 100644 --- a/system/service/service.go +++ b/system/service/service.go @@ -5,9 +5,9 @@ import ( "go.uber.org/zap" - intAuth "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" internalSettings "github.com/cortezaproject/corteza-server/internal/settings" + intAuth "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/automation/corredor" "github.com/cortezaproject/corteza-server/pkg/cli/options" diff --git a/system/service/user.go b/system/service/user.go index a9dfde211..82060ccd6 100644 --- a/system/service/user.go +++ b/system/service/user.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - internalAuth "github.com/cortezaproject/corteza-server/internal/auth" + internalAuth "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/system/repository" "github.com/cortezaproject/corteza-server/system/types" diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go index ebb6ebf68..6d5a59274 100644 --- a/tests/compose/main_test.go +++ b/tests/compose/main_test.go @@ -19,10 +19,10 @@ import ( "github.com/cortezaproject/corteza-server/compose/rest" "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" "github.com/cortezaproject/corteza-server/pkg/api" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/rand" diff --git a/tests/compose/provision_test.go b/tests/compose/provision_test.go index f7efde223..7fd7b9da2 100644 --- a/tests/compose/provision_test.go +++ b/tests/compose/provision_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/cortezaproject/corteza-server/compose/importer" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/compose" ) diff --git a/tests/helpers/auth.go b/tests/helpers/auth.go index 21ed287e8..905cba758 100644 --- a/tests/helpers/auth.go +++ b/tests/helpers/auth.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" "github.com/steinfletcher/apitest" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/rand" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/tests/messaging/main_test.go b/tests/messaging/main_test.go index bdd6a1348..fbee194c6 100644 --- a/tests/messaging/main_test.go +++ b/tests/messaging/main_test.go @@ -14,7 +14,6 @@ import ( "github.com/go-chi/chi" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/internal/store" "github.com/cortezaproject/corteza-server/messaging" @@ -23,6 +22,7 @@ import ( "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/api" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/rand" diff --git a/tests/messaging/provision_test.go b/tests/messaging/provision_test.go index 48c05c121..1b22c7c52 100644 --- a/tests/messaging/provision_test.go +++ b/tests/messaging/provision_test.go @@ -3,8 +3,8 @@ package messaging import ( "testing" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/messaging/importer" + "github.com/cortezaproject/corteza-server/pkg/auth" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/messaging" ) diff --git a/tests/system/main_test.go b/tests/system/main_test.go index 17d05e5e1..fff9c6353 100644 --- a/tests/system/main_test.go +++ b/tests/system/main_test.go @@ -13,9 +13,9 @@ import ( "github.com/go-chi/chi" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/auth" "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/api" + "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/rand" diff --git a/tests/system/provision_test.go b/tests/system/provision_test.go index e7f85d4f6..6c815f3c8 100644 --- a/tests/system/provision_test.go +++ b/tests/system/provision_test.go @@ -3,7 +3,7 @@ package system import ( "testing" - "github.com/cortezaproject/corteza-server/internal/auth" + "github.com/cortezaproject/corteza-server/pkg/auth" impAux "github.com/cortezaproject/corteza-server/pkg/importer" provision "github.com/cortezaproject/corteza-server/provision/system" "github.com/cortezaproject/corteza-server/system/importer"