Merge pull request #4 from 3bbbeau/fix/duplicates.atlantis.yaml

fix(generate): duplicates in atlantis.yaml

.env

@@ -1 +1 @@
-VERSION=v0.0.2
+VERSION=v0.0.4

cmd/generate.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/3bbbeau/tfvars-atlantis-config/logger"
@@ -168,7 +169,7 @@ const (
 func discover(ctx context.Context, flags *Flags) ([]repocfg.Component, error) {
 	logger := logger.FromContext(ctx)
 
-	var discovered []repocfg.Component
+	discovered := []repocfg.Component{}
 
 	// Walk the directory tree from the root
 	err := filepath.Walk(flags.Root, func(path string, info os.FileInfo, err error) error {
@@ -180,12 +181,6 @@ func discover(ctx context.Context, flags *Flags) ([]repocfg.Component, error) {
 		if !info.IsDir() && strings.HasSuffix(info.Name(), TF_EXT) {
 			logger.Debug(fmt.Sprintf("found .tf file: %s", path))
 
-			// Add the directory of the Terraform component as the parent
-			parent, err := filepath.Rel(flags.Root, filepath.Dir(path))
-			if err != nil {
-				return err
-			}
-
 			// Each edge should be a path containing Terraform variables files
 			// relative to the Terraform component
 			err = filepath.Walk(filepath.Dir(path), func(subpath string, subinfo os.FileInfo, suberr error) error {
@@ -195,19 +190,23 @@ func discover(ctx context.Context, flags *Flags) ([]repocfg.Component, error) {
 
 				// Filter out Terraform variable files
 				if !subinfo.IsDir() && (strings.HasSuffix(subinfo.Name(), TFVARS_EXT) || strings.HasSuffix(subinfo.Name(), TFVARS_JSON_EXT)) {
+					parent := subpath
 					// Ignore nested Terraform variable files that might belong to nested components
-					if filepath.Dir(subpath) != filepath.Dir(path) && tfExistsInDir(filepath.Dir(subpath)) {
+					if filepath.Dir(subpath) != filepath.Dir(path) && !tfExistsInDir(filepath.Dir(subpath)) {
 						logger.Sugar().Debugf(`ignoring nested %s: %s
 						which belongs to the component at: %s
 						not: %s`, filepath.Ext(subpath), subpath, filepath.Dir(subpath), filepath.Dir(path),
 						)
-
-						return filepath.SkipDir
+						parent = path
 					}
 
-					logger.Sugar().Debugf("component parent is %s", parent)
+					relParent, err := filepath.Rel(flags.Root, filepath.Dir(parent))
+					if err != nil {
+						return err
+					}
+					logger.Sugar().Debugf("component parent is %s", relParent)
 					found := repocfg.Component{
-						Path: parent,
+						Path: relParent,
 					}
 
 					logger.Sugar().Debugf("found %s file: %s", filepath.Ext(subpath), subpath)
@@ -220,8 +219,27 @@ func discover(ctx context.Context, flags *Flags) ([]repocfg.Component, error) {
 					logger.Sugar().Debugf("component %s has var file %s", parent, child)
 					found.VarFiles = append(found.VarFiles, child)
 
+					// Check if the component already exists in the slice
+					// If it does, ensure the var file is not a duplicate and append it.
+					exists := false
+					for idx, component := range discovered {
+						if component.Path == found.Path {
+							exists = true
+							for _, varFile := range found.VarFiles {
+								if !slices.Contains(component.VarFiles, varFile) {
+									discovered[idx].VarFiles = append(discovered[idx].VarFiles, varFile)
+								}
+							}
+						}
+					}
+
+					// If the component does not exist in the slice, then
+					// it can be treated as new component.
+					if !exists {
 						discovered = append(discovered, found)
 					}
+				}
+
 				return err
 			})
 			return filepath.SkipDir

repocfg/util.go

@@ -9,8 +9,15 @@ import (
 func ptr[T any](v T) *T { return &v }
 
 // friendlyName creates a contextual name used for Atlantis projects
-func friendlyName(path, environment string) string {
-	name := []string{strings.ReplaceAll(path, "/", "-"), pathWithoutExtension(filepath.Base(environment))}
+func friendlyName(path, varFile string) string {
+	environment := pathWithoutExtension(filepath.Base(varFile))
+
+	// avoid constructing a joined path if the context is the current directory
+	if filepath.Base(path) == "." {
+		return environment
+	}
+
+	name := []string{strings.ReplaceAll(path, "/", "-"), environment}
 	return strings.TrimSuffix(strings.Join(name, "-"), "-")
 }