Merge branch 'main' into feature/dev-2836-implement-atmos-validate-ed…

…itorconfig

.editorconfig

@@ -2,6 +2,27 @@
 insert_final_newline = true
 end_of_line = lf
 
+# Binary files (override to ensure no text-related rules are applied)
+[*.{png,jpg,gif,svg,pdf,ai,eps,mp4}]
+insert_final_newline = false
+end_of_line = unset
+indent_style = unset
+indent_size = unset
+
+# Override for machine generated binary HTML files in Screengrabs directory
+[website/src/components/Screengrabs/**/*.html]
+insert_final_newline = false
+end_of_line = unset
+indent_style = unset
+indent_size = unset
+
+# Override for machine generated binary files in tests/snapshots directory for golden snapshots
+[test/snapshots/**/*.golden]
+insert_final_newline = false
+end_of_line = unset
+indent_style = unset
+indent_size = unset
+
 # Override for Makefile
 [{Makefile,makefile,GNUmakefile}]
 indent_style = tab

.gitattributes

@@ -6,6 +6,9 @@ docs linguist-documentation=true
 # Screengrabs are binary HTML files that are automatically generated
 website/src/components/Screengrabs/**/*.html linguist-generated=true binary
 
+# Golden snapshots should be treated a raw output to prevent line-ending conversions
+tests/snapshots/**/*.golden linguist-generated=true -text
+
 # Mark binary files to prevent normalization
 *.png binary
 *.svg binary
@@ -15,4 +18,9 @@ website/src/components/Screengrabs/**/*.html linguist-generated=true binary
 *.ai binary
 *.eps binary
 *.ansi binary
-*.mp4 binary
+*.mp4 binary
+
+# Reduce merge conflicts that can occur when go.mod and go.sum files are updated
+# Run `go mod tidy` to update the go.sum file
+go.sum linguist-generated=true merge=union
+go.mod linguist-generated=true merge=union

.github/workflows/test.yml

@@ -72,6 +72,25 @@ jobs:
           path: |
             ./build/
 
+  tidy:
+    name: Tidy Go Modules
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+        id: go
+
+      - uses: j0hnsmith/go-mod-check@v1
+        with:
+          working-directory: ${{ github.workspace }}
+          # optional, only if you're happy to have `replace ` lines in your go.mod file
+          skip-replace-check: true
+
   # run acceptance tests
   test:
     name: Acceptance Tests
@@ -140,8 +159,23 @@ jobs:
         run: |
           make deps
 
+      # Enable this after merging test-cases
+      # Only seems to work with remote schema files
+      #- name: Validate YAML Schema for Test Cases
+      #  uses: InoUno/[email protected]
+      #  with:
+      #    root: "tests/test-cases"
+      #    schemaMapping: |
+      #      {
+      #        "schema.json": [
+      #          "**/*.yaml"
+      #        ]
+      #       }
+
       - name: Acceptance tests
         timeout-minutes: 10
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: make testacc
 
   docker:
@@ -352,6 +386,8 @@ jobs:
       - name: Run tests in ${{ matrix.demo-folder }} for ${{ matrix.flavor.target }}
         working-directory: ${{ matrix.demo-folder }}
         if: matrix.flavor.target == 'linux' || matrix.flavor.target == 'macos'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           atmos test
 
@@ -369,6 +405,8 @@ jobs:
         working-directory: ${{ matrix.demo-folder }}
         if: matrix.flavor.target == 'windows'
         shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           atmos test
 
@@ -446,7 +484,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Validate YAML Schema
+      - name: Validate YAML Schema for Stacks
         uses: InoUno/[email protected]
         with:
           root: "examples/${{ matrix.demo-folder }}/stacks"

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "yaml.customTags": [
+        "!not scalar"
+    ],
+    "[mdx]": { "editor.defaultFormatter": null, "editor.formatOnSave": false },
+}

Makefile

@@ -1,6 +1,7 @@
 # This works because `go list ./...` excludes vendor directories by default in modern versions of Go (1.11+).
 # No need for grep or additional filtering.
 TEST ?= $$(go list ./...)
+TESTARGS ?=
 SHELL := /bin/bash
 #GOOS=darwin
 #GOOS=linux

cmd/docs.go

@@ -116,6 +116,12 @@ var docsCmd = &cobra.Command{
 
 		// Opens atmos.tools docs if no component argument is provided
 		var err error
+
+		if os.Getenv("GO_TEST") == "1" {
+			u.LogDebug(atmosConfig, "Skipping browser launch in test environment")
+			return // Skip launching the browser
+		}
+
 		switch runtime.GOOS {
 		case "linux":
 			err = exec.Command("xdg-open", atmosDocsURL).Start()

cmd/root.go

@@ -39,6 +39,29 @@ var RootCmd = &cobra.Command{
 			cmd.SilenceUsage = true
 			cmd.SilenceErrors = true
 		}
+
+		logsLevel, _ := cmd.Flags().GetString("logs-level")
+		logsFile, _ := cmd.Flags().GetString("logs-file")
+
+		errorConfig := schema.AtmosConfiguration{
+			Logs: schema.Logs{
+				Level: logsLevel,
+				File:  logsFile,
+			},
+		}
+
+		configAndStacksInfo := schema.ConfigAndStacksInfo{
+			LogsLevel: logsLevel,
+			LogsFile:  logsFile,
+		}
+
+		// Only validate the config, don't store it yet since commands may need to add more info
+		_, err := cfg.InitCliConfig(configAndStacksInfo, false)
+		if err != nil {
+			if !errors.Is(err, cfg.NotFound) {
+				u.LogErrorAndExit(errorConfig, err)
+			}
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		// Check Atmos configuration

cmd/version.go

@@ -28,7 +28,9 @@ var versionCmd = &cobra.Command{
 			u.LogErrorAndExit(schema.AtmosConfiguration{}, err)
 		}
 
-		u.PrintMessage(fmt.Sprintf("\U0001F47D Atmos %s on %s/%s", version.Version, runtime.GOOS, runtime.GOARCH))
+		atmosIcon := "\U0001F47D"
+
+		u.PrintMessage(fmt.Sprintf("%s Atmos %s on %s/%s", atmosIcon, version.Version, runtime.GOOS, runtime.GOARCH))
 		fmt.Println()
 
 		if checkFlag {
@@ -45,7 +47,10 @@ var versionCmd = &cobra.Command{
 				}
 				latestRelease := strings.TrimPrefix(latestReleaseTag, "v")
 				currentRelease := strings.TrimPrefix(version.Version, "v")
-				if latestRelease != currentRelease {
+
+				if latestRelease == currentRelease {
+					u.PrintMessage(fmt.Sprintf("You are running the latest version of Atmos (%s)", latestRelease))
+				} else {
 					u.PrintMessageToUpgradeToAtmosLatestRelease(latestRelease)
 				}
 			}

internal/exec/vendor_component_utils.go

@@ -16,8 +16,8 @@ import (
 	"github.com/cloudposse/atmos/pkg/schema"
 	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/hairyhenderson/gomplate/v3"
-	"github.com/mattn/go-isatty"
 	cp "github.com/otiai10/copy"
+	"golang.org/x/term"
 )
 
 // findComponentConfigFile identifies the component vendoring config file (`component.yaml` or `component.yml`)
@@ -359,5 +359,7 @@ func ExecuteComponentVendorInternal(
 
 // CheckTTYSupport checks if stdout supports TTY for displaying the progress UI.
 func CheckTTYSupport() bool {
-	return isatty.IsTerminal(os.Stdout.Fd())
+	fd := int(os.Stdout.Fd())
+	isTerminal := term.IsTerminal(fd)
+	return isTerminal
 }