refactor: rename package

0xDones · Jun 25, 2023 · d8eeb71 · d8eeb71
1 parent 947ff84
commit d8eeb71
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/cmd/clean.go b/cmd/clean.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"tfgen/config"
+	"tfgen/tfgen"
 
 	"github.com/rs/zerolog/log"
-
 	"github.com/spf13/cobra"
 )
 
@@ -36,7 +35,7 @@ func clean(targetDir string) error {
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to get absolute path")
 	}
-	configHandler := config.NewConfigHandler(absTargetDir)
+	configHandler := tfgen.NewConfigHandler(absTargetDir)
 	if err := configHandler.ParseConfigFiles(); err != nil {
 		return err
 	}

diff --git a/cmd/exec.go b/cmd/exec.go
@@ -4,11 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"tfgen/config"
-	"tfgen/utils"
+	"tfgen/tfgen"
 
 	"github.com/rs/zerolog/log"
-
 	"github.com/spf13/cobra"
 )
 
@@ -37,7 +35,7 @@ func exec(targetDir string) error {
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to get absolute path")
 	}
-	configHandler := config.NewConfigHandler(absTargetDir)
+	configHandler := tfgen.NewConfigHandler(absTargetDir)
 	if err := configHandler.ParseConfigFiles(); err != nil {
 		return err
 	}
@@ -47,7 +45,7 @@ func exec(targetDir string) error {
 	hasError := false
 	for templateName, templateBody := range configHandler.ConfigFile.TemplateFiles {
 		filePath := filepath.Join(configHandler.TargetDir, templateName)
-		if err := utils.WriteFile(filePath, templateBody, configHandler.TemplateContext); err != nil {
+		if err := tfgen.WriteFile(filePath, templateBody, configHandler.TemplateContext); err != nil {
 			hasError = true
 		}
 	}

diff --git a/config/config.go → tfgen/config.go b/config/config.go → tfgen/config.go
@@ -1,4 +1,4 @@
-package config
+package tfgen
 
 import (
 	"path"

diff --git a/config/finder.go → tfgen/finder.go b/config/finder.go → tfgen/finder.go
@@ -1,4 +1,4 @@
-package config
+package tfgen
 
 import (
 	"fmt"

diff --git a/utils/fs.go → tfgen/fs.go b/utils/fs.go → tfgen/fs.go
@@ -1,4 +1,4 @@
-package utils
+package tfgen
 
 import (
 	"os"

diff --git a/config/handler.go → tfgen/handler.go b/config/handler.go → tfgen/handler.go
@@ -1,9 +1,8 @@
-package config
+package tfgen
 
 import (
 	"path"
 	"path/filepath"
-	"tfgen/utils"
 
 	"github.com/rs/zerolog/log"
 )
@@ -31,7 +30,7 @@ func NewConfigHandler(targetDir string) *ConfigHandler {
 }
 
 func (c *ConfigHandler) ParseConfigFiles() error {
-	configFiles := []ConfigFile{}
+	var configFiles []ConfigFile
 	targetDir := c.TargetDir
 	for {
 		configFilePath, err := searchInParentDirs(targetDir, CONFIG_FILE_NAME, MAX_ITER)
@@ -40,7 +39,7 @@ func (c *ConfigHandler) ParseConfigFiles() error {
 			return err
 		}
 
-		byteContent := utils.ReadFile(configFilePath)
+		byteContent := ReadFile(configFilePath)
 		config, err := NewConfigFile(byteContent, configFilePath)
 		if err != nil {
 			return err
@@ -87,7 +86,7 @@ func (c *ConfigHandler) SetupTemplateContext() {
 func (c *ConfigHandler) CleanupFiles() error {
 	for templateName := range c.ConfigFile.TemplateFiles {
 		filePath := filepath.Join(c.TargetDir, templateName)
-		err := utils.DeleteFile(filePath)
+		err := DeleteFile(filePath)
 		if err != nil {
 			log.Error().Err(err).Msgf("failed to delete file: %s", templateName)
 			return err