diff --git a/app/boot_levels.go b/app/boot_levels.go index 5930e9f67..bcfd6c97c 100644 --- a/app/boot_levels.go +++ b/app/boot_levels.go @@ -29,9 +29,9 @@ import ( "github.com/cortezaproject/corteza-server/pkg/provision" "github.com/cortezaproject/corteza-server/pkg/rbac" "github.com/cortezaproject/corteza-server/pkg/scheduler" + "github.com/cortezaproject/corteza-server/pkg/seeder" "github.com/cortezaproject/corteza-server/pkg/sentry" "github.com/cortezaproject/corteza-server/pkg/websocket" - "github.com/cortezaproject/corteza-server/seeder" "github.com/cortezaproject/corteza-server/store" sysService "github.com/cortezaproject/corteza-server/system/service" sysEvent "github.com/cortezaproject/corteza-server/system/service/event" diff --git a/app/cli.go b/app/cli.go index 76fe4698c..d276cea10 100644 --- a/app/cli.go +++ b/app/cli.go @@ -9,7 +9,7 @@ import ( "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/cortezaproject/corteza-server/pkg/logger" "github.com/cortezaproject/corteza-server/pkg/options" - fakerCommands "github.com/cortezaproject/corteza-server/seeder/commands" + fakerCommands "github.com/cortezaproject/corteza-server/pkg/seeder/commands" "github.com/cortezaproject/corteza-server/store" systemCommands "github.com/cortezaproject/corteza-server/system/commands" ) diff --git a/seeder/commands/commands.go b/pkg/seeder/commands/commands.go similarity index 99% rename from seeder/commands/commands.go rename to pkg/seeder/commands/commands.go index fb7a35c80..d849be1dc 100644 --- a/seeder/commands/commands.go +++ b/pkg/seeder/commands/commands.go @@ -2,6 +2,7 @@ package commands import ( "context" + "github.com/cortezaproject/corteza-server/pkg/cli" "github.com/spf13/cobra" ) diff --git a/seeder/commands/seeder.go b/pkg/seeder/commands/seeder.go similarity index 98% rename from seeder/commands/seeder.go rename to pkg/seeder/commands/seeder.go index 4cebffbe6..e66b18199 100644 --- a/seeder/commands/seeder.go +++ b/pkg/seeder/commands/seeder.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/pkg/cli" - "github.com/cortezaproject/corteza-server/seeder" + "github.com/cortezaproject/corteza-server/pkg/seeder" "github.com/spf13/cobra" ) @@ -141,7 +141,7 @@ func deleteAll(ctx context.Context, app serviceInitializer) (cmd *cobra.Command) ) cmd = &cobra.Command{ Use: "delete", - Short: "delete all data", + Short: "delete all seeded data", PreRunE: commandPreRunInitService(app), Run: func(cmd *cobra.Command, args []string) { var ( diff --git a/seeder/faker.go b/pkg/seeder/faker.go similarity index 99% rename from seeder/faker.go rename to pkg/seeder/faker.go index c2532219e..e6b12a9ec 100644 --- a/seeder/faker.go +++ b/pkg/seeder/faker.go @@ -1,8 +1,9 @@ package seeder import ( - "github.com/brianvoe/gofakeit/v6" "strings" + + "github.com/brianvoe/gofakeit/v6" ) type ( diff --git a/seeder/seeder.go b/pkg/seeder/seeder.go similarity index 99% rename from seeder/seeder.go rename to pkg/seeder/seeder.go index ce5a39547..e8f3bcb56 100644 --- a/seeder/seeder.go +++ b/pkg/seeder/seeder.go @@ -3,12 +3,13 @@ package seeder import ( "context" "fmt" + "time" + cTypes "github.com/cortezaproject/corteza-server/compose/types" "github.com/cortezaproject/corteza-server/pkg/id" lTypes "github.com/cortezaproject/corteza-server/pkg/label/types" "github.com/cortezaproject/corteza-server/store" sTypes "github.com/cortezaproject/corteza-server/system/types" - "time" ) type ( diff --git a/tests/seeder/main_test.go b/tests/seeder/main_test.go index 953405c02..8fd348dfb 100644 --- a/tests/seeder/main_test.go +++ b/tests/seeder/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/cortezaproject/corteza-server/pkg/label" lType "github.com/cortezaproject/corteza-server/pkg/label/types" "github.com/cortezaproject/corteza-server/pkg/logger" - "github.com/cortezaproject/corteza-server/seeder" + "github.com/cortezaproject/corteza-server/pkg/seeder" "github.com/cortezaproject/corteza-server/store" sTypes "github.com/cortezaproject/corteza-server/system/types" "github.com/cortezaproject/corteza-server/tests/helpers" diff --git a/tests/seeder/seeder_test.go b/tests/seeder/seeder_test.go index 1d052242e..683660f4d 100644 --- a/tests/seeder/seeder_test.go +++ b/tests/seeder/seeder_test.go @@ -2,7 +2,7 @@ package seeder import ( "github.com/cortezaproject/corteza-server/compose/types" - "github.com/cortezaproject/corteza-server/seeder" + "github.com/cortezaproject/corteza-server/pkg/seeder" "testing" )