From f493f4fb6b04dba620efc569dbb963cefe66539f Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 1 Oct 2019 17:53:20 +0200 Subject: [PATCH] Move internal/permissions to pkg/permissions --- compose/commands/exporter.go | 2 +- compose/importer/aux.go | 2 +- compose/importer/importer.go | 2 +- compose/importer/main_test.go | 2 +- compose/rest/permissions.go | 2 +- compose/rest/request/permissions.go | 7 +++---- compose/service/access_control.go | 2 +- compose/service/automation_script.go | 2 +- compose/service/namespace.go | 2 +- compose/service/record_test.go | 2 +- compose/service/service.go | 2 +- compose/types/chart.go | 2 +- compose/types/module.go | 3 ++- compose/types/module_field.go | 2 +- compose/types/namespace.go | 2 +- compose/types/page.go | 2 +- compose/types/permission_resources.go | 2 +- compose/types/record.go | 2 +- messaging/importer/aux.go | 2 +- messaging/importer/importer.go | 2 +- messaging/importer/main_test.go | 2 +- messaging/rest/permissions.go | 2 +- messaging/rest/request/permissions.go | 7 +++---- messaging/service/access_control.go | 2 +- messaging/service/service.go | 2 +- messaging/types/channel.go | 3 ++- messaging/types/message.go | 9 ++++----- messaging/types/permission_resources.go | 2 +- pkg/automation/script.go | 2 +- pkg/importer/importer.go | 2 +- {internal => pkg}/permissions/effective.go | 0 {internal => pkg}/permissions/filter.go | 0 {internal => pkg}/permissions/importer.go | 0 {internal => pkg}/permissions/importer_test.go | 0 {internal => pkg}/permissions/permissions.go | 0 {internal => pkg}/permissions/repository.go | 0 {internal => pkg}/permissions/resource.gen.go | 0 {internal => pkg}/permissions/resource.gen_test.go | 3 +-- {internal => pkg}/permissions/resource.go | 0 {internal => pkg}/permissions/resource_test.go | 0 {internal => pkg}/permissions/rule.gen.go | 0 {internal => pkg}/permissions/rule.gen_test.go | 3 +-- {internal => pkg}/permissions/rule.go | 0 {internal => pkg}/permissions/ruleset_checks.go | 0 {internal => pkg}/permissions/ruleset_checks_test.go | 0 {internal => pkg}/permissions/ruleset_utils.go | 0 {internal => pkg}/permissions/ruleset_utils_test.go | 0 {internal => pkg}/permissions/service.go | 0 {internal => pkg}/permissions/service_alt.go | 0 system/importer/aux.go | 2 +- system/importer/importer.go | 2 +- system/importer/main_test.go | 2 +- system/provision-config.go | 2 +- system/rest/permissions.go | 2 +- system/rest/request/permissions.go | 7 +++---- system/service/access_control.go | 2 +- system/service/auth.go | 2 +- system/service/automation_script.go | 2 +- system/service/service.go | 2 +- system/types/applications.go | 3 ++- system/types/organisation.go | 2 +- system/types/permission_resources.go | 2 +- system/types/reminder.go | 5 +++-- system/types/role.go | 2 +- system/types/user.go | 2 +- tests/compose/main_test.go | 2 +- tests/compose/permissions_delete_test.go | 2 +- tests/messaging/channel_state_test.go | 2 +- tests/messaging/main_test.go | 2 +- tests/messaging/permissions_delete_test.go | 2 +- tests/system/main_test.go | 2 +- tests/system/permissions_delete_test.go | 2 +- 72 files changed, 69 insertions(+), 71 deletions(-) rename {internal => pkg}/permissions/effective.go (100%) rename {internal => pkg}/permissions/filter.go (100%) rename {internal => pkg}/permissions/importer.go (100%) rename {internal => pkg}/permissions/importer_test.go (100%) rename {internal => pkg}/permissions/permissions.go (100%) rename {internal => pkg}/permissions/repository.go (100%) rename {internal => pkg}/permissions/resource.gen.go (100%) rename {internal => pkg}/permissions/resource.gen_test.go (99%) rename {internal => pkg}/permissions/resource.go (100%) rename {internal => pkg}/permissions/resource_test.go (100%) rename {internal => pkg}/permissions/rule.gen.go (100%) rename {internal => pkg}/permissions/rule.gen_test.go (99%) rename {internal => pkg}/permissions/rule.go (100%) rename {internal => pkg}/permissions/ruleset_checks.go (100%) rename {internal => pkg}/permissions/ruleset_checks_test.go (100%) rename {internal => pkg}/permissions/ruleset_utils.go (100%) rename {internal => pkg}/permissions/ruleset_utils_test.go (100%) rename {internal => pkg}/permissions/service.go (100%) rename {internal => pkg}/permissions/service_alt.go (100%) diff --git a/compose/commands/exporter.go b/compose/commands/exporter.go index e24d5679a..08bf89830 100644 --- a/compose/commands/exporter.go +++ b/compose/commands/exporter.go @@ -16,12 +16,12 @@ 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/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" "github.com/cortezaproject/corteza-server/pkg/handle" + "github.com/cortezaproject/corteza-server/pkg/permissions" sysTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/compose/importer/aux.go b/compose/importer/aux.go index f70564e8b..73abad207 100644 --- a/compose/importer/aux.go +++ b/compose/importer/aux.go @@ -8,7 +8,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" sysTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/compose/importer/importer.go b/compose/importer/importer.go index 944cf163b..6f28e7f4f 100644 --- a/compose/importer/importer.go +++ b/compose/importer/importer.go @@ -7,10 +7,10 @@ import ( "github.com/pkg/errors" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/deinterfacer" "github.com/cortezaproject/corteza-server/pkg/importer" + "github.com/cortezaproject/corteza-server/pkg/permissions" sysTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/compose/importer/main_test.go b/compose/importer/main_test.go index f3b045501..4e4729913 100644 --- a/compose/importer/main_test.go +++ b/compose/importer/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) var ( diff --git a/compose/rest/permissions.go b/compose/rest/permissions.go index 92dce81cd..a10ce35b6 100644 --- a/compose/rest/permissions.go +++ b/compose/rest/permissions.go @@ -7,7 +7,7 @@ import ( "github.com/cortezaproject/corteza-server/compose/rest/request" "github.com/cortezaproject/corteza-server/compose/service" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/rest/request/permissions.go b/compose/rest/request/permissions.go index 4a0e7116f..f9c4399cb 100644 --- a/compose/rest/request/permissions.go +++ b/compose/rest/request/permissions.go @@ -16,17 +16,16 @@ package request */ import ( - "io" - "strings" - "encoding/json" + "io" "mime/multipart" "net/http" + "strings" "github.com/go-chi/chi" "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) var _ = chi.URLParam diff --git a/compose/service/access_control.go b/compose/service/access_control.go index af91a4785..8913d3641 100644 --- a/compose/service/access_control.go +++ b/compose/service/access_control.go @@ -4,8 +4,8 @@ import ( "context" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/automation" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/service/automation_script.go b/compose/service/automation_script.go index 6ecf27d99..477388c5b 100644 --- a/compose/service/automation_script.go +++ b/compose/service/automation_script.go @@ -6,9 +6,9 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/types" - "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/permissions" ) type ( diff --git a/compose/service/namespace.go b/compose/service/namespace.go index ecfe3535a..276cdcdce 100644 --- a/compose/service/namespace.go +++ b/compose/service/namespace.go @@ -9,9 +9,9 @@ import ( "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/handle" "github.com/cortezaproject/corteza-server/pkg/logger" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/service/record_test.go b/compose/service/record_test.go index 5b91c69ca..49ece0180 100644 --- a/compose/service/record_test.go +++ b/compose/service/record_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) func TestValueSanitizer(t *testing.T) { diff --git a/compose/service/service.go b/compose/service/service.go index 7fba79858..14a7316e1 100644 --- a/compose/service/service.go +++ b/compose/service/service.go @@ -7,11 +7,11 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/repository" - "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/automation/corredor" "github.com/cortezaproject/corteza-server/pkg/cli/options" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/store" systemProto "github.com/cortezaproject/corteza-server/system/proto" ) diff --git a/compose/types/chart.go b/compose/types/chart.go index 6a3520f7a..9d629fd7c 100644 --- a/compose/types/chart.go +++ b/compose/types/chart.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/types/module.go b/compose/types/module.go index ca04dcd1b..90d5fca1e 100644 --- a/compose/types/module.go +++ b/compose/types/module.go @@ -3,8 +3,9 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/jmoiron/sqlx/types" + + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/types/module_field.go b/compose/types/module_field.go index abb859233..739ff06c0 100644 --- a/compose/types/module_field.go +++ b/compose/types/module_field.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/types/namespace.go b/compose/types/namespace.go index 2c178d9a7..737995dcf 100644 --- a/compose/types/namespace.go +++ b/compose/types/namespace.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/types/page.go b/compose/types/page.go index 2a876b767..e0c6fe197 100644 --- a/compose/types/page.go +++ b/compose/types/page.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/compose/types/permission_resources.go b/compose/types/permission_resources.go index 37b07e711..788ce45ee 100644 --- a/compose/types/permission_resources.go +++ b/compose/types/permission_resources.go @@ -1,7 +1,7 @@ package types import ( - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) const ComposePermissionResource = permissions.Resource("compose") diff --git a/compose/types/record.go b/compose/types/record.go index 3e7353cd6..f9d6d4bda 100644 --- a/compose/types/record.go +++ b/compose/types/record.go @@ -3,7 +3,7 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/rh" ) diff --git a/messaging/importer/aux.go b/messaging/importer/aux.go index 3b775a2de..eee35e209 100644 --- a/messaging/importer/aux.go +++ b/messaging/importer/aux.go @@ -6,9 +6,9 @@ import ( "gopkg.in/yaml.v2" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/service" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/permissions" sysTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/messaging/importer/importer.go b/messaging/importer/importer.go index 81b2d1ff1..10e242dc9 100644 --- a/messaging/importer/importer.go +++ b/messaging/importer/importer.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/deinterfacer" "github.com/cortezaproject/corteza-server/pkg/importer" + "github.com/cortezaproject/corteza-server/pkg/permissions" sysTypes "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/messaging/importer/main_test.go b/messaging/importer/main_test.go index b1268d833..b70d8e667 100644 --- a/messaging/importer/main_test.go +++ b/messaging/importer/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/messaging/rest/permissions.go b/messaging/rest/permissions.go index 7bbb34200..508901603 100644 --- a/messaging/rest/permissions.go +++ b/messaging/rest/permissions.go @@ -5,9 +5,9 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/rest/request" "github.com/cortezaproject/corteza-server/messaging/service" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/messaging/rest/request/permissions.go b/messaging/rest/request/permissions.go index 4a0e7116f..f9c4399cb 100644 --- a/messaging/rest/request/permissions.go +++ b/messaging/rest/request/permissions.go @@ -16,17 +16,16 @@ package request */ import ( - "io" - "strings" - "encoding/json" + "io" "mime/multipart" "net/http" + "strings" "github.com/go-chi/chi" "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) var _ = chi.URLParam diff --git a/messaging/service/access_control.go b/messaging/service/access_control.go index 8c8213241..a05901cb1 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/permissions" "github.com/cortezaproject/corteza-server/messaging/types" "github.com/cortezaproject/corteza-server/pkg/auth" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/messaging/service/service.go b/messaging/service/service.go index d3db8914b..41ad6d297 100644 --- a/messaging/service/service.go +++ b/messaging/service/service.go @@ -6,10 +6,10 @@ import ( "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/repository" "github.com/cortezaproject/corteza-server/pkg/cli/options" "github.com/cortezaproject/corteza-server/pkg/http" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/store" ) diff --git a/messaging/types/channel.go b/messaging/types/channel.go index d1b727747..c70bfb032 100644 --- a/messaging/types/channel.go +++ b/messaging/types/channel.go @@ -3,8 +3,9 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/jmoiron/sqlx/types" + + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/messaging/types/message.go b/messaging/types/message.go index 7b8111ef7..8a192b6e5 100644 --- a/messaging/types/message.go +++ b/messaging/types/message.go @@ -1,14 +1,13 @@ package types import ( + "database/sql/driver" + "encoding/json" "time" - "encoding/json" - - "database/sql/driver" - - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/pkg/errors" + + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/messaging/types/permission_resources.go b/messaging/types/permission_resources.go index ae7a14836..f9bf59d5c 100644 --- a/messaging/types/permission_resources.go +++ b/messaging/types/permission_resources.go @@ -1,7 +1,7 @@ package types import ( - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) const MessagingPermissionResource = permissions.Resource("messaging") diff --git a/pkg/automation/script.go b/pkg/automation/script.go index 0b3d94354..65186d8e9 100644 --- a/pkg/automation/script.go +++ b/pkg/automation/script.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/rh" ) diff --git a/pkg/importer/importer.go b/pkg/importer/importer.go index ed72d333a..9700b4ba5 100644 --- a/pkg/importer/importer.go +++ b/pkg/importer/importer.go @@ -3,7 +3,7 @@ package importer import ( "context" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/internal/permissions/effective.go b/pkg/permissions/effective.go similarity index 100% rename from internal/permissions/effective.go rename to pkg/permissions/effective.go diff --git a/internal/permissions/filter.go b/pkg/permissions/filter.go similarity index 100% rename from internal/permissions/filter.go rename to pkg/permissions/filter.go diff --git a/internal/permissions/importer.go b/pkg/permissions/importer.go similarity index 100% rename from internal/permissions/importer.go rename to pkg/permissions/importer.go diff --git a/internal/permissions/importer_test.go b/pkg/permissions/importer_test.go similarity index 100% rename from internal/permissions/importer_test.go rename to pkg/permissions/importer_test.go diff --git a/internal/permissions/permissions.go b/pkg/permissions/permissions.go similarity index 100% rename from internal/permissions/permissions.go rename to pkg/permissions/permissions.go diff --git a/internal/permissions/repository.go b/pkg/permissions/repository.go similarity index 100% rename from internal/permissions/repository.go rename to pkg/permissions/repository.go diff --git a/internal/permissions/resource.gen.go b/pkg/permissions/resource.gen.go similarity index 100% rename from internal/permissions/resource.gen.go rename to pkg/permissions/resource.gen.go diff --git a/internal/permissions/resource.gen_test.go b/pkg/permissions/resource.gen_test.go similarity index 99% rename from internal/permissions/resource.gen_test.go rename to pkg/permissions/resource.gen_test.go index 464d22b0c..f2562fb0e 100644 --- a/internal/permissions/resource.gen_test.go +++ b/pkg/permissions/resource.gen_test.go @@ -1,9 +1,8 @@ package permissions import ( - "testing" - "errors" + "testing" "github.com/stretchr/testify/require" ) diff --git a/internal/permissions/resource.go b/pkg/permissions/resource.go similarity index 100% rename from internal/permissions/resource.go rename to pkg/permissions/resource.go diff --git a/internal/permissions/resource_test.go b/pkg/permissions/resource_test.go similarity index 100% rename from internal/permissions/resource_test.go rename to pkg/permissions/resource_test.go diff --git a/internal/permissions/rule.gen.go b/pkg/permissions/rule.gen.go similarity index 100% rename from internal/permissions/rule.gen.go rename to pkg/permissions/rule.gen.go diff --git a/internal/permissions/rule.gen_test.go b/pkg/permissions/rule.gen_test.go similarity index 99% rename from internal/permissions/rule.gen_test.go rename to pkg/permissions/rule.gen_test.go index c4fa775fb..4c9d99636 100644 --- a/internal/permissions/rule.gen_test.go +++ b/pkg/permissions/rule.gen_test.go @@ -1,9 +1,8 @@ package permissions import ( - "testing" - "errors" + "testing" "github.com/stretchr/testify/require" ) diff --git a/internal/permissions/rule.go b/pkg/permissions/rule.go similarity index 100% rename from internal/permissions/rule.go rename to pkg/permissions/rule.go diff --git a/internal/permissions/ruleset_checks.go b/pkg/permissions/ruleset_checks.go similarity index 100% rename from internal/permissions/ruleset_checks.go rename to pkg/permissions/ruleset_checks.go diff --git a/internal/permissions/ruleset_checks_test.go b/pkg/permissions/ruleset_checks_test.go similarity index 100% rename from internal/permissions/ruleset_checks_test.go rename to pkg/permissions/ruleset_checks_test.go diff --git a/internal/permissions/ruleset_utils.go b/pkg/permissions/ruleset_utils.go similarity index 100% rename from internal/permissions/ruleset_utils.go rename to pkg/permissions/ruleset_utils.go diff --git a/internal/permissions/ruleset_utils_test.go b/pkg/permissions/ruleset_utils_test.go similarity index 100% rename from internal/permissions/ruleset_utils_test.go rename to pkg/permissions/ruleset_utils_test.go diff --git a/internal/permissions/service.go b/pkg/permissions/service.go similarity index 100% rename from internal/permissions/service.go rename to pkg/permissions/service.go diff --git a/internal/permissions/service_alt.go b/pkg/permissions/service_alt.go similarity index 100% rename from internal/permissions/service_alt.go rename to pkg/permissions/service_alt.go diff --git a/system/importer/aux.go b/system/importer/aux.go index 3aa90cd44..489c66c36 100644 --- a/system/importer/aux.go +++ b/system/importer/aux.go @@ -6,7 +6,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/service" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/system/importer/importer.go b/system/importer/importer.go index 11613e087..b9d444c98 100644 --- a/system/importer/importer.go +++ b/system/importer/importer.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/deinterfacer" "github.com/cortezaproject/corteza-server/pkg/importer" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/system/importer/main_test.go b/system/importer/main_test.go index 9052da558..93e672011 100644 --- a/system/importer/main_test.go +++ b/system/importer/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/provision-config.go b/system/provision-config.go index e83a9e4e2..515511a9e 100644 --- a/system/provision-config.go +++ b/system/provision-config.go @@ -8,10 +8,10 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "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" + "github.com/cortezaproject/corteza-server/pkg/permissions" provision "github.com/cortezaproject/corteza-server/provision/system" "github.com/cortezaproject/corteza-server/system/importer" "github.com/cortezaproject/corteza-server/system/repository" diff --git a/system/rest/permissions.go b/system/rest/permissions.go index 3d8cb234c..262d1caf1 100644 --- a/system/rest/permissions.go +++ b/system/rest/permissions.go @@ -5,7 +5,7 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/rest/request" "github.com/cortezaproject/corteza-server/system/service" ) diff --git a/system/rest/request/permissions.go b/system/rest/request/permissions.go index 4a0e7116f..f9c4399cb 100644 --- a/system/rest/request/permissions.go +++ b/system/rest/request/permissions.go @@ -16,17 +16,16 @@ package request */ import ( - "io" - "strings" - "encoding/json" + "io" "mime/multipart" "net/http" + "strings" "github.com/go-chi/chi" "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) var _ = chi.URLParam diff --git a/system/service/access_control.go b/system/service/access_control.go index 3a44672d1..403540817 100644 --- a/system/service/access_control.go +++ b/system/service/access_control.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/automation" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/system/service/auth.go b/system/service/auth.go index 3e339952c..fcedeb0a0 100644 --- a/system/service/auth.go +++ b/system/service/auth.go @@ -13,8 +13,8 @@ import ( "go.uber.org/zap/zapcore" "golang.org/x/crypto/bcrypt" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/pkg/logger" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/rand" "github.com/cortezaproject/corteza-server/system/repository" "github.com/cortezaproject/corteza-server/system/types" diff --git a/system/service/automation_script.go b/system/service/automation_script.go index c3c47e386..86f7b0b69 100644 --- a/system/service/automation_script.go +++ b/system/service/automation_script.go @@ -6,10 +6,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "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" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/system/service/service.go b/system/service/service.go index 08eb49936..78c5ec7f0 100644 --- a/system/service/service.go +++ b/system/service/service.go @@ -5,12 +5,12 @@ import ( "go.uber.org/zap" - "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" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/repository" "github.com/cortezaproject/corteza-server/system/types" ) diff --git a/system/types/applications.go b/system/types/applications.go index 96ab71d9a..04c052430 100644 --- a/system/types/applications.go +++ b/system/types/applications.go @@ -5,8 +5,9 @@ import ( "encoding/json" "time" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/pkg/errors" + + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/system/types/organisation.go b/system/types/organisation.go index d29146560..5db09d953 100644 --- a/system/types/organisation.go +++ b/system/types/organisation.go @@ -3,7 +3,7 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/system/types/permission_resources.go b/system/types/permission_resources.go index 3f6ac0b5a..baa2fb224 100644 --- a/system/types/permission_resources.go +++ b/system/types/permission_resources.go @@ -1,7 +1,7 @@ package types import ( - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) const SystemPermissionResource = permissions.Resource("system") diff --git a/system/types/reminder.go b/system/types/reminder.go index f73ac6bdc..774538a81 100644 --- a/system/types/reminder.go +++ b/system/types/reminder.go @@ -3,9 +3,10 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" - "github.com/cortezaproject/corteza-server/pkg/rh" "github.com/jmoiron/sqlx/types" + + "github.com/cortezaproject/corteza-server/pkg/permissions" + "github.com/cortezaproject/corteza-server/pkg/rh" ) type ( diff --git a/system/types/role.go b/system/types/role.go index a0d9e09d5..955f7e99f 100644 --- a/system/types/role.go +++ b/system/types/role.go @@ -3,7 +3,7 @@ package types import ( "time" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/system/types/user.go b/system/types/user.go index e92c67893..86300b8a6 100644 --- a/system/types/user.go +++ b/system/types/user.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" ) type ( diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go index f7ce0cd28..7cc6104ef 100644 --- a/tests/compose/main_test.go +++ b/tests/compose/main_test.go @@ -19,11 +19,11 @@ 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/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/permissions" "github.com/cortezaproject/corteza-server/pkg/rand" "github.com/cortezaproject/corteza-server/pkg/store" sysTypes "github.com/cortezaproject/corteza-server/system/types" diff --git a/tests/compose/permissions_delete_test.go b/tests/compose/permissions_delete_test.go index 441e5bc11..78b2c6cb2 100644 --- a/tests/compose/permissions_delete_test.go +++ b/tests/compose/permissions_delete_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/tests/helpers" ) diff --git a/tests/messaging/channel_state_test.go b/tests/messaging/channel_state_test.go index 71cb3abe2..353072b55 100644 --- a/tests/messaging/channel_state_test.go +++ b/tests/messaging/channel_state_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/tests/helpers" ) diff --git a/tests/messaging/main_test.go b/tests/messaging/main_test.go index dd8a2fb2f..e14482e64 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/permissions" "github.com/cortezaproject/corteza-server/messaging" migrate "github.com/cortezaproject/corteza-server/messaging/db" "github.com/cortezaproject/corteza-server/messaging/rest" @@ -24,6 +23,7 @@ import ( "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/permissions" "github.com/cortezaproject/corteza-server/pkg/rand" "github.com/cortezaproject/corteza-server/pkg/store" sysTypes "github.com/cortezaproject/corteza-server/system/types" diff --git a/tests/messaging/permissions_delete_test.go b/tests/messaging/permissions_delete_test.go index b09a73b88..54fe6755f 100644 --- a/tests/messaging/permissions_delete_test.go +++ b/tests/messaging/permissions_delete_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/cortezaproject/corteza-server/internal/permissions" "github.com/cortezaproject/corteza-server/messaging/types" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/tests/helpers" ) diff --git a/tests/system/main_test.go b/tests/system/main_test.go index fff9c6353..bc3c3bf60 100644 --- a/tests/system/main_test.go +++ b/tests/system/main_test.go @@ -13,11 +13,11 @@ import ( "github.com/go-chi/chi" "go.uber.org/zap" - "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/permissions" "github.com/cortezaproject/corteza-server/pkg/rand" "github.com/cortezaproject/corteza-server/system" migrate "github.com/cortezaproject/corteza-server/system/db" diff --git a/tests/system/permissions_delete_test.go b/tests/system/permissions_delete_test.go index 2daaf0fd6..c9009cf34 100644 --- a/tests/system/permissions_delete_test.go +++ b/tests/system/permissions_delete_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/cortezaproject/corteza-server/internal/permissions" + "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/system/types" "github.com/cortezaproject/corteza-server/tests/helpers" )