From ebfa4cbffd0c75079b3c065ccdebf3101c0454ef Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 1 Oct 2019 17:51:39 +0200 Subject: [PATCH] Move internal/payload to pkg/payload --- compose/rest/page.go | 2 +- messaging/rest/channel.go | 4 ++-- messaging/rest/message.go | 4 ++-- messaging/rest/search.go | 4 ++-- messaging/service/event.go | 4 ++-- messaging/service/message.go | 2 +- messaging/websocket/event_queue.go | 4 ++-- messaging/websocket/session.go | 4 ++-- messaging/websocket/session_incoming.go | 3 ++- messaging/websocket/session_incoming_channel.go | 6 +++--- messaging/websocket/session_incoming_message.go | 4 ++-- {internal => pkg}/payload/incoming.go | 2 +- {internal => pkg}/payload/incoming/channel.go | 0 {internal => pkg}/payload/incoming/messages.go | 0 {internal => pkg}/payload/incoming/payload.go | 0 {internal => pkg}/payload/incoming/user.go | 0 {internal => pkg}/payload/outgoing.go | 2 +- {internal => pkg}/payload/outgoing/activity.go | 0 {internal => pkg}/payload/outgoing/attachment.go | 0 {internal => pkg}/payload/outgoing/channel.go | 0 {internal => pkg}/payload/outgoing/channel_member.go | 0 {internal => pkg}/payload/outgoing/command.go | 0 {internal => pkg}/payload/outgoing/error.go | 0 {internal => pkg}/payload/outgoing/message.go | 0 {internal => pkg}/payload/outgoing/payload.go | 0 {internal => pkg}/payload/outgoing/settings.go | 0 {internal => pkg}/payload/outgoing/unread.go | 0 {internal => pkg}/payload/outgoing/user.go | 0 {internal => pkg}/payload/util.go | 0 system/rest/auth.go | 4 ++-- system/rest/auth_internal.go | 4 ++-- system/rest/role.go | 2 +- system/rest/user.go | 2 +- 33 files changed, 29 insertions(+), 28 deletions(-) rename {internal => pkg}/payload/incoming.go (70%) rename {internal => pkg}/payload/incoming/channel.go (100%) rename {internal => pkg}/payload/incoming/messages.go (100%) rename {internal => pkg}/payload/incoming/payload.go (100%) rename {internal => pkg}/payload/incoming/user.go (100%) rename {internal => pkg}/payload/outgoing.go (99%) rename {internal => pkg}/payload/outgoing/activity.go (100%) rename {internal => pkg}/payload/outgoing/attachment.go (100%) rename {internal => pkg}/payload/outgoing/channel.go (100%) rename {internal => pkg}/payload/outgoing/channel_member.go (100%) rename {internal => pkg}/payload/outgoing/command.go (100%) rename {internal => pkg}/payload/outgoing/error.go (100%) rename {internal => pkg}/payload/outgoing/message.go (100%) rename {internal => pkg}/payload/outgoing/payload.go (100%) rename {internal => pkg}/payload/outgoing/settings.go (100%) rename {internal => pkg}/payload/outgoing/unread.go (100%) rename {internal => pkg}/payload/outgoing/user.go (100%) rename {internal => pkg}/payload/util.go (100%) diff --git a/compose/rest/page.go b/compose/rest/page.go index b202ed579..058446558 100644 --- a/compose/rest/page.go +++ b/compose/rest/page.go @@ -8,7 +8,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/payload" + "github.com/cortezaproject/corteza-server/pkg/payload" ) type ( diff --git a/messaging/rest/channel.go b/messaging/rest/channel.go index e3000e547..472dd1246 100644 --- a/messaging/rest/channel.go +++ b/messaging/rest/channel.go @@ -6,12 +6,12 @@ import ( "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/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" ) var _ = errors.Wrap diff --git a/messaging/rest/message.go b/messaging/rest/message.go index 6db179a39..d59cbaf39 100644 --- a/messaging/rest/message.go +++ b/messaging/rest/message.go @@ -6,11 +6,11 @@ import ( "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/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" ) var _ = errors.Wrap diff --git a/messaging/rest/search.go b/messaging/rest/search.go index bb47336cc..f01360b98 100644 --- a/messaging/rest/search.go +++ b/messaging/rest/search.go @@ -3,11 +3,11 @@ package rest import ( "context" - "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/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" "github.com/pkg/errors" ) diff --git a/messaging/service/event.go b/messaging/service/event.go index 080a1ac97..4b47322e0 100644 --- a/messaging/service/event.go +++ b/messaging/service/event.go @@ -6,11 +6,11 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/internal/payload" - "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/logger" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" ) type ( diff --git a/messaging/service/message.go b/messaging/service/message.go index acef21e63..01d4c6dc1 100644 --- a/messaging/service/message.go +++ b/messaging/service/message.go @@ -10,11 +10,11 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "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" + "github.com/cortezaproject/corteza-server/pkg/payload" ) type ( diff --git a/messaging/websocket/event_queue.go b/messaging/websocket/event_queue.go index de9383ca5..0f5381545 100644 --- a/messaging/websocket/event_queue.go +++ b/messaging/websocket/event_queue.go @@ -7,10 +7,10 @@ import ( "github.com/titpetric/factory" - "github.com/cortezaproject/corteza-server/internal/payload" - "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go index 2a21f1eb4..1313e4bdd 100644 --- a/messaging/websocket/session.go +++ b/messaging/websocket/session.go @@ -10,12 +10,12 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "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/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" "github.com/cortezaproject/corteza-server/pkg/sentry" ) diff --git a/messaging/websocket/session_incoming.go b/messaging/websocket/session_incoming.go index 588d7fc58..68dbddbe6 100644 --- a/messaging/websocket/session_incoming.go +++ b/messaging/websocket/session_incoming.go @@ -1,8 +1,9 @@ package websocket import ( - "github.com/cortezaproject/corteza-server/internal/payload" "github.com/pkg/errors" + + "github.com/cortezaproject/corteza-server/pkg/payload" ) func (s *Session) dispatch(raw []byte) error { diff --git a/messaging/websocket/session_incoming_channel.go b/messaging/websocket/session_incoming_channel.go index d20e5931c..187ae521b 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/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" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/incoming" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" ) func (s *Session) channelJoin(ctx context.Context, p *incoming.ChannelJoin) error { diff --git a/messaging/websocket/session_incoming_message.go b/messaging/websocket/session_incoming_message.go index b734e293b..ea2cadd51 100644 --- a/messaging/websocket/session_incoming_message.go +++ b/messaging/websocket/session_incoming_message.go @@ -3,9 +3,9 @@ package websocket import ( "context" - "github.com/cortezaproject/corteza-server/internal/payload" - "github.com/cortezaproject/corteza-server/internal/payload/incoming" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/incoming" ) func (s *Session) messageCreate(ctx context.Context, p *incoming.MessageCreate) error { diff --git a/internal/payload/incoming.go b/pkg/payload/incoming.go similarity index 70% rename from internal/payload/incoming.go rename to pkg/payload/incoming.go index 2f7b5519a..5e405e3a8 100644 --- a/internal/payload/incoming.go +++ b/pkg/payload/incoming.go @@ -3,7 +3,7 @@ package payload import ( "encoding/json" - "github.com/cortezaproject/corteza-server/internal/payload/incoming" + "github.com/cortezaproject/corteza-server/pkg/payload/incoming" ) func Unmarshal(raw []byte) (*incoming.Payload, error) { diff --git a/internal/payload/incoming/channel.go b/pkg/payload/incoming/channel.go similarity index 100% rename from internal/payload/incoming/channel.go rename to pkg/payload/incoming/channel.go diff --git a/internal/payload/incoming/messages.go b/pkg/payload/incoming/messages.go similarity index 100% rename from internal/payload/incoming/messages.go rename to pkg/payload/incoming/messages.go diff --git a/internal/payload/incoming/payload.go b/pkg/payload/incoming/payload.go similarity index 100% rename from internal/payload/incoming/payload.go rename to pkg/payload/incoming/payload.go diff --git a/internal/payload/incoming/user.go b/pkg/payload/incoming/user.go similarity index 100% rename from internal/payload/incoming/user.go rename to pkg/payload/incoming/user.go diff --git a/internal/payload/outgoing.go b/pkg/payload/outgoing.go similarity index 99% rename from internal/payload/outgoing.go rename to pkg/payload/outgoing.go index 680ce97e6..b7039331d 100644 --- a/internal/payload/outgoing.go +++ b/pkg/payload/outgoing.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" - "github.com/cortezaproject/corteza-server/internal/payload/outgoing" messagingTypes "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" systemTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/internal/payload/outgoing/activity.go b/pkg/payload/outgoing/activity.go similarity index 100% rename from internal/payload/outgoing/activity.go rename to pkg/payload/outgoing/activity.go diff --git a/internal/payload/outgoing/attachment.go b/pkg/payload/outgoing/attachment.go similarity index 100% rename from internal/payload/outgoing/attachment.go rename to pkg/payload/outgoing/attachment.go diff --git a/internal/payload/outgoing/channel.go b/pkg/payload/outgoing/channel.go similarity index 100% rename from internal/payload/outgoing/channel.go rename to pkg/payload/outgoing/channel.go diff --git a/internal/payload/outgoing/channel_member.go b/pkg/payload/outgoing/channel_member.go similarity index 100% rename from internal/payload/outgoing/channel_member.go rename to pkg/payload/outgoing/channel_member.go diff --git a/internal/payload/outgoing/command.go b/pkg/payload/outgoing/command.go similarity index 100% rename from internal/payload/outgoing/command.go rename to pkg/payload/outgoing/command.go diff --git a/internal/payload/outgoing/error.go b/pkg/payload/outgoing/error.go similarity index 100% rename from internal/payload/outgoing/error.go rename to pkg/payload/outgoing/error.go diff --git a/internal/payload/outgoing/message.go b/pkg/payload/outgoing/message.go similarity index 100% rename from internal/payload/outgoing/message.go rename to pkg/payload/outgoing/message.go diff --git a/internal/payload/outgoing/payload.go b/pkg/payload/outgoing/payload.go similarity index 100% rename from internal/payload/outgoing/payload.go rename to pkg/payload/outgoing/payload.go diff --git a/internal/payload/outgoing/settings.go b/pkg/payload/outgoing/settings.go similarity index 100% rename from internal/payload/outgoing/settings.go rename to pkg/payload/outgoing/settings.go diff --git a/internal/payload/outgoing/unread.go b/pkg/payload/outgoing/unread.go similarity index 100% rename from internal/payload/outgoing/unread.go rename to pkg/payload/outgoing/unread.go diff --git a/internal/payload/outgoing/user.go b/pkg/payload/outgoing/user.go similarity index 100% rename from internal/payload/outgoing/user.go rename to pkg/payload/outgoing/user.go diff --git a/internal/payload/util.go b/pkg/payload/util.go similarity index 100% rename from internal/payload/util.go rename to pkg/payload/util.go diff --git a/system/rest/auth.go b/system/rest/auth.go index 5f7c477bb..2c9e05c1a 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/payload" - "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" "github.com/cortezaproject/corteza-server/system/rest/request" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/rest/auth_internal.go b/system/rest/auth_internal.go index 1c9862691..b6af3a723 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/payload" - "github.com/cortezaproject/corteza-server/internal/payload/outgoing" "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/pkg/payload" + "github.com/cortezaproject/corteza-server/pkg/payload/outgoing" "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/role.go b/system/rest/role.go index dfbfcfa8b..d5fe44930 100644 --- a/system/rest/role.go +++ b/system/rest/role.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/payload" + "github.com/cortezaproject/corteza-server/pkg/payload" "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/user.go b/system/rest/user.go index 6e4362e7c..e2cdd74d7 100644 --- a/system/rest/user.go +++ b/system/rest/user.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/payload" + "github.com/cortezaproject/corteza-server/pkg/payload" "github.com/cortezaproject/corteza-server/system/rest/request" "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types"