refactor: Better usage of fx

learn-video · Jan 15, 2024 · 82b1c33 · 82b1c33
1 parent 2a124a0
commit 82b1c33
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git a/cmd/player.go b/cmd/player.go
@@ -7,7 +7,7 @@ import (
 	"github.com/mauricioabreu/mosaic-video/internal/config"
 	"github.com/mauricioabreu/mosaic-video/internal/logging"
 	"github.com/mauricioabreu/mosaic-video/internal/player"
-	"github.com/mauricioabreu/mosaic-video/internal/storage"
+	"github.com/mauricioabreu/mosaic-video/internal/storage/s3"
 	"github.com/spf13/cobra"
 	"go.uber.org/fx"
 )
@@ -22,9 +22,9 @@ func Player() *cobra.Command {
 			}
 
 			app := fx.New(
-				config.Module,
-				storage.Module,
 				fx.Provide(
+					config.NewConfig,
+					s3.NewClient,
 					logging.NewLogger,
 					player.NewHlsPlaylistHandler,
 					player.NewHlsPlayerHandler,

diff --git a/cmd/storage.go b/cmd/storage.go
@@ -6,7 +6,7 @@ import (
 	"github.com/joho/godotenv"
 	"github.com/mauricioabreu/mosaic-video/internal/config"
 	"github.com/mauricioabreu/mosaic-video/internal/logging"
-	"github.com/mauricioabreu/mosaic-video/internal/storage"
+	"github.com/mauricioabreu/mosaic-video/internal/storage/s3"
 	"github.com/mauricioabreu/mosaic-video/internal/uploader"
 	"github.com/spf13/cobra"
 	"go.uber.org/fx"
@@ -22,10 +22,12 @@ func Store() *cobra.Command {
 			}
 
 			app := fx.New(
-				config.Module,
-				fx.Provide(logging.NewLogger),
-				uploader.Module,
-				storage.Module,
+				fx.Provide(
+					config.NewConfig,
+					logging.NewLogger,
+					uploader.NewHandler,
+					s3.NewClient,
+				),
 				fx.Invoke(uploader.Run),
 			)
 

diff --git a/cmd/worker.go b/cmd/worker.go
@@ -22,8 +22,8 @@ func Work() *cobra.Command {
 			}
 
 			app := fx.New(
-				config.Module,
 				fx.Provide(
+					config.NewConfig,
 					logging.NewLogger,
 					locking.NewRedisLocker,
 				),

diff --git a/internal/config/module.go b/internal/config/module.go
diff --git a/internal/storage/module.go b/internal/storage/module.go