Merge pull request #118 from numary/feature/fix-aliased-import

Fix wrongly named imports due to the "pkg" package introduction.

Author: gfyrag

cmd/container.go

@@ -5,7 +5,7 @@ import (
 	"github.com/numary/ledger/pkg/api"
 	"github.com/numary/ledger/pkg/api/controllers"
 	"github.com/numary/ledger/pkg/ledger"
-	storage2 "github.com/numary/ledger/pkg/storage"
+	"github.com/numary/ledger/pkg/storage"
 	"github.com/pkg/errors"
 	"go.uber.org/fx"
 )
@@ -74,7 +74,7 @@ func NewContainer(options ...option) *fx.App {
 	providers := make([]interface{}, 0)
 	providers = append(providers,
 		fx.Annotate(func() string { return cfg.version }, fx.ResultTags(`name:"version"`)),
-		fx.Annotate(func(driver storage2.Driver) string { return driver.Name() }, fx.ResultTags(`name:"storageDriver"`)),
+		fx.Annotate(func(driver storage.Driver) string { return driver.Name() }, fx.ResultTags(`name:"storageDriver"`)),
 		fx.Annotate(func() controllers.LedgerLister { return cfg.ledgerLister }, fx.ResultTags(`name:"ledgerLister"`)),
 		fx.Annotate(func() string { return cfg.basicAuth }, fx.ResultTags(`name:"httpBasic"`)),
 		fx.Annotate(ledger.NewResolver, fx.ParamTags(`group:"resolverOptions"`)),
@@ -84,19 +84,19 @@ func NewContainer(options ...option) *fx.App {
 			fx.As(new(ledger.ResolverOption)),
 		),
 		api.NewAPI,
-		func(driver storage2.Driver) storage2.Factory {
-			f := storage2.NewDefaultFactory(driver)
+		func(driver storage.Driver) storage.Factory {
+			f := storage.NewDefaultFactory(driver)
 			if cfg.cache {
-				f = storage2.NewCachedStorageFactory(f)
+				f = storage.NewCachedStorageFactory(f)
 			}
 			if cfg.rememberConfig {
-				f = storage2.NewRememberConfigStorageFactory(f)
+				f = storage.NewRememberConfigStorageFactory(f)
 			}
 			return f
 		},
 	)
 	invokes := make([]interface{}, 0)
-	invokes = append(invokes, func(driver storage2.Driver, lifecycle fx.Lifecycle) error {
+	invokes = append(invokes, func(driver storage.Driver, lifecycle fx.Lifecycle) error {
 		err := driver.Initialize(context.Background())
 		if err != nil {
 			return errors.Wrap(err, "initializing driver")

cmd/container_test.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"context"
 	"github.com/numary/ledger/pkg/ledgertesting"
-	storage2 "github.com/numary/ledger/pkg/storage"
+	"github.com/numary/ledger/pkg/storage"
 	"github.com/numary/ledger/pkg/storage/sqlstorage"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/fx"
@@ -21,7 +21,7 @@ func TestContainers(t *testing.T) {
 		{
 			name: "default",
 			options: []option{
-				WithOption(fx.Provide(func() storage2.Driver {
+				WithOption(fx.Provide(func() storage.Driver {
 					return sqlstorage.NewInMemorySQLiteDriver()
 				})),
 			},
@@ -31,10 +31,10 @@ func TestContainers(t *testing.T) {
 			options: []option{
 				WithRememberConfig(false),
 				WithOption(fx.Provide(ledgertesting.PostgresServer)),
-				WithOption(fx.Provide(func(t *testing.T, pgServer *ledgertesting.PGServer) storage2.Driver {
+				WithOption(fx.Provide(func(t *testing.T, pgServer *ledgertesting.PGServer) storage.Driver {
 					return sqlstorage.NewCachedDBDriver("postgres", sqlstorage.PostgreSQL, pgServer.ConnString())
 				})),
-				WithOption(fx.Invoke(func(t *testing.T, storageFactory storage2.Factory) {
+				WithOption(fx.Invoke(func(t *testing.T, storageFactory storage.Factory) {
 					store, err := storageFactory.GetStore("testing")
 					assert.NoError(t, err)
 					assert.NoError(t, store.Close(context.Background()))

cmd/root.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/numary/ledger/pkg/api"
 	"github.com/numary/ledger/pkg/api/controllers"
-	storage2 "github.com/numary/ledger/pkg/storage"
+	"github.com/numary/ledger/pkg/storage"
 	"github.com/numary/ledger/pkg/storage/sqlstorage"
 	"github.com/numary/machine/script/compiler"
 	"github.com/pkg/errors"
@@ -127,7 +127,7 @@ func NewRootCommand() *cobra.Command {
 		Use: "init",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			_, err := createContainer(
-				WithOption(fx.Invoke(func(storageFactory storage2.Factory) error {
+				WithOption(fx.Invoke(func(storageFactory storage.Factory) error {
 					s, err := storageFactory.GetStore("default")
 					if err != nil {
 						return err
@@ -269,7 +269,7 @@ func createContainer(opts ...option) (*fx.App, error) {
 
 	opts = append(opts,
 		WithVersion(Version),
-		WithOption(fx.Provide(func() (storage2.Driver, error) {
+		WithOption(fx.Provide(func() (storage.Driver, error) {
 			switch viper.GetString("storage.driver") {
 			case "sqlite":
 				return sqlstorage.NewOpenCloseDBDriver("sqlite", sqlstorage.SQLite, func(name string) string {

pkg/api/routes/routes.go

@@ -4,8 +4,8 @@ import (
 	"github.com/gin-contrib/cors"
 	"github.com/gin-contrib/logger"
 	"github.com/gin-gonic/gin"
-	controllers2 "github.com/numary/ledger/pkg/api/controllers"
-	middlewares2 "github.com/numary/ledger/pkg/api/middlewares"
+	"github.com/numary/ledger/pkg/api/controllers"
+	"github.com/numary/ledger/pkg/api/middlewares"
 	"github.com/numary/ledger/pkg/ledger"
 	"go.uber.org/fx"
 )
@@ -16,26 +16,26 @@ var Module = fx.Options(
 
 // Routes -
 type Routes struct {
-	resolver              *ledger.Resolver
-	authMiddleware        middlewares2.AuthMiddleware
-	ledgerMiddleware      middlewares2.LedgerMiddleware
-	configController      controllers2.ConfigController
-	ledgerController      controllers2.LedgerController
-	scriptController      controllers2.ScriptController
-	accountController     controllers2.AccountController
-	transactionController controllers2.TransactionController
+	resolver         *ledger.Resolver
+	authMiddleware   middlewares.AuthMiddleware
+	ledgerMiddleware middlewares.LedgerMiddleware
+	configController controllers.ConfigController
+	ledgerController      controllers.LedgerController
+	scriptController      controllers.ScriptController
+	accountController     controllers.AccountController
+	transactionController controllers.TransactionController
 }
 
 // NewRoutes -
 func NewRoutes(
 	resolver *ledger.Resolver,
-	authMiddleware middlewares2.AuthMiddleware,
-	ledgerMiddleware middlewares2.LedgerMiddleware,
-	configController controllers2.ConfigController,
-	ledgerController controllers2.LedgerController,
-	scriptController controllers2.ScriptController,
-	accountController controllers2.AccountController,
-	transactionController controllers2.TransactionController,
+	authMiddleware middlewares.AuthMiddleware,
+	ledgerMiddleware middlewares.LedgerMiddleware,
+	configController controllers.ConfigController,
+	ledgerController controllers.LedgerController,
+	scriptController controllers.ScriptController,
+	accountController controllers.AccountController,
+	transactionController controllers.TransactionController,
 ) *Routes {
 	return &Routes{
 		resolver:              resolver,

pkg/ledger/ledger_test.go

@@ -7,7 +7,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/numary/ledger/pkg/ledgertesting"
-	storage2 "github.com/numary/ledger/pkg/storage"
+	"github.com/numary/ledger/pkg/storage"
 	"github.com/numary/ledger/pkg/storage/sqlstorage"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -22,20 +22,20 @@ import (
 	"go.uber.org/fx"
 )
 
-var driver storage2.Driver
+var driver storage.Driver
 
 func with(f func(l *Ledger)) {
 	app := fx.New(
 		fx.NopLogger,
-		fx.Provide(func() storage2.Driver {
+		fx.Provide(func() storage.Driver {
 			return driver
 		}),
-		fx.Invoke(func(d storage2.Driver) error {
+		fx.Invoke(func(d storage.Driver) error {
 			return d.Initialize(context.Background())
 		}),
-		fx.Provide(storage2.NewDefaultFactory),
+		fx.Provide(storage.NewDefaultFactory),
 		fx.Provide(
-			func(storageFactory storage2.Factory) (*Ledger, error) {
+			func(storageFactory storage.Factory) (*Ledger, error) {
 				store, err := storageFactory.GetStore("test")
 				if err != nil {
 					return nil, err