Change all the imports to github.com/tofuutils/tenv/v2 module path (#178

) * Change all the imports to github.com/tofuutils/tenv/v2 module path * Regroup project imports Signed-off-by: Artiom Diomin <[email protected]>
tofuutils · Jun 19, 2024 · d3f88df · d3f88df
1 parent 5527cbb
commit d3f88df
Show file tree

Hide file tree

Showing 38 changed files with 147 additions and 133 deletions.
diff --git a/cmd/atmos/atmos.go b/cmd/atmos/atmos.go
@@ -19,9 +19,9 @@
 package main
 
 import (
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	"github.com/tofuutils/tenv/versionmanager/proxy"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	"github.com/tofuutils/tenv/v2/versionmanager/proxy"
 )
 
 func main() {

diff --git a/cmd/tenv/subcmd.go b/cmd/tenv/subcmd.go
@@ -24,12 +24,13 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
+	"github.com/tofuutils/tenv/v2/versionmanager"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/pkg/loghelper"
-	"github.com/tofuutils/tenv/versionmanager"
-	"github.com/tofuutils/tenv/versionmanager/semantic"
 )
 
 const deprecationMsg = "Direct usage of this subcommand on tenv is deprecated, you should use tofu subcommand instead.\n\n"

diff --git a/cmd/tenv/tenv.go b/cmd/tenv/tenv.go
@@ -24,11 +24,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	terragruntparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/terragrunt"
+
 	"github.com/spf13/cobra"
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	terragruntparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/terragrunt"
 )
 
 const (
@@ -182,7 +183,7 @@ func newUpdatePathCmd() *cobra.Command {
 			if gha {
 				pathfilePath := os.Getenv("GITHUB_PATH")
 				if pathfilePath != "" {
-					pathfile, err := os.OpenFile(pathfilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+					pathfile, err := os.OpenFile(pathfilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 					if err != nil {
 						return err
 					}

diff --git a/cmd/terraform/terraform.go b/cmd/terraform/terraform.go
@@ -19,9 +19,9 @@
 package main
 
 import (
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	"github.com/tofuutils/tenv/versionmanager/proxy"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	"github.com/tofuutils/tenv/v2/versionmanager/proxy"
 )
 
 func main() {

diff --git a/cmd/terragrunt/terragrunt.go b/cmd/terragrunt/terragrunt.go
@@ -19,9 +19,9 @@
 package main
 
 import (
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	"github.com/tofuutils/tenv/versionmanager/proxy"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	"github.com/tofuutils/tenv/v2/versionmanager/proxy"
 )
 
 func main() {

diff --git a/cmd/tf/tf.go b/cmd/tf/tf.go
@@ -22,10 +22,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	"github.com/tofuutils/tenv/versionmanager/proxy"
-	terragruntparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/terragrunt"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	"github.com/tofuutils/tenv/v2/versionmanager/proxy"
+	terragruntparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/terragrunt"
 )
 
 func main() {

diff --git a/cmd/tofu/tofu.go b/cmd/tofu/tofu.go
@@ -19,9 +19,9 @@
 package main
 
 import (
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager/builder"
-	"github.com/tofuutils/tenv/versionmanager/proxy"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager/builder"
+	"github.com/tofuutils/tenv/v2/versionmanager/proxy"
 )
 
 func main() {

diff --git a/config/config.go b/config/config.go
@@ -26,9 +26,10 @@ import (
 	"runtime"
 	"strconv"
 
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
+
 	"github.com/fatih/color"
 	"github.com/hashicorp/go-hclog"
-	"github.com/tofuutils/tenv/pkg/loghelper"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/pkg/check/binary/check_test.go b/pkg/check/binary/check_test.go
@@ -21,7 +21,7 @@ package bincheck_test
 import (
 	"testing"
 
-	bincheck "github.com/tofuutils/tenv/pkg/check/binary"
+	bincheck "github.com/tofuutils/tenv/v2/pkg/check/binary"
 )
 
 func TestTextFileCheck(t *testing.T) {

diff --git a/pkg/check/cosign/check.go b/pkg/check/cosign/check.go
@@ -24,8 +24,9 @@ import (
 	"os/exec"
 	"strings"
 
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
+
 	"github.com/hashicorp/go-hclog"
-	"github.com/tofuutils/tenv/pkg/loghelper"
 )
 
 const (
@@ -92,7 +93,7 @@ func tempFile(name string, data []byte) (string, func(), error) {
 	}
 
 	tmpFileName := tmpFile.Name()
-	if err = os.WriteFile(tmpFileName, data, 0600); err != nil {
+	if err = os.WriteFile(tmpFileName, data, 0o600); err != nil {
 		return "", nil, err
 	}
 

diff --git a/pkg/check/cosign/check_test.go b/pkg/check/cosign/check_test.go
@@ -22,8 +22,8 @@ import (
 	_ "embed"
 	"testing"
 
-	cosigncheck "github.com/tofuutils/tenv/pkg/check/cosign"
-	"github.com/tofuutils/tenv/pkg/loghelper"
+	cosigncheck "github.com/tofuutils/tenv/v2/pkg/check/cosign"
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
 )
 
 const (

diff --git a/pkg/check/pgp/check_test.go b/pkg/check/pgp/check_test.go
@@ -22,7 +22,7 @@ import (
 	_ "embed"
 	"testing"
 
-	pgpcheck "github.com/tofuutils/tenv/pkg/check/pgp"
+	pgpcheck "github.com/tofuutils/tenv/v2/pkg/check/pgp"
 )
 
 //go:embed testdata/terraform_1.6.6_SHA256SUMS

diff --git a/pkg/check/sha256/check_test.go b/pkg/check/sha256/check_test.go
@@ -22,7 +22,7 @@ import (
 	_ "embed"
 	"testing"
 
-	sha256check "github.com/tofuutils/tenv/pkg/check/sha256"
+	sha256check "github.com/tofuutils/tenv/v2/pkg/check/sha256"
 )
 
 //go:embed testdata/hello.txt

diff --git a/pkg/download/download_test.go b/pkg/download/download_test.go
@@ -21,7 +21,7 @@ package download_test
 import (
 	"testing"
 
-	"github.com/tofuutils/tenv/pkg/download"
+	"github.com/tofuutils/tenv/v2/pkg/download"
 )
 
 func TestUrlTransformer(t *testing.T) {

diff --git a/pkg/github/github.go b/pkg/github/github.go
@@ -26,8 +26,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/tofuutils/tenv/pkg/apimsg"
-	versionfinder "github.com/tofuutils/tenv/versionmanager/semantic/finder"
+	"github.com/tofuutils/tenv/v2/pkg/apimsg"
+	versionfinder "github.com/tofuutils/tenv/v2/versionmanager/semantic/finder"
 )
 
 const (

diff --git a/pkg/github/github_test.go b/pkg/github/github_test.go
@@ -24,8 +24,8 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/tofuutils/tenv/pkg/apimsg"
-	"github.com/tofuutils/tenv/versionmanager/semantic"
+	"github.com/tofuutils/tenv/v2/pkg/apimsg"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic"
 )
 
 // empty marker.

diff --git a/pkg/lockfile/lockfile.go b/pkg/lockfile/lockfile.go
@@ -25,8 +25,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
+
 	"github.com/hashicorp/go-hclog"
-	"github.com/tofuutils/tenv/pkg/loghelper"
 )
 
 const (
@@ -39,7 +40,7 @@ const (
 func Write(dirPath string, displayer loghelper.Displayer) func() {
 	lockPath := filepath.Join(dirPath, ".lock")
 	for logLevel := hclog.Warn; true; logLevel = hclog.Info {
-		f, err := os.OpenFile(lockPath, os.O_CREATE|os.O_EXCL, 0644) //nolint
+		f, err := os.OpenFile(lockPath, os.O_CREATE|os.O_EXCL, 0o644) //nolint
 		if err == nil {
 			f.Close()
 			break

diff --git a/pkg/lockfile/lockfile_test.go b/pkg/lockfile/lockfile_test.go
@@ -26,8 +26,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/tofuutils/tenv/pkg/lockfile"
-	"github.com/tofuutils/tenv/pkg/loghelper"
+	"github.com/tofuutils/tenv/v2/pkg/lockfile"
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
 )
 
 //go:embed testdata/data1.txt
@@ -52,7 +52,7 @@ func TestParallelWriteRead(t *testing.T) {
 		os.RemoveAll(parallelDirPath)
 	}()
 
-	if err = os.MkdirAll(parallelDirPath, 0755); err != nil {
+	if err = os.MkdirAll(parallelDirPath, 0o755); err != nil {
 		t.Fatal("Unexpected error during test init (2) :", err)
 	}
 
@@ -95,7 +95,7 @@ func writeReadFile(dirPath string, filePath string, data []byte, displayer loghe
 	deleteLock := lockfile.Write(dirPath, displayer)
 	defer deleteLock()
 
-	if err := os.WriteFile(filePath, data, 0644); err != nil {
+	if err := os.WriteFile(filePath, data, 0o644); err != nil {
 		return nil, err
 	}
 

diff --git a/pkg/reversecmp/reverse_test.go b/pkg/reversecmp/reverse_test.go
@@ -22,7 +22,7 @@ import (
 	"cmp"
 	"testing"
 
-	"github.com/tofuutils/tenv/pkg/reversecmp"
+	"github.com/tofuutils/tenv/v2/pkg/reversecmp"
 )
 
 func TestReverserFalse(t *testing.T) {

diff --git a/pkg/zip/zip.go b/pkg/zip/zip.go
@@ -27,12 +27,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	bincheck "github.com/tofuutils/tenv/pkg/check/binary"
+	bincheck "github.com/tofuutils/tenv/v2/pkg/check/binary"
 )
 
 // ensure the directory exists with a MkdirAll call.
 func UnzipToDir(dataZip []byte, dirPath string) error {
-	err := os.MkdirAll(dirPath, 0755)
+	err := os.MkdirAll(dirPath, 0o755)
 	if err != nil {
 		return err
 	}
@@ -81,7 +81,7 @@ func copyZipFileToDir(zipFile *zip.File, dirPath string) error {
 
 	if destPath[len(destPath)-1] == '/' {
 		// trailing slash indicates a directory
-		return os.MkdirAll(destPath, 0755)
+		return os.MkdirAll(destPath, 0o755)
 	}
 
 	reader, err := zipFile.Open()

diff --git a/versionmanager/builder/builder.go b/versionmanager/builder/builder.go
@@ -19,17 +19,17 @@
 package builder
 
 import (
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager"
-	atmosretriever "github.com/tofuutils/tenv/versionmanager/retriever/atmos"
-	terraformretriever "github.com/tofuutils/tenv/versionmanager/retriever/terraform"
-	terragruntretriever "github.com/tofuutils/tenv/versionmanager/retriever/terragrunt"
-	tofuretriever "github.com/tofuutils/tenv/versionmanager/retriever/tofu"
-	"github.com/tofuutils/tenv/versionmanager/semantic"
-	flatparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/flat"
-	terragruntparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/terragrunt"
-	tomlparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/toml"
-	"github.com/tofuutils/tenv/versionmanager/semantic/types"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager"
+	atmosretriever "github.com/tofuutils/tenv/v2/versionmanager/retriever/atmos"
+	terraformretriever "github.com/tofuutils/tenv/v2/versionmanager/retriever/terraform"
+	terragruntretriever "github.com/tofuutils/tenv/v2/versionmanager/retriever/terragrunt"
+	tofuretriever "github.com/tofuutils/tenv/v2/versionmanager/retriever/tofu"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic"
+	flatparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/flat"
+	terragruntparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/terragrunt"
+	tomlparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/toml"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic/types"
 )
 
 func BuildAtmosManager(conf *config.Config, gruntParser terragruntparser.TerragruntParser) versionmanager.VersionManager {

diff --git a/versionmanager/manager.go b/versionmanager/manager.go
@@ -27,15 +27,16 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/pkg/lockfile"
+	"github.com/tofuutils/tenv/v2/pkg/loghelper"
+	"github.com/tofuutils/tenv/v2/pkg/reversecmp"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic"
+	flatparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/flat"
+	"github.com/tofuutils/tenv/v2/versionmanager/semantic/types"
+
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-version"
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/pkg/lockfile"
-	"github.com/tofuutils/tenv/pkg/loghelper"
-	"github.com/tofuutils/tenv/pkg/reversecmp"
-	"github.com/tofuutils/tenv/versionmanager/semantic"
-	flatparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/flat"
-	"github.com/tofuutils/tenv/versionmanager/semantic/types"
 )
 
 var (
@@ -117,7 +118,6 @@ func (m VersionManager) Evaluate(requestedVersion string, proxyCall bool) (strin
 		m.conf.Displayer.Display("No compatible version found locally, search a remote one...")
 		if m.conf.NoInstall {
 			version, err := m.searchInstallRemote(predicateInfo, m.conf.NoInstall, proxyCall)
-
 			if err != nil {
 				m.conf.Displayer.Flush(proxyCall)
 				return "", errNoCompatibleLocally
@@ -157,7 +157,7 @@ func (m VersionManager) Install(requestedVersion string) error {
 func (m VersionManager) InstallPath() (string, error) {
 	dir := filepath.Join(m.conf.RootPath, m.FolderName)
 
-	return dir, os.MkdirAll(dir, 0755)
+	return dir, os.MkdirAll(dir, 0o755)
 }
 
 func (m VersionManager) ListLocal(reverseOrder bool) ([]string, error) {
@@ -413,7 +413,7 @@ func removeFile(filePath string, conf *config.Config) error {
 }
 
 func writeFile(filePath string, content string, conf *config.Config) error {
-	err := os.WriteFile(filePath, []byte(content), 0644)
+	err := os.WriteFile(filePath, []byte(content), 0o644)
 	if err == nil {
 		conf.Displayer.Display(loghelper.Concat("Written ", content, " in ", filePath))
 	}

diff --git a/versionmanager/proxy/proxy.go b/versionmanager/proxy/proxy.go
@@ -30,9 +30,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/tofuutils/tenv/config"
-	"github.com/tofuutils/tenv/versionmanager"
-	terragruntparser "github.com/tofuutils/tenv/versionmanager/semantic/parser/terragrunt"
+	"github.com/tofuutils/tenv/v2/config"
+	"github.com/tofuutils/tenv/v2/versionmanager"
+	terragruntparser "github.com/tofuutils/tenv/v2/versionmanager/semantic/parser/terragrunt"
 )
 
 var errDelimiter = errors.New("key and value should not contains delimiter")
@@ -126,7 +126,7 @@ func initIO(cmd *exec.Cmd, execName string, pExitCode *int) (func(int), error) {
 	}
 
 	outputPath := os.Getenv("GITHUB_OUTPUT")
-	outputFile, err := os.OpenFile(outputPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	outputFile, err := os.OpenFile(outputPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return nil, err
 	}