Use format v$MAJOR.$MINOR.$PATCH for auto-release tags. Move public…

… packages from `internal` folder (#63)

.github/auto-release.yml

@@ -1,6 +1,10 @@
 name-template: 'v$RESOLVED_VERSION'
-tag-template: '$RESOLVED_VERSION'
+
+# https://golang.org/ref/mod#versions
+tag-template: 'v$RESOLVED_VERSION'
+
 version-template: '$MAJOR.$MINOR.$PATCH'
+
 version-resolver:
   major:
     labels:

internal/config/config.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	g "github.com/cloudposse/atmos/internal/globals"
-	u "github.com/cloudposse/atmos/internal/utils"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
@@ -194,14 +194,14 @@ func InitConfig(configAndStacksInfo ConfigAndStacksInfo) error {
 	ProcessedConfig.StacksBaseAbsolutePath = stacksBaseAbsPath
 
 	// Convert the included stack paths to absolute paths
-	includeStackAbsPaths, err := u.JoinAbsolutePathWithPaths(stacksBaseAbsPath, Config.Stacks.IncludedPaths)
+	includeStackAbsPaths, err := utils.JoinAbsolutePathWithPaths(stacksBaseAbsPath, Config.Stacks.IncludedPaths)
 	if err != nil {
 		return err
 	}
 	ProcessedConfig.IncludeStackAbsolutePaths = includeStackAbsPaths
 
 	// Convert the excluded stack paths to absolute paths
-	excludeStackAbsPaths, err := u.JoinAbsolutePathWithPaths(stacksBaseAbsPath, Config.Stacks.ExcludedPaths)
+	excludeStackAbsPaths, err := utils.JoinAbsolutePathWithPaths(stacksBaseAbsPath, Config.Stacks.ExcludedPaths)
 	if err != nil {
 		return err
 	}
@@ -279,7 +279,7 @@ func InitConfig(configAndStacksInfo ConfigAndStacksInfo) error {
 
 	if g.LogVerbose {
 		color.Cyan("\nFinal CLI configuration:")
-		err = u.PrintAsYAML(Config)
+		err = utils.PrintAsYAML(Config)
 		if err != nil {
 			return err
 		}
@@ -292,7 +292,7 @@ func InitConfig(configAndStacksInfo ConfigAndStacksInfo) error {
 // https://github.com/spf13/viper/issues/181
 // https://medium.com/@bnprashanth256/reading-configuration-files-and-environment-variables-in-go-golang-c2607f912b63
 func processConfigFile(path string, v *viper.Viper) error {
-	if !u.FileExists(path) {
+	if !utils.FileExists(path) {
 		if g.LogVerbose {
 			fmt.Println(fmt.Sprintf("No config found in %s", path))
 		}

internal/config/utils.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"github.com/bmatcuk/doublestar"
 	g "github.com/cloudposse/atmos/internal/globals"
-	u "github.com/cloudposse/atmos/internal/utils"
+	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"os"
 	"path/filepath"

internal/exec/describe.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	c "github.com/cloudposse/atmos/internal/config"
 	g "github.com/cloudposse/atmos/internal/globals"
-	s "github.com/cloudposse/atmos/internal/stack"
-	u "github.com/cloudposse/atmos/internal/utils"
+	s "github.com/cloudposse/atmos/pkg/stack"
+	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

internal/exec/helmfile.go

@@ -5,7 +5,7 @@ package exec
 import (
 	"fmt"
 	c "github.com/cloudposse/atmos/internal/config"
-	u "github.com/cloudposse/atmos/internal/utils"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -30,7 +30,7 @@ func ExecuteHelmfile(cmd *cobra.Command, args []string) error {
 	}
 
 	componentPath := path.Join(c.ProcessedConfig.HelmfileDirAbsolutePath, info.ComponentFolderPrefix, info.Component)
-	componentPathExists, err := u.IsDirectory(componentPath)
+	componentPathExists, err := utils.IsDirectory(componentPath)
 	if err != nil || !componentPathExists {
 		return errors.New(fmt.Sprintf("Component '%s' does not exixt in %s",
 			info.Component,
@@ -59,7 +59,7 @@ func ExecuteHelmfile(cmd *cobra.Command, args []string) error {
 
 	color.Cyan("Writing variables to file:")
 	fmt.Println(varFileName)
-	err = u.WriteToFileAsYAML(varFileName, info.ComponentVarsSection, 0644)
+	err = utils.WriteToFileAsYAML(varFileName, info.ComponentVarsSection, 0644)
 	if err != nil {
 		return err
 	}

internal/exec/terraform.go

@@ -3,7 +3,7 @@ package exec
 import (
 	"fmt"
 	c "github.com/cloudposse/atmos/internal/config"
-	u "github.com/cloudposse/atmos/internal/utils"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -41,7 +41,7 @@ func ExecuteTerraform(cmd *cobra.Command, args []string) error {
 
 	// Check if the component exists
 	componentPath := path.Join(c.ProcessedConfig.TerraformDirAbsolutePath, info.ComponentFolderPrefix, finalComponent)
-	componentPathExists, err := u.IsDirectory(componentPath)
+	componentPathExists, err := utils.IsDirectory(componentPath)
 	if err != nil || !componentPathExists {
 		return errors.New(fmt.Sprintf("Component '%s' does not exixt in %s",
 			finalComponent,
@@ -85,7 +85,7 @@ func ExecuteTerraform(cmd *cobra.Command, args []string) error {
 
 	color.Cyan("Writing variables to file:")
 	fmt.Println(varFileName)
-	err = u.WriteToFileAsJSON(varFileName, info.ComponentVarsSection, 0644)
+	err = utils.WriteToFileAsJSON(varFileName, info.ComponentVarsSection, 0644)
 	if err != nil {
 		return err
 	}
@@ -113,14 +113,14 @@ func ExecuteTerraform(cmd *cobra.Command, args []string) error {
 	// Handle `terraform deploy` custom command
 	if info.SubCommand == "deploy" {
 		info.SubCommand = "apply"
-		if !u.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
+		if !utils.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
 			info.AdditionalArgsAndFlags = append(info.AdditionalArgsAndFlags, autoApproveFlag)
 		}
 	}
 
 	// Handle Config.Components.Terraform.ApplyAutoApprove flag
 	if info.SubCommand == "apply" && c.Config.Components.Terraform.ApplyAutoApprove == true {
-		if !u.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
+		if !utils.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
 			info.AdditionalArgsAndFlags = append(info.AdditionalArgsAndFlags, autoApproveFlag)
 		}
 	}
@@ -179,7 +179,7 @@ func ExecuteTerraform(cmd *cobra.Command, args []string) error {
 
 	// Check if the terraform command requires a user interaction,
 	// but it's running in a scripted environment (where a `tty` is not attached or `stdin` is not attached)
-	if os.Stdin == nil && !u.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
+	if os.Stdin == nil && !utils.SliceContainsString(info.AdditionalArgsAndFlags, autoApproveFlag) {
 		errorMessage := ""
 		if info.SubCommand == "apply" {
 			errorMessage = "'terraform apply' requires a user interaction, but it's running without `tty` or `stdin` attached." +

internal/exec/terraform_generate.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	c "github.com/cloudposse/atmos/internal/config"
 	g "github.com/cloudposse/atmos/internal/globals"
-	s "github.com/cloudposse/atmos/internal/stack"
-	u "github.com/cloudposse/atmos/internal/utils"
+	s "github.com/cloudposse/atmos/pkg/stack"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -45,7 +45,7 @@ func ExecuteTerraformGenerateBackend(cmd *cobra.Command, args []string) error {
 		}
 		color.Cyan(msg)
 
-		err = u.PrintAsYAML(c.ProcessedConfig.StackConfigFilesRelativePaths)
+		err = utils.PrintAsYAML(c.ProcessedConfig.StackConfigFilesRelativePaths)
 		if err != nil {
 			return err
 		}
@@ -160,7 +160,7 @@ func ExecuteTerraformGenerateBackend(cmd *cobra.Command, args []string) error {
 	}
 
 	color.Cyan("\nComponent backend config:\n\n")
-	err = u.PrintAsJSON(componentBackendConfig)
+	err = utils.PrintAsJSON(componentBackendConfig)
 	if err != nil {
 		return err
 	}
@@ -188,7 +188,7 @@ func ExecuteTerraformGenerateBackend(cmd *cobra.Command, args []string) error {
 
 	color.Cyan("\nWriting backend config to file:")
 	fmt.Println(varFileName)
-	err = u.WriteToFileAsJSON(varFileName, componentBackendConfig, 0644)
+	err = utils.WriteToFileAsJSON(varFileName, componentBackendConfig, 0644)
 	if err != nil {
 		return err
 	}

internal/exec/utils.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	c "github.com/cloudposse/atmos/internal/config"
 	g "github.com/cloudposse/atmos/internal/globals"
-	s "github.com/cloudposse/atmos/internal/stack"
-	u "github.com/cloudposse/atmos/internal/utils"
+	s "github.com/cloudposse/atmos/pkg/stack"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"os"
@@ -181,7 +181,7 @@ func processConfigAndStacks(componentType string, cmd *cobra.Command, args []str
 			msg = "Found config files:"
 		}
 		color.Cyan(msg)
-		err = u.PrintAsYAML(c.ProcessedConfig.StackConfigFilesRelativePaths)
+		err = utils.PrintAsYAML(c.ProcessedConfig.StackConfigFilesRelativePaths)
 		if err != nil {
 			return configAndStacksInfo, err
 		}
@@ -295,7 +295,7 @@ func processConfigAndStacks(componentType string, cmd *cobra.Command, args []str
 	}
 
 	color.Cyan("\nVariables for the component '%s' in the stack '%s':\n\n", configAndStacksInfo.ComponentFromArg, configAndStacksInfo.Stack)
-	err = u.PrintAsYAML(configAndStacksInfo.ComponentVarsSection)
+	err = utils.PrintAsYAML(configAndStacksInfo.ComponentVarsSection)
 	if err != nil {
 		return configAndStacksInfo, err
 	}
@@ -470,7 +470,7 @@ func processArgsAndFlags(inputArgsAndFlags []string) (c.ArgsAndFlagsInfo, error)
 	}
 
 	for i, arg := range inputArgsAndFlags {
-		if !u.SliceContainsInt(indexesToRemove, i) {
+		if !utils.SliceContainsInt(indexesToRemove, i) {
 			additionalArgsAndFlags = append(additionalArgsAndFlags, arg)
 		}
 

internal/spacelift/spacelift_stack_processor.go → pkg/spacelift/spacelift_stack_processor.go

@@ -2,8 +2,8 @@ package spacelift
 
 import (
 	"fmt"
-	s "github.com/cloudposse/atmos/internal/stack"
-	u "github.com/cloudposse/atmos/internal/utils"
+	s "github.com/cloudposse/atmos/pkg/stack"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -65,7 +65,7 @@ func TransformStackConfigToSpaceliftStacks(
 			if terraformComponents, ok := componentsSection["terraform"]; ok {
 				terraformComponentsMap := terraformComponents.(map[string]interface{})
 
-				terraformComponentNamesInCurrentStack := u.StringKeysFromMap(terraformComponentsMap)
+				terraformComponentNamesInCurrentStack := utils.StringKeysFromMap(terraformComponentsMap)
 
 				for component, v := range terraformComponentsMap {
 					componentMap := v.(map[string]interface{})
@@ -191,7 +191,7 @@ func TransformStackConfigToSpaceliftStacks(
 					labels = append(labels, fmt.Sprintf("folder:component/%s", component))
 					labels = append(labels, fmt.Sprintf("folder:%s", stackName))
 
-					spaceliftConfig["labels"] = u.UniqueStrings(labels)
+					spaceliftConfig["labels"] = utils.UniqueStrings(labels)
 
 					// Add Spacelift stack config to the final map
 					spaceliftStackName := strings.Replace(fmt.Sprintf("%s-%s", stackName, component), "/", "-", -1)
@@ -213,9 +213,9 @@ func buildSpaceliftDependsOnStackName(
 ) (string, error) {
 	var spaceliftStackName string
 
-	if u.SliceContainsString(allStackNames, dependsOn) {
+	if utils.SliceContainsString(allStackNames, dependsOn) {
 		spaceliftStackName = dependsOn
-	} else if u.SliceContainsString(componentNamesInCurrentStack, dependsOn) {
+	} else if utils.SliceContainsString(componentNamesInCurrentStack, dependsOn) {
 		spaceliftStackName = fmt.Sprintf("%s-%s", currentStackName, dependsOn)
 	} else {
 		errorMessage := errors.New(fmt.Sprintf("Component '%[1]s' in stack '%[2]s' specifies 'depends_on' dependency '%[3]s', "+

internal/stack/stack_processor.go → pkg/stack/stack_processor.go

@@ -3,10 +3,10 @@ package stack
 import (
 	"fmt"
 	"github.com/bmatcuk/doublestar"
-	c "github.com/cloudposse/atmos/internal/convert"
 	g "github.com/cloudposse/atmos/internal/globals"
-	m "github.com/cloudposse/atmos/internal/merge"
-	u "github.com/cloudposse/atmos/internal/utils"
+	c "github.com/cloudposse/atmos/pkg/convert"
+	m "github.com/cloudposse/atmos/pkg/merge"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
@@ -57,7 +57,7 @@ func ProcessYAMLConfigFiles(
 				imports = append(imports, k)
 			}
 
-			uniqueImports := u.UniqueStrings(imports)
+			uniqueImports := utils.UniqueStrings(imports)
 			sort.Strings(uniqueImports)
 
 			componentStackMap := map[string]map[string][]string{}
@@ -85,7 +85,7 @@ func ProcessYAMLConfigFiles(
 
 			stackName := strings.TrimSuffix(
 				strings.TrimSuffix(
-					u.TrimBasePathFromPath(stackBasePath+"/", p),
+					utils.TrimBasePathFromPath(stackBasePath+"/", p),
 					g.DefaultStackConfigFileExtension),
 				".yml",
 			)
@@ -206,7 +206,7 @@ func ProcessConfig(
 
 	stackName := strings.TrimSuffix(
 		strings.TrimSuffix(
-			u.TrimBasePathFromPath(basePath+"/", stack),
+			utils.TrimBasePathFromPath(basePath+"/", stack),
 			g.DefaultStackConfigFileExtension),
 		".yml",
 	)

internal/stack/stack_processor_test.go → pkg/stack/stack_processor_test.go

@@ -1,8 +1,8 @@
 package stack
 
 import (
-	c "github.com/cloudposse/atmos/internal/convert"
-	u "github.com/cloudposse/atmos/internal/utils"
+	c "github.com/cloudposse/atmos/pkg/convert"
+	u "github.com/cloudposse/atmos/pkg/utils"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

internal/stack/stack_processor_utils.go → pkg/stack/stack_processor_utils.go

@@ -2,7 +2,7 @@ package stack
 
 import (
 	g "github.com/cloudposse/atmos/internal/globals"
-	u "github.com/cloudposse/atmos/internal/utils"
+	"github.com/cloudposse/atmos/pkg/utils"
 	"os"
 	"path"
 	"path/filepath"
@@ -31,7 +31,7 @@ func FindComponentStacks(
 		}
 	}
 
-	unique := u.UniqueStrings(stacks)
+	unique := utils.UniqueStrings(stacks)
 	sort.Strings(unique)
 	return unique, nil
 }
@@ -104,7 +104,7 @@ func FindComponentDependencies(
 	}
 
 	deps = append(deps, stack)
-	unique := u.UniqueStrings(deps)
+	unique := utils.UniqueStrings(deps)
 	sort.Strings(unique)
 	return unique, nil
 }
@@ -127,12 +127,12 @@ func CreateComponentStackMap(basePath string, filePath string) (map[string]map[s
 				return err
 			}
 
-			isDirectory, err := u.IsDirectory(p)
+			isDirectory, err := utils.IsDirectory(p)
 			if err != nil {
 				return err
 			}
 
-			isYaml := u.IsYaml(p)
+			isYaml := utils.IsYaml(p)
 
 			if !isDirectory && isYaml {
 				config, _, err := ProcessYAMLConfigFile(basePath, p, map[string]map[interface{}]interface{}{})