From 73e0180600a814705ec2922a4c9f767e64bb8b55 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sun, 8 Sep 2019 10:01:08 +0200 Subject: [PATCH] Remove internal/ from compose --- compose/autosetup.go | 2 +- compose/compose.go | 2 +- compose/{internal => }/repository/attachment.go | 0 compose/{internal => }/repository/chart.go | 0 compose/{internal => }/repository/error.go | 0 compose/{internal => }/repository/main_test.go | 0 compose/{internal => }/repository/module.go | 0 compose/{internal => }/repository/module_test.go | 0 compose/{internal => }/repository/namespace.go | 0 compose/{internal => }/repository/page.go | 0 compose/{internal => }/repository/ql/README.md | 0 compose/{internal => }/repository/ql/ast_nodes.go | 0 compose/{internal => }/repository/ql/ast_nodes_test.go | 0 compose/{internal => }/repository/ql/ast_parser.go | 0 compose/{internal => }/repository/ql/ast_parser_test.go | 0 compose/{internal => }/repository/ql/handlers.go | 0 compose/{internal => }/repository/ql/lexer.go | 0 compose/{internal => }/repository/ql/lexer_test.go | 0 compose/{internal => }/repository/ql/squirrel.go | 0 compose/{internal => }/repository/ql/token_codes.go | 0 compose/{internal => }/repository/ql/token_consumers.go | 0 compose/{internal => }/repository/record.go | 2 +- compose/{internal => }/repository/record_report_builder.go | 2 +- .../{internal => }/repository/record_report_builder_test.go | 0 compose/{internal => }/repository/record_test.go | 0 compose/{internal => }/repository/repository.go | 0 compose/{internal => }/repository/repository_test.go | 0 compose/{internal => }/repository/sqirrel.go | 0 compose/rest/attachment.go | 2 +- compose/rest/automation_script.go | 2 +- compose/rest/automation_trigger.go | 4 ++-- compose/rest/chart.go | 2 +- compose/rest/middleware.go | 2 +- compose/rest/module.go | 2 +- compose/rest/namespace.go | 2 +- compose/rest/notification.go | 2 +- compose/rest/page.go | 2 +- compose/rest/permissions.go | 2 +- compose/rest/record.go | 4 ++-- compose/{internal => }/service/access_control.go | 0 compose/{internal => }/service/attachment.go | 2 +- compose/{internal => }/service/automation_runner.go | 0 compose/{internal => }/service/automation_runner_test.go | 2 +- compose/{internal => }/service/automation_script.go | 0 compose/{internal => }/service/automation_trigger.go | 0 compose/{internal => }/service/chart.go | 2 +- compose/{internal => }/service/chart_test.go | 0 compose/{internal => }/service/error.go | 0 compose/{internal => }/service/import_session.go | 0 compose/{internal => }/service/import_session_test.go | 0 compose/{internal => }/service/main_test.go | 0 compose/{internal => }/service/mocks/automation_runner.go | 0 compose/{internal => }/service/module.go | 2 +- compose/{internal => }/service/module_test.go | 0 compose/{internal => }/service/namespace.go | 2 +- compose/{internal => }/service/namespace_test.go | 0 compose/{internal => }/service/notification.go | 0 compose/{internal => }/service/page.go | 2 +- compose/{internal => }/service/page_test.go | 0 compose/{internal => }/service/record.go | 2 +- compose/{internal => }/service/record_integration_test.go | 0 compose/{internal => }/service/record_test.go | 0 compose/{internal => }/service/service.go | 2 +- compose/{internal => }/service/system_grpc_client.go | 0 compose/{internal => }/service/system_user.go | 0 system/repository/user.go | 2 +- 66 files changed, 26 insertions(+), 26 deletions(-) rename compose/{internal => }/repository/attachment.go (100%) rename compose/{internal => }/repository/chart.go (100%) rename compose/{internal => }/repository/error.go (100%) rename compose/{internal => }/repository/main_test.go (100%) rename compose/{internal => }/repository/module.go (100%) rename compose/{internal => }/repository/module_test.go (100%) rename compose/{internal => }/repository/namespace.go (100%) rename compose/{internal => }/repository/page.go (100%) rename compose/{internal => }/repository/ql/README.md (100%) rename compose/{internal => }/repository/ql/ast_nodes.go (100%) rename compose/{internal => }/repository/ql/ast_nodes_test.go (100%) rename compose/{internal => }/repository/ql/ast_parser.go (100%) rename compose/{internal => }/repository/ql/ast_parser_test.go (100%) rename compose/{internal => }/repository/ql/handlers.go (100%) rename compose/{internal => }/repository/ql/lexer.go (100%) rename compose/{internal => }/repository/ql/lexer_test.go (100%) rename compose/{internal => }/repository/ql/squirrel.go (100%) rename compose/{internal => }/repository/ql/token_codes.go (100%) rename compose/{internal => }/repository/ql/token_consumers.go (100%) rename compose/{internal => }/repository/record.go (99%) rename compose/{internal => }/repository/record_report_builder.go (98%) rename compose/{internal => }/repository/record_report_builder_test.go (100%) rename compose/{internal => }/repository/record_test.go (100%) rename compose/{internal => }/repository/repository.go (100%) rename compose/{internal => }/repository/repository_test.go (100%) rename compose/{internal => }/repository/sqirrel.go (100%) rename compose/{internal => }/service/access_control.go (100%) rename compose/{internal => }/service/attachment.go (99%) rename compose/{internal => }/service/automation_runner.go (100%) rename compose/{internal => }/service/automation_runner_test.go (99%) rename compose/{internal => }/service/automation_script.go (100%) rename compose/{internal => }/service/automation_trigger.go (100%) rename compose/{internal => }/service/chart.go (98%) rename compose/{internal => }/service/chart_test.go (100%) rename compose/{internal => }/service/error.go (100%) rename compose/{internal => }/service/import_session.go (100%) rename compose/{internal => }/service/import_session_test.go (100%) rename compose/{internal => }/service/main_test.go (100%) rename compose/{internal => }/service/mocks/automation_runner.go (100%) rename compose/{internal => }/service/module.go (98%) rename compose/{internal => }/service/module_test.go (100%) rename compose/{internal => }/service/namespace.go (98%) rename compose/{internal => }/service/namespace_test.go (100%) rename compose/{internal => }/service/notification.go (100%) rename compose/{internal => }/service/page.go (99%) rename compose/{internal => }/service/page_test.go (100%) rename compose/{internal => }/service/record.go (99%) rename compose/{internal => }/service/record_integration_test.go (100%) rename compose/{internal => }/service/record_test.go (100%) rename compose/{internal => }/service/service.go (98%) rename compose/{internal => }/service/system_grpc_client.go (100%) rename compose/{internal => }/service/system_user.go (100%) diff --git a/compose/autosetup.go b/compose/autosetup.go index 16112b2e9..0b0697a0f 100644 --- a/compose/autosetup.go +++ b/compose/autosetup.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/cortezaproject/corteza-server/compose/internal/service" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/pkg/cli" ) diff --git a/compose/compose.go b/compose/compose.go index 3916bbf38..3a4b1e4fc 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -8,8 +8,8 @@ import ( "github.com/titpetric/factory" migrate "github.com/cortezaproject/corteza-server/compose/db" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/pkg/cli" ) diff --git a/compose/internal/repository/attachment.go b/compose/repository/attachment.go similarity index 100% rename from compose/internal/repository/attachment.go rename to compose/repository/attachment.go diff --git a/compose/internal/repository/chart.go b/compose/repository/chart.go similarity index 100% rename from compose/internal/repository/chart.go rename to compose/repository/chart.go diff --git a/compose/internal/repository/error.go b/compose/repository/error.go similarity index 100% rename from compose/internal/repository/error.go rename to compose/repository/error.go diff --git a/compose/internal/repository/main_test.go b/compose/repository/main_test.go similarity index 100% rename from compose/internal/repository/main_test.go rename to compose/repository/main_test.go diff --git a/compose/internal/repository/module.go b/compose/repository/module.go similarity index 100% rename from compose/internal/repository/module.go rename to compose/repository/module.go diff --git a/compose/internal/repository/module_test.go b/compose/repository/module_test.go similarity index 100% rename from compose/internal/repository/module_test.go rename to compose/repository/module_test.go diff --git a/compose/internal/repository/namespace.go b/compose/repository/namespace.go similarity index 100% rename from compose/internal/repository/namespace.go rename to compose/repository/namespace.go diff --git a/compose/internal/repository/page.go b/compose/repository/page.go similarity index 100% rename from compose/internal/repository/page.go rename to compose/repository/page.go diff --git a/compose/internal/repository/ql/README.md b/compose/repository/ql/README.md similarity index 100% rename from compose/internal/repository/ql/README.md rename to compose/repository/ql/README.md diff --git a/compose/internal/repository/ql/ast_nodes.go b/compose/repository/ql/ast_nodes.go similarity index 100% rename from compose/internal/repository/ql/ast_nodes.go rename to compose/repository/ql/ast_nodes.go diff --git a/compose/internal/repository/ql/ast_nodes_test.go b/compose/repository/ql/ast_nodes_test.go similarity index 100% rename from compose/internal/repository/ql/ast_nodes_test.go rename to compose/repository/ql/ast_nodes_test.go diff --git a/compose/internal/repository/ql/ast_parser.go b/compose/repository/ql/ast_parser.go similarity index 100% rename from compose/internal/repository/ql/ast_parser.go rename to compose/repository/ql/ast_parser.go diff --git a/compose/internal/repository/ql/ast_parser_test.go b/compose/repository/ql/ast_parser_test.go similarity index 100% rename from compose/internal/repository/ql/ast_parser_test.go rename to compose/repository/ql/ast_parser_test.go diff --git a/compose/internal/repository/ql/handlers.go b/compose/repository/ql/handlers.go similarity index 100% rename from compose/internal/repository/ql/handlers.go rename to compose/repository/ql/handlers.go diff --git a/compose/internal/repository/ql/lexer.go b/compose/repository/ql/lexer.go similarity index 100% rename from compose/internal/repository/ql/lexer.go rename to compose/repository/ql/lexer.go diff --git a/compose/internal/repository/ql/lexer_test.go b/compose/repository/ql/lexer_test.go similarity index 100% rename from compose/internal/repository/ql/lexer_test.go rename to compose/repository/ql/lexer_test.go diff --git a/compose/internal/repository/ql/squirrel.go b/compose/repository/ql/squirrel.go similarity index 100% rename from compose/internal/repository/ql/squirrel.go rename to compose/repository/ql/squirrel.go diff --git a/compose/internal/repository/ql/token_codes.go b/compose/repository/ql/token_codes.go similarity index 100% rename from compose/internal/repository/ql/token_codes.go rename to compose/repository/ql/token_codes.go diff --git a/compose/internal/repository/ql/token_consumers.go b/compose/repository/ql/token_consumers.go similarity index 100% rename from compose/internal/repository/ql/token_consumers.go rename to compose/repository/ql/token_consumers.go diff --git a/compose/internal/repository/record.go b/compose/repository/record.go similarity index 99% rename from compose/internal/repository/record.go rename to compose/repository/record.go index 5d8205b4e..b811c8787 100644 --- a/compose/internal/repository/record.go +++ b/compose/repository/record.go @@ -10,7 +10,7 @@ import ( "github.com/titpetric/factory" "gopkg.in/Masterminds/squirrel.v1" - "github.com/cortezaproject/corteza-server/compose/internal/repository/ql" + "github.com/cortezaproject/corteza-server/compose/repository/ql" "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/pkg/rh" ) diff --git a/compose/internal/repository/record_report_builder.go b/compose/repository/record_report_builder.go similarity index 98% rename from compose/internal/repository/record_report_builder.go rename to compose/repository/record_report_builder.go index 635038702..5ea165feb 100644 --- a/compose/internal/repository/record_report_builder.go +++ b/compose/repository/record_report_builder.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "gopkg.in/Masterminds/squirrel.v1" - "github.com/cortezaproject/corteza-server/compose/internal/repository/ql" + "github.com/cortezaproject/corteza-server/compose/repository/ql" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/internal/repository/record_report_builder_test.go b/compose/repository/record_report_builder_test.go similarity index 100% rename from compose/internal/repository/record_report_builder_test.go rename to compose/repository/record_report_builder_test.go diff --git a/compose/internal/repository/record_test.go b/compose/repository/record_test.go similarity index 100% rename from compose/internal/repository/record_test.go rename to compose/repository/record_test.go diff --git a/compose/internal/repository/repository.go b/compose/repository/repository.go similarity index 100% rename from compose/internal/repository/repository.go rename to compose/repository/repository.go diff --git a/compose/internal/repository/repository_test.go b/compose/repository/repository_test.go similarity index 100% rename from compose/internal/repository/repository_test.go rename to compose/repository/repository_test.go diff --git a/compose/internal/repository/sqirrel.go b/compose/repository/sqirrel.go similarity index 100% rename from compose/internal/repository/sqirrel.go rename to compose/repository/sqirrel.go diff --git a/compose/rest/attachment.go b/compose/rest/attachment.go index 42a8fa5fd..441705390 100644 --- a/compose/rest/attachment.go +++ b/compose/rest/attachment.go @@ -9,8 +9,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "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" diff --git a/compose/rest/automation_script.go b/compose/rest/automation_script.go index 341da7a34..4602aa191 100644 --- a/compose/rest/automation_script.go +++ b/compose/rest/automation_script.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "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/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/rh" diff --git a/compose/rest/automation_trigger.go b/compose/rest/automation_trigger.go index 34c74d77d..7e1179281 100644 --- a/compose/rest/automation_trigger.go +++ b/compose/rest/automation_trigger.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/repository" - "github.com/cortezaproject/corteza-server/compose/internal/service" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/pkg/automation" "github.com/cortezaproject/corteza-server/pkg/rh" ) diff --git a/compose/rest/chart.go b/compose/rest/chart.go index 3716b8a7d..66026bdec 100644 --- a/compose/rest/chart.go +++ b/compose/rest/chart.go @@ -5,8 +5,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" "github.com/pkg/errors" diff --git a/compose/rest/middleware.go b/compose/rest/middleware.go index f0e81c127..d98c814ba 100644 --- a/compose/rest/middleware.go +++ b/compose/rest/middleware.go @@ -3,7 +3,7 @@ package rest import ( "net/http" - "github.com/cortezaproject/corteza-server/compose/internal/service" + "github.com/cortezaproject/corteza-server/compose/service" ) func middlewareAllowedAccess(next http.Handler) http.Handler { diff --git a/compose/rest/module.go b/compose/rest/module.go index 2b65ee89a..00db1318b 100644 --- a/compose/rest/module.go +++ b/compose/rest/module.go @@ -5,8 +5,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/rest/namespace.go b/compose/rest/namespace.go index 4d20da5ae..857282973 100644 --- a/compose/rest/namespace.go +++ b/compose/rest/namespace.go @@ -5,8 +5,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/rest/notification.go b/compose/rest/notification.go index 62a9d2a74..ef2ea2081 100644 --- a/compose/rest/notification.go +++ b/compose/rest/notification.go @@ -3,8 +3,8 @@ package rest import ( "context" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/internal/mail" "github.com/pkg/errors" diff --git a/compose/rest/page.go b/compose/rest/page.go index 7ee42342c..8aa732014 100644 --- a/compose/rest/page.go +++ b/compose/rest/page.go @@ -5,8 +5,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "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" ) diff --git a/compose/rest/permissions.go b/compose/rest/permissions.go index 66799d18f..92dce81cd 100644 --- a/compose/rest/permissions.go +++ b/compose/rest/permissions.go @@ -5,8 +5,8 @@ import ( "github.com/titpetric/factory/resputil" - "github.com/cortezaproject/corteza-server/compose/internal/service" "github.com/cortezaproject/corteza-server/compose/rest/request" + "github.com/cortezaproject/corteza-server/compose/service" "github.com/cortezaproject/corteza-server/internal/permissions" ) diff --git a/compose/rest/record.go b/compose/rest/record.go index b503f967d..cd440088b 100644 --- a/compose/rest/record.go +++ b/compose/rest/record.go @@ -14,9 +14,9 @@ import ( "github.com/cortezaproject/corteza-server/compose/decoder" "github.com/cortezaproject/corteza-server/compose/encoder" - "github.com/cortezaproject/corteza-server/compose/internal/repository" - "github.com/cortezaproject/corteza-server/compose/internal/service" + "github.com/cortezaproject/corteza-server/compose/repository" "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/pkg/mime" "github.com/cortezaproject/corteza-server/pkg/rh" diff --git a/compose/internal/service/access_control.go b/compose/service/access_control.go similarity index 100% rename from compose/internal/service/access_control.go rename to compose/service/access_control.go diff --git a/compose/internal/service/attachment.go b/compose/service/attachment.go similarity index 99% rename from compose/internal/service/attachment.go rename to compose/service/attachment.go index 867838fc9..41057a982 100644 --- a/compose/internal/service/attachment.go +++ b/compose/service/attachment.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "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" diff --git a/compose/internal/service/automation_runner.go b/compose/service/automation_runner.go similarity index 100% rename from compose/internal/service/automation_runner.go rename to compose/service/automation_runner.go diff --git a/compose/internal/service/automation_runner_test.go b/compose/service/automation_runner_test.go similarity index 99% rename from compose/internal/service/automation_runner_test.go rename to compose/service/automation_runner_test.go index 44f7797f8..b1c926aa3 100644 --- a/compose/internal/service/automation_runner_test.go +++ b/compose/service/automation_runner_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/mock/gomock" - service_mocks "github.com/cortezaproject/corteza-server/compose/internal/service/mocks" + service_mocks "github.com/cortezaproject/corteza-server/compose/service/mocks" "github.com/cortezaproject/corteza-server/internal/test" "github.com/cortezaproject/corteza-server/pkg/automation" ) diff --git a/compose/internal/service/automation_script.go b/compose/service/automation_script.go similarity index 100% rename from compose/internal/service/automation_script.go rename to compose/service/automation_script.go diff --git a/compose/internal/service/automation_trigger.go b/compose/service/automation_trigger.go similarity index 100% rename from compose/internal/service/automation_trigger.go rename to compose/service/automation_trigger.go diff --git a/compose/internal/service/chart.go b/compose/service/chart.go similarity index 98% rename from compose/internal/service/chart.go rename to compose/service/chart.go index e436a4a08..7e6971eb0 100644 --- a/compose/internal/service/chart.go +++ b/compose/service/chart.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/internal/service/chart_test.go b/compose/service/chart_test.go similarity index 100% rename from compose/internal/service/chart_test.go rename to compose/service/chart_test.go diff --git a/compose/internal/service/error.go b/compose/service/error.go similarity index 100% rename from compose/internal/service/error.go rename to compose/service/error.go diff --git a/compose/internal/service/import_session.go b/compose/service/import_session.go similarity index 100% rename from compose/internal/service/import_session.go rename to compose/service/import_session.go diff --git a/compose/internal/service/import_session_test.go b/compose/service/import_session_test.go similarity index 100% rename from compose/internal/service/import_session_test.go rename to compose/service/import_session_test.go diff --git a/compose/internal/service/main_test.go b/compose/service/main_test.go similarity index 100% rename from compose/internal/service/main_test.go rename to compose/service/main_test.go diff --git a/compose/internal/service/mocks/automation_runner.go b/compose/service/mocks/automation_runner.go similarity index 100% rename from compose/internal/service/mocks/automation_runner.go rename to compose/service/mocks/automation_runner.go diff --git a/compose/internal/service/module.go b/compose/service/module.go similarity index 98% rename from compose/internal/service/module.go rename to compose/service/module.go index 417268d72..2f7ac7393 100644 --- a/compose/internal/service/module.go +++ b/compose/service/module.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/internal/service/module_test.go b/compose/service/module_test.go similarity index 100% rename from compose/internal/service/module_test.go rename to compose/service/module_test.go diff --git a/compose/internal/service/namespace.go b/compose/service/namespace.go similarity index 98% rename from compose/internal/service/namespace.go rename to compose/service/namespace.go index 7b1b1f431..9f904b2b4 100644 --- a/compose/internal/service/namespace.go +++ b/compose/service/namespace.go @@ -6,7 +6,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/internal/permissions" ) diff --git a/compose/internal/service/namespace_test.go b/compose/service/namespace_test.go similarity index 100% rename from compose/internal/service/namespace_test.go rename to compose/service/namespace_test.go diff --git a/compose/internal/service/notification.go b/compose/service/notification.go similarity index 100% rename from compose/internal/service/notification.go rename to compose/service/notification.go diff --git a/compose/internal/service/page.go b/compose/service/page.go similarity index 99% rename from compose/internal/service/page.go rename to compose/service/page.go index 551293338..39f861a44 100644 --- a/compose/internal/service/page.go +++ b/compose/service/page.go @@ -7,7 +7,7 @@ import ( "github.com/titpetric/factory" "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" ) diff --git a/compose/internal/service/page_test.go b/compose/service/page_test.go similarity index 100% rename from compose/internal/service/page_test.go rename to compose/service/page_test.go diff --git a/compose/internal/service/record.go b/compose/service/record.go similarity index 99% rename from compose/internal/service/record.go rename to compose/service/record.go index 9ab4a1b83..4fe7dffa4 100644 --- a/compose/internal/service/record.go +++ b/compose/service/record.go @@ -11,7 +11,7 @@ import ( "go.uber.org/zap" "github.com/cortezaproject/corteza-server/compose/decoder" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "github.com/cortezaproject/corteza-server/compose/repository" "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/internal/auth" ) diff --git a/compose/internal/service/record_integration_test.go b/compose/service/record_integration_test.go similarity index 100% rename from compose/internal/service/record_integration_test.go rename to compose/service/record_integration_test.go diff --git a/compose/internal/service/record_test.go b/compose/service/record_test.go similarity index 100% rename from compose/internal/service/record_test.go rename to compose/service/record_test.go diff --git a/compose/internal/service/service.go b/compose/service/service.go similarity index 98% rename from compose/internal/service/service.go rename to compose/service/service.go index c3d1523a4..4f53df55b 100644 --- a/compose/internal/service/service.go +++ b/compose/service/service.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/cortezaproject/corteza-server/compose/internal/repository" + "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" diff --git a/compose/internal/service/system_grpc_client.go b/compose/service/system_grpc_client.go similarity index 100% rename from compose/internal/service/system_grpc_client.go rename to compose/service/system_grpc_client.go diff --git a/compose/internal/service/system_user.go b/compose/service/system_user.go similarity index 100% rename from compose/internal/service/system_user.go rename to compose/service/system_user.go diff --git a/system/repository/user.go b/system/repository/user.go index d803dc47d..c7f7807ed 100644 --- a/system/repository/user.go +++ b/system/repository/user.go @@ -161,7 +161,7 @@ func (r user) Find(filter types.UserFilter) (set types.UserSet, f types.UserFilt } // @todo add support for more sophisticated sorting through ql - // refactor github.com/cortezaproject/corteza-server/compose/internal/repository/ql + // refactor github.com/cortezaproject/corteza-server/compose/repository/ql // for common use (out of compose pkg) switch f.Sort { case "createdAt":