Skip to content

Commit 1d3d357

Browse files
authored
Update to Atmos 1.130.0 (#458)
* Update to Atmos 1.130.0 * Update to Atmos 1.130.0 * Update to Atmos 1.130.0 * Update to Atmos 1.130.0
1 parent 948a761 commit 1d3d357

File tree

8 files changed

+56
-11
lines changed

8 files changed

+56
-11
lines changed

examples/data-sources/utils_spacelift_stack_config/atmos.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ workflows:
6363
base_path: "stacks/workflows"
6464

6565
logs:
66-
file: "/dev/stdout"
66+
# Can also be set using 'ATMOS_LOGS_FILE' ENV var, or '--logs-file' command-line argument
67+
# File or standard file descriptor to write logs to
68+
# Logs can be written to any file or any standard file descriptor, including `/dev/stdout`, `/dev/stderr` and `/dev/null`
69+
file: "/dev/stderr"
6770
# Supported log levels: Trace, Debug, Info, Warning, Off
71+
# Can also be set using 'ATMOS_LOGS_LEVEL' ENV var, or '--logs-level' command-line argument
6872
level: Info
6973

7074
# Custom CLI commands

examples/tests/stacks/catalog/terraform/template-functions-test/defaults.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
components:
44
terraform:
55
template-functions-test:
6-
command: tofu
6+
# command: tofu
77
metadata:
88
# Point to the Terraform component
99
component: "test/template-functions-test"

examples/tests/stacks/catalog/terraform/template-functions-test2/defaults.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,17 @@ components:
3131
test_30: !exec atmos terraform output template-functions-test -s {{ .stack }} --skip-init -- -json test_label_id
3232
test_31: !exec atmos terraform output template-functions-test -s {{ .stack }} --skip-init -- -json test_map
3333
test_32: !exec atmos terraform output template-functions-test -s {{ .stack }} --skip-init -- -json test_list
34+
# Call the `!terraform.output` function with two parameters
35+
test_40: !terraform.output template-functions-test test_label_id
36+
test_41: !terraform.output template-functions-test test_list
37+
test_42: !terraform.output template-functions-test test_map
38+
# Component `template-functions-test3` is configured with the remote state backend of type `static`
39+
test_50: !terraform.output template-functions-test3 val1
40+
test_51: !terraform.output template-functions-test3 {{ .stack }} val1
41+
test_52: !terraform.output template-functions-test3 val2
42+
test_53: !terraform.output template-functions-test3 val3
43+
test_54: !terraform.output template-functions-test3 val4
44+
test_55: !terraform.output template-functions-test3 val5
45+
test_56: !terraform.output template-functions-test3 val6
46+
# test_57: !terraform.output does_not_exist val6
47+
# test_57: !terraform.output template-functions-test3 invalid-val
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
2+
3+
components:
4+
terraform:
5+
template-functions-test3:
6+
remote_state_backend_type: static
7+
remote_state_backend:
8+
static:
9+
val1: true
10+
val2: "2"
11+
val3: 3
12+
val4: null
13+
val5:
14+
- item1
15+
- item2
16+
- item3
17+
val6:
18+
i1: 1
19+
i2: 2
20+
i3: 3

examples/tests/stacks/orgs/cp/tenant1/prod/us-east-2.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ import:
1515
- catalog/terraform/spacelift/infrastructure-tenant1
1616

1717
# Configurations to test `atmos.Component` template function
18-
# - catalog/terraform/template-functions-test/defaults
19-
# - catalog/terraform/template-functions-test2/defaults
18+
# - catalog/terraform/template-functions-test/defaults
19+
# - catalog/terraform/template-functions-test2/defaults
20+
# - catalog/terraform/template-functions-test3/defaults
2021

2122
components:
2223
terraform:

examples/tests/stacks/teams/testing-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ terraform:
2727
# The `testing` Team uses `tofu` instead of `terraform`
2828
# https://opentofu.org
2929
# The commands `atmos terraform <sub-command> ...` will execute the `tofu` binary
30-
command: tofu
30+
# command: tofu
3131

3232
# Helmfile overrides
3333
# Override the variables, env, command and settings ONLY in the Helmfile components managed by the `testing` Team.

go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/cloudposse/terraform-provider-utils
33
go 1.23
44

55
require (
6-
github.com/cloudposse/atmos v1.122.0
7-
github.com/gruntwork-io/terratest v0.48.0
6+
github.com/cloudposse/atmos v1.130.0
7+
github.com/gruntwork-io/terratest v0.48.1
88
github.com/hashicorp/terraform-plugin-docs v0.20.1
99
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
1010
github.com/json-iterator/go v1.1.12
@@ -79,6 +79,7 @@ require (
7979
github.com/chainguard-dev/git-urls v1.0.2 // indirect
8080
github.com/charmbracelet/bubbles v0.20.0 // indirect
8181
github.com/charmbracelet/bubbletea v1.2.4 // indirect
82+
github.com/charmbracelet/harmonica v0.2.0 // indirect
8283
github.com/charmbracelet/huh v0.6.0 // indirect
8384
github.com/charmbracelet/lipgloss v1.0.0 // indirect
8485
github.com/charmbracelet/x/ansi v0.4.5 // indirect
@@ -115,6 +116,7 @@ require (
115116
github.com/go-logr/logr v1.4.2 // indirect
116117
github.com/go-logr/stdr v1.2.2 // indirect
117118
github.com/gobwas/glob v0.2.3 // indirect
119+
github.com/gofrs/flock v0.12.1 // indirect
118120
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
119121
github.com/golang/protobuf v1.5.4 // indirect
120122
github.com/golang/snappy v0.0.4 // indirect

go.sum

+8-4
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQW
351351
github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
352352
github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
353353
github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
354+
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
355+
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
354356
github.com/charmbracelet/huh v0.6.0 h1:mZM8VvZGuE0hoDXq6XLxRtgfWyTI3b2jZNKh0xWmax8=
355357
github.com/charmbracelet/huh v0.6.0/go.mod h1:GGNKeWCeNzKpEOh/OJD8WBwTQjV3prFAtQPpLv+AVwU=
356358
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
@@ -370,8 +372,8 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp
370372
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
371373
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
372374
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
373-
github.com/cloudposse/atmos v1.122.0 h1:pkxzSi2piVAOn9ZfD/k7kgtf0uwvemFbEL0HZ39OiMo=
374-
github.com/cloudposse/atmos v1.122.0/go.mod h1:D6RhKD/jWRc+LHqUicpg/MOAV/cFoSZL8DZ0hK7q+6Y=
375+
github.com/cloudposse/atmos v1.130.0 h1:sGyVV2EL8vEahxKX/YrjKtr7HBFWuaM06BlGOdBsmOU=
376+
github.com/cloudposse/atmos v1.130.0/go.mod h1:rP9bST7SkafQNFVVCf6cI4YKGJbBvjiAtmigbinC+CI=
375377
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
376378
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
377379
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -509,6 +511,8 @@ github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V
509511
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
510512
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
511513
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
514+
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
515+
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
512516
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
513517
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
514518
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -646,8 +650,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4
646650
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
647651
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
648652
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
649-
github.com/gruntwork-io/terratest v0.48.0 h1:OoqJYAnBxejInn7TPizFGJNMCFvPHbiWNS3hGFKdHhA=
650-
github.com/gruntwork-io/terratest v0.48.0/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=
653+
github.com/gruntwork-io/terratest v0.48.1 h1:pnydDjkWbZCUYXvQkr24y21fBo8PfJC5hRGdwbl1eXM=
654+
github.com/gruntwork-io/terratest v0.48.1/go.mod h1:U2EQW4Odlz75XJUH16Kqkr9c93p+ZZtkpVez7GkZFa4=
651655
github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 h1:nSSfN9G8O8XXDqB3aDEHJ8K+0llYYToNlTcWOe1Pti8=
652656
github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047/go.mod h1:30RY4Ey+bg+BGKBufZE2IEmxk7hok9U9mjdgZYomwN4=
653657
github.com/hairyhenderson/gomplate/v3 v3.11.8 h1:T63wLRk+Y9C601ChYa/+FZ30XT/UEWydMDZhOOJM3K0=

0 commit comments

Comments
 (0)