cloudposse
diff --git a/‎.github/workflows/autofix.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/autofix.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎aqua/README.md‎
Lines changed: 68 additions & 0 deletions b/‎aqua/README.md‎
Lines changed: 68 additions & 0 deletions
diff --git a/‎atmos.yaml‎
Lines changed: 7 additions & 0 deletions b/‎atmos.yaml‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎cmd/toolchain/info.go‎
Lines changed: 6 additions & 4 deletions b/‎cmd/toolchain/info.go‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎pkg/template/ast.go‎
Lines changed: 2 additions & 2 deletions b/‎pkg/template/ast.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎pkg/utils/git_test.go‎
Lines changed: 0 additions & 20 deletions b/‎pkg/utils/git_test.go‎
Lines changed: 0 additions & 20 deletions
diff --git a/‎tests/fixtures/scenarios/toolchain-registry/atmos.yaml‎
Lines changed: 65 additions & 0 deletions b/‎tests/fixtures/scenarios/toolchain-registry/atmos.yaml‎
Lines changed: 65 additions & 0 deletions
diff --git a/‎tests/snapshots/TestCLICommands_atmos_describe_config_imports.stderr.golden‎
Lines changed: 2 additions & 0 deletions b/‎tests/snapshots/TestCLICommands_atmos_describe_config_imports.stderr.golden‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎tests/snapshots/TestCLICommands_atmos_describe_configuration.stderr.golden‎
Lines changed: 2 additions & 0 deletions b/‎tests/snapshots/TestCLICommands_atmos_describe_configuration.stderr.golden‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎tests/snapshots/TestCLICommands_atmos_toolchain_--help.stderr.golden‎
Lines changed: 1 addition & 0 deletions b/‎tests/snapshots/TestCLICommands_atmos_toolchain_--help.stderr.golden‎
Lines changed: 1 addition & 0 deletions
@@ -37,7 +37,7 @@ jobs:
           go-version-file: go.mod
       - run: go mod tidy
 
-      # gofumpt
+      # gofumpt (installed via aqua from aqua/aqua.yaml)
       - name: Get changed Go files
         id: changed-files
         uses: tj-actions/changed-files@e7b157b1c4ad44acfc8d9be14b8cd8f5058636e3 # v45.0.6
 
@@ -0,0 +1,68 @@
+# Aqua Package Manager Configuration
+
+This directory contains [Aqua](https://aquaproj.github.io/) configuration for managing CLI tool versions used in CI/CD workflows.
+
+## What is Aqua?
+
+Aqua is a declarative CLI version manager that ensures consistent tool versions across development environments and CI pipelines. It downloads tools from their official sources and verifies checksums for security.
+
+## Files
+
+- **aqua.yaml** - Main configuration file that defines registries and imports
+- **aqua-checksums.json** - Checksum verification file for security (auto-generated by `aqua upc`)
+- **imports/*.yaml** - Individual tool definitions (one file per tool for clarity)
+
+## Usage
+
+### CI Workflows
+
+The `.github/workflows/autofix.yml` workflow uses Aqua to install tools like `gofumpt`:
+
+```yaml
+- uses: aquaproj/aqua-installer@v3
+  with:
+    aqua_version: v2.43.0
+- run: aqua upc -prune  # Update checksums
+```
+
+After this step, tools defined in `aqua.yaml` are available on PATH.
+
+### Local Development
+
+Install Aqua locally:
+
+```bash
+brew install aquaproj/aqua/aqua
+```
+
+Then install tools:
+
+```bash
+aqua install
+```
+
+## Adding New Tools
+
+1. Create a new file in `imports/` (e.g., `imports/mytool.yaml`):
+   ```yaml
+   packages:
+     - name: owner/repo@vX.Y.Z
+   ```
+
+2. Update checksums:
+   ```bash
+   aqua upc -prune
+   ```
+
+3. Commit both the import file and the updated `aqua-checksums.json`.
+
+## Current Tools
+
+| Tool | Version | Purpose |
+|------|---------|---------|
+| gofumpt | v0.7.0 | Go code formatter (stricter than gofmt) |
+
+## References
+
+- [Aqua Documentation](https://aquaproj.github.io/)
+- [Aqua Standard Registry](https://github.com/aquaproj/aqua-registry)
@@ -407,6 +407,13 @@ docs:
         hide_empty: false
         indent_level: 2
 
+toolchain:
+  registries:
+    # Default Aqua registry
+    - name: aqua
+      type: aqua
+      priority: 10
+
 version:
   check:
     enabled: true
 
@@ -12,10 +12,12 @@ import (
 var infoParser *flags.StandardParser
 
 var infoCmd = &cobra.Command{
-	Use:   "info <tool>",
-	Short: "Show information about a tool",
-	Long:  `Display detailed information about a tool from the registry.`,
-	Args:  cobra.ExactArgs(1),
+	Use:           "info <tool>",
+	Short:         "Show information about a tool",
+	Long:          `Display detailed information about a tool from the registry.`,
+	Args:          cobra.ExactArgs(1),
+	SilenceUsage:  true, // Don't show usage on error.
+	SilenceErrors: true, // Don't show errors twice.
 	RunE: func(cmd *cobra.Command, args []string) error {
 		// Bind flags to Viper for precedence handling.
 		v := viper.GetViper()
 
@@ -17,9 +17,9 @@ type FieldRef struct {
 }
 
 // String returns the dot-separated path of the field reference.
-//
-//nolint:lintroller // Simple strings.Join - perf.Track overhead disproportionate.
 func (f FieldRef) String() string {
+	defer perf.Track(nil, "template.FieldRef.String")()
+
 	return strings.Join(f.Path, ".")
 }
 
 
@@ -10,16 +10,6 @@ import (
 )
 
 func TestProcessTagCwd(t *testing.T) {
-	// Save and restore original working directory.
-	originalDir, err := os.Getwd()
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		err := os.Chdir(originalDir)
-		if err != nil {
-			t.Errorf("failed to restore original directory: %v", err)
-		}
-	})
-
 	tests := []struct {
 		name     string
 		input    string
@@ -228,16 +218,6 @@ func TestProcessTagGitRoot_RealGitRepo(t *testing.T) {
 	// Skip if TEST_GIT_ROOT is already set (test isolation mode).
 
 	t.Run("Detects real Git root without TEST_GIT_ROOT override", func(t *testing.T) {
-		// Save and check if we're in a git repo.
-		originalDir, err := os.Getwd()
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			err := os.Chdir(originalDir)
-			if err != nil {
-				t.Errorf("failed to restore original directory: %v", err)
-			}
-		})
-
 		// The atmos repo root should be detected.
 		result, err := ProcessTagGitRoot("!repo-root")
 		require.NoError(t, err)
 
@@ -0,0 +1,65 @@
+# Test fixture for toolchain registry configuration.
+# Tests inline atmos registry with all supported package types and features.
+#
+# Supported types:
+#   - github_release: Asset from GitHub releases (uses owner/repo + asset template)
+#   - http: Direct URL download (uses full URL template)
+#
+# Supported formats:
+#   - tar.gz (default), zip, pkg, raw
+#
+# Supported features:
+#   - overrides: Platform-specific (goos/goarch) asset/format overrides
+#   - files: Extract specific files from archives with renamed destinations
+#   - replacements: OS/arch string mappings (e.g., amd64 -> x86_64)
+#   - binary_name: Override the binary name
+#   - format: Archive format (tar.gz, zip, pkg, raw)
+#
+# Usage:
+#   ./build/atmos --chdir tests/fixtures/scenarios/toolchain-registry toolchain install replicatedhq/replicated@v0.124.1
+#   ./build/atmos --chdir tests/fixtures/scenarios/toolchain-registry toolchain install aws/aws-cli@2.15.0
+
+toolchain:
+  registries:
+    - name: custom-tools
+      type: atmos
+      priority: 100
+      tools:
+        # Type: github_release with platform overrides.
+        # Tests: asset template, goos override for darwin (uses "all" arch).
+        replicatedhq/replicated:
+          type: github_release
+          asset: "replicated_{{trimV .Version}}_{{.OS}}_{{.Arch}}.tar.gz"
+          overrides:
+            - goos: darwin
+              asset: "replicated_{{trimV .Version}}_{{.OS}}_all.tar.gz"
+
+        # Type: http with format, overrides, files, and replacements.
+        # Tests: Full AWS CLI pattern - zip on Linux, pkg on macOS with nested extraction.
+        aws/aws-cli:
+          type: http
+          url: "https://awscli.amazonaws.com/awscli-exe-{{.OS}}-{{.Arch}}-{{.Version}}.zip"
+          format: zip
+          overrides:
+            - goos: darwin
+              format: pkg
+          binary_name: aws
+
+        # Type: github_release with tar.gz format (default).
+        # Tests: Simple tar.gz extraction.
+        junegunn/fzf:
+          type: github_release
+          asset: "fzf-{{.Version}}-{{.OS}}_{{.Arch}}.tar.gz"
+          format: tar.gz
+
+        # Type: http with raw format (no extraction).
+        # Tests: Direct binary download without archive extraction.
+        jqlang/jq:
+          type: http
+          url: "https://github.com/jqlang/jq/releases/download/jq-{{.Version}}/jq-{{.OS}}-{{.Arch}}"
+          format: raw
+          binary_name: jq
+
+    - name: aqua
+      type: aqua
+      priority: 10
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ type FieldRef struct {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`// String returns the dot-separated path of the field reference.`
`20`		`-//`
`21`		`-//nolint:lintroller // Simple strings.Join - perf.Track overhead disproportionate.`
`22`	`20`	`func (f FieldRef) String() string {`
	`21`	`+ defer perf.Track(nil, "template.FieldRef.String")()`
	`22`	`+`
`23`	`23`	`return strings.Join(f.Path, ".")`
`24`	`24`	`}`
`25`	`25`