improve terragrunt support #36 (fixes)

tofuutils · Jan 30, 2024 · 54d3955 · 54d3955
1 parent 3016285
commit 54d3955
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/cmd/tenv/subcmd.go b/cmd/tenv/subcmd.go
@@ -319,7 +319,7 @@ func addForceRemoteAndNoInstallFlags(flags *pflag.FlagSet, conf *config.Config,
 	descBuilder.WriteString(params.remoteEnvName)
 	descBuilder.WriteString(" url")
 
-	flags.BoolVarP(&conf.ForceRemote, "force-remote", "f", false, descBuilder.String())
+	flags.BoolVarP(&conf.ForceRemote, "force-remote", "f", conf.ForceRemote, descBuilder.String())
 	flags.BoolVarP(&conf.NoInstall, "no-install", "n", conf.NoInstall, "disable installation of missing version")
 }
 
@@ -331,7 +331,7 @@ func addKeyFlag(flags *pflag.FlagSet, params subCmdParams) {
 
 func addRemoteUrlFlag(flags *pflag.FlagSet, conf *config.Config, params subCmdParams) {
 	if params.needToken {
-		flags.StringVarP(&conf.GithubToken, "github-token", "t", "", "GitHub token (increases GitHub REST API rate limits)")
+		flags.StringVarP(&conf.GithubToken, "github-token", "t", conf.GithubToken, "GitHub token (increases GitHub REST API rate limits)")
 	}
 	flags.StringVarP(params.pRemote, "remote-url", "u", *params.pRemote, "remote url to install from")
 }
diff --git a/cmd/tenv/tenv.go b/cmd/tenv/tenv.go
@@ -100,7 +100,7 @@ func initRootCmd(conf *config.Config) *cobra.Command {
 	}
 	initSubCmds(tgCmd, conf, builder.BuildTgManager(conf), tgParams)
 
-	rootCmd.AddCommand(tfCmd)
+	rootCmd.AddCommand(tgCmd)
 
 	return rootCmd
 }

diff --git a/config/config.go b/config/config.go
@@ -103,8 +103,8 @@ func InitConfigFromEnv() (Config, error) {
 	}
 
 	tgRemoteURL := os.Getenv(TgRemoteURLEnvName)
-	if tfRemoteURL == "" {
-		tfRemoteURL = defaultTerragruntGithubURL
+	if tgRemoteURL == "" {
+		tgRemoteURL = defaultTerragruntGithubURL
 	}
 
 	tofuRemoteURL := os.Getenv(TofuRemoteURLEnvName)

diff --git a/versionmanager/retriever/terragrunt/terragruntretriever.go b/versionmanager/retriever/terragrunt/terragruntretriever.go
@@ -86,7 +86,6 @@ func (r *TerragruntRetriever) ListReleases() ([]string, error) {
 func buildAssetNames() []string {
 	var nameBuilder strings.Builder
 	nameBuilder.WriteString(baseFileName)
-	nameBuilder.WriteByte('_')
 	nameBuilder.WriteString(runtime.GOOS)
 	nameBuilder.WriteByte('_')
 	nameBuilder.WriteString(runtime.GOARCH)

diff --git a/versionmanager/semantic/parser/terragrunt/gruntparser.go b/versionmanager/semantic/parser/terragrunt/gruntparser.go
@@ -36,7 +36,7 @@ const (
 	terraformVersionConstraintName  = "terraform_version_constraint"
 	terragruntVersionConstraintName = "terraform_version_constraint"
 
-	msgTerraGruntErr = "Failed to read terragrunt file :"
+	msgTerragruntErr = "Failed to read terragrunt file :"
 )
 
 var terraformVersionPartialSchema = &hcl.BodySchema{ //nolint
@@ -66,13 +66,13 @@ func retrieveVersionConstraint(versionPartialShema *hcl.BodySchema, versionConst
 	}
 
 	if verbose {
-		fmt.Println(msgTerraGruntErr, err) //nolint
+		fmt.Println(msgTerragruntErr, err) //nolint
 	}
 
 	data, err = os.ReadFile(jsonName)
 	if err != nil {
 		if verbose {
-			fmt.Println(msgTerraGruntErr, err) //nolint
+			fmt.Println(msgTerragruntErr, err) //nolint
 		}
 
 		return "", nil

diff --git a/versionmanager/semantic/parser/tgswitch/tgswitchparser.go b/versionmanager/semantic/parser/tgswitch/tgswitchparser.go
@@ -19,6 +19,7 @@
 package tgswitchparser
 
 import (
+	"fmt"
 	"os"
 	"path"
 
@@ -30,6 +31,8 @@ const (
 	tomlName = ".tgswitch.toml"
 
 	versionName = "version"
+
+	msgTgSwitchErr = "Failed to read tgswitch file :"
 )
 
 func RetrieveTerraguntVersion(conf *config.Config) (string, error) {
@@ -42,6 +45,9 @@ func RetrieveTerraguntVersion(conf *config.Config) (string, error) {
 
 		return parsed[versionName], nil
 	}
+	if conf.Verbose {
+		fmt.Println(msgTgSwitchErr, err) //nolint
+	}
 
 	data, err = os.ReadFile(path.Join(conf.UserPath, tomlName))
 	if err == nil {
@@ -51,10 +57,17 @@ func RetrieveTerraguntVersion(conf *config.Config) (string, error) {
 
 		return parsed[versionName], nil
 	}
+	if conf.Verbose {
+		fmt.Println(msgTgSwitchErr, err) //nolint
+	}
 
 	data, err = os.ReadFile(path.Join(conf.RootPath, tomlName))
 	if err != nil {
-		return "", err
+		if conf.Verbose {
+			fmt.Println(msgTgSwitchErr, err) //nolint
+		}
+
+		return "", nil
 	}
 
 	if _, err = toml.Decode(string(data), &parsed); err != nil {