refactor(generate): split the package for output

aquaproj · Nov 2, 2022 · 42caed5 · 42caed5
1 parent 012273d
commit 42caed5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/pkg/controller/generate/generate.go b/pkg/controller/generate/generate.go
@@ -13,6 +13,7 @@ import (
 	"github.com/aquaproj/aqua/pkg/config"
 	"github.com/aquaproj/aqua/pkg/config/aqua"
 	"github.com/aquaproj/aqua/pkg/config/registry"
+	"github.com/aquaproj/aqua/pkg/controller/generate/output"
 	"github.com/aquaproj/aqua/pkg/domain"
 	"github.com/aquaproj/aqua/pkg/expr"
 	"github.com/aquaproj/aqua/pkg/github"
@@ -46,7 +47,7 @@ type ConfigFinder interface {
 }
 
 type Outputter interface {
-	Output(param *OutputParam) error
+	Output(param *output.Param) error
 }
 
 func New(configFinder ConfigFinder, configReader domain.ConfigReader, registInstaller domain.RegistryInstaller, gh RepositoriesService, fs afero.Fs, fuzzyFinder FuzzyFinder, versionSelector VersionSelector) *Controller {
@@ -60,10 +61,7 @@ func New(configFinder ConfigFinder, configReader domain.ConfigReader, registInst
 		fs:                fs,
 		fuzzyFinder:       fuzzyFinder,
 		versionSelector:   versionSelector,
-		outputter: &outputter{
-			fs:     fs,
-			stdout: os.Stdout,
-		},
+		outputter:         output.New(os.Stdout, fs),
 	}
 }
 
@@ -104,7 +102,7 @@ func (ctrl *Controller) Generate(ctx context.Context, logE *logrus.Entry, param
 		return nil
 	}
 
-	return ctrl.outputter.Output(&OutputParam{ //nolint:wrapcheck
+	return ctrl.outputter.Output(&output.Param{ //nolint:wrapcheck
 		Insert:         param.Insert,
 		Dest:           param.Dest,
 		List:           list,

diff --git a/pkg/controller/generate/insert.go → pkg/controller/generate/output/insert.go b/pkg/controller/generate/insert.go → pkg/controller/generate/output/insert.go
@@ -1,4 +1,4 @@
-package generate
+package output
 
 import (
 	"errors"
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/afero"
 )
 
-func (out *outputter) generateInsert(cfgFilePath string, pkgs []*aqua.Package) error {
+func (out *Outputter) generateInsert(cfgFilePath string, pkgs []*aqua.Package) error {
 	b, err := afero.ReadFile(out.fs, cfgFilePath)
 	if err != nil {
 		return fmt.Errorf("read a configuration file: %w", err)

diff --git a/pkg/controller/generate/output.go → pkg/controller/generate/output/output.go b/pkg/controller/generate/output.go → pkg/controller/generate/output/output.go
@@ -1,4 +1,4 @@
-package generate
+package output
 
 import (
 	"fmt"
@@ -9,19 +9,26 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-type outputter struct {
+type Outputter struct {
 	stdout io.Writer
 	fs     afero.Fs
 }
 
-type OutputParam struct {
+func New(stdout io.Writer, fs afero.Fs) *Outputter {
+	return &Outputter{
+		stdout: stdout,
+		fs:     fs,
+	}
+}
+
+type Param struct {
 	Insert         bool
 	Dest           string
 	List           []*aqua.Package
 	ConfigFilePath string
 }
 
-func (out *outputter) Output(param *OutputParam) error {
+func (out *Outputter) Output(param *Param) error {
 	if !param.Insert && param.Dest == "" {
 		if err := yaml.NewEncoder(out.stdout).Encode(param.List); err != nil {
 			return fmt.Errorf("output generated package configuration: %w", err)