Skip to content

Commit f9b77a6

Browse files
aknyshaknysh
authored
Update to Atmos 1.68.0 (#377)
* Update to Atmos 1.68.0 * Update to Atmos 1.68.0
1 parent 9638f7f commit f9b77a6

File tree

11 files changed

+773
-56
lines changed

11 files changed

+773
-56
lines changed

‎examples/data-sources/utils_aws_eks_update_kubeconfig/atmos.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,16 @@ schemas:
334334
# Can also be set using 'ATMOS_SCHEMAS_OPA_BASE_PATH' ENV var, or '--schemas-opa-dir' command-line arguments
335335
# Supports both absolute and relative paths
336336
base_path: "stacks/schemas/opa"
337+
338+
# `Go` templates in Atmos manifests
339+
# https://atmos.tools/core-concepts/stacks/templating
340+
# https://pkg.go.dev/text/template
341+
templates:
342+
settings:
343+
enabled: true
344+
# https://masterminds.github.io/sprig
345+
sprig:
346+
enabled: true
347+
# https://docs.gomplate.ca
348+
gomplate:
349+
enabled: true

‎examples/data-sources/utils_component_config/atmos.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,16 @@ schemas:
334334
# Can also be set using 'ATMOS_SCHEMAS_OPA_BASE_PATH' ENV var, or '--schemas-opa-dir' command-line arguments
335335
# Supports both absolute and relative paths
336336
base_path: "stacks/schemas/opa"
337+
338+
# `Go` templates in Atmos manifests
339+
# https://atmos.tools/core-concepts/stacks/templating
340+
# https://pkg.go.dev/text/template
341+
templates:
342+
settings:
343+
enabled: true
344+
# https://masterminds.github.io/sprig
345+
sprig:
346+
enabled: true
347+
# https://docs.gomplate.ca
348+
gomplate:
349+
enabled: true

‎examples/data-sources/utils_describe_stacks/atmos.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,16 @@ schemas:
334334
# Can also be set using 'ATMOS_SCHEMAS_OPA_BASE_PATH' ENV var, or '--schemas-opa-dir' command-line arguments
335335
# Supports both absolute and relative paths
336336
base_path: "stacks/schemas/opa"
337+
338+
# `Go` templates in Atmos manifests
339+
# https://atmos.tools/core-concepts/stacks/templating
340+
# https://pkg.go.dev/text/template
341+
templates:
342+
settings:
343+
enabled: true
344+
# https://masterminds.github.io/sprig
345+
sprig:
346+
enabled: true
347+
# https://docs.gomplate.ca
348+
gomplate:
349+
enabled: true

‎examples/data-sources/utils_spacelift_stack_config/atmos.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -316,3 +316,16 @@ schemas:
316316
# Can also be set using 'ATMOS_SCHEMAS_OPA_BASE_PATH' ENV var, or '--schemas-opa-dir' command-line arguments
317317
# Supports both absolute and relative paths
318318
base_path: "stacks/schemas/opa"
319+
320+
# `Go` templates in Atmos manifests
321+
# https://atmos.tools/core-concepts/stacks/templating
322+
# https://pkg.go.dev/text/template
323+
templates:
324+
settings:
325+
enabled: true
326+
# https://masterminds.github.io/sprig
327+
sprig:
328+
enabled: true
329+
# https://docs.gomplate.ca
330+
gomplate:
331+
enabled: true

‎go.mod

+74-16
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/cloudposse/terraform-provider-utils
33
go 1.21
44

55
require (
6-
github.com/cloudposse/atmos v1.66.0
7-
github.com/gruntwork-io/terratest v0.46.11
6+
github.com/cloudposse/atmos v1.68.0
7+
github.com/gruntwork-io/terratest v0.46.13
88
github.com/hashicorp/terraform-plugin-docs v0.18.0
99
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
1010
github.com/json-iterator/go v1.1.12
@@ -28,90 +28,135 @@ require (
2828
github.com/Microsoft/hcsshim v0.11.4 // indirect
2929
github.com/OneOfOne/xxhash v1.2.8 // indirect
3030
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
31+
github.com/Shopify/ejson v1.3.3 // indirect
3132
github.com/agext/levenshtein v1.2.3 // indirect
3233
github.com/agnivade/levenshtein v1.1.1 // indirect
3334
github.com/alecthomas/chroma v0.10.0 // indirect
35+
github.com/apparentlymart/go-cidr v1.1.0 // indirect
3436
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
37+
github.com/armon/go-metrics v0.4.1 // indirect
3538
github.com/armon/go-radix v1.0.0 // indirect
3639
github.com/arsham/figurine v1.3.0 // indirect
3740
github.com/arsham/rainbow v1.2.1 // indirect
3841
github.com/atotto/clipboard v0.1.4 // indirect
39-
github.com/aws/aws-sdk-go v1.44.122 // indirect
42+
github.com/aws/aws-sdk-go v1.44.206 // indirect
43+
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
44+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect
45+
github.com/aws/aws-sdk-go-v2/config v1.15.9 // indirect
46+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
47+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
48+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.14 // indirect
49+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.2 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.6 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
60+
github.com/aws/smithy-go v1.11.2 // indirect
4061
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
4162
github.com/beorn7/perks v1.0.1 // indirect
4263
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4364
github.com/bgentry/speakeasy v0.1.0 // indirect
4465
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
4566
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect
67+
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
4668
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4769
github.com/charmbracelet/bubbles v0.18.0 // indirect
4870
github.com/charmbracelet/bubbletea v0.25.0 // indirect
4971
github.com/charmbracelet/lipgloss v0.10.0 // indirect
5072
github.com/cloudflare/circl v1.3.7 // indirect
5173
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
5274
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
53-
github.com/containerd/containerd v1.7.13 // indirect
75+
github.com/containerd/containerd v1.7.14 // indirect
5476
github.com/containerd/log v0.1.0 // indirect
5577
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
5678
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5779
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5880
github.com/dlclark/regexp2 v1.4.0 // indirect
59-
github.com/docker/cli v24.0.0+incompatible // indirect
60-
github.com/docker/distribution v2.8.2+incompatible // indirect
61-
github.com/docker/docker v25.0.3+incompatible // indirect
81+
github.com/docker/cli v26.0.0+incompatible // indirect
82+
github.com/docker/distribution v2.8.3+incompatible // indirect
83+
github.com/docker/docker v26.0.0+incompatible // indirect
6284
github.com/docker/docker-credential-helpers v0.7.0 // indirect
85+
github.com/docker/libkv v0.2.2-0.20180912205406-458977154600 // indirect
86+
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
6387
github.com/emirpasic/gods v1.18.1 // indirect
6488
github.com/fatih/color v1.16.0 // indirect
6589
github.com/felixge/httpsnoop v1.0.4 // indirect
6690
github.com/fsnotify/fsnotify v1.7.0 // indirect
6791
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6892
github.com/go-git/go-billy/v5 v5.5.0 // indirect
69-
github.com/go-git/go-git/v5 v5.11.0 // indirect
93+
github.com/go-git/go-git/v5 v5.12.0 // indirect
7094
github.com/go-ini/ini v1.67.0 // indirect
7195
github.com/go-logr/logr v1.4.1 // indirect
7296
github.com/go-logr/stdr v1.2.2 // indirect
7397
github.com/gobwas/glob v0.2.3 // indirect
7498
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7599
github.com/golang/protobuf v1.5.4 // indirect
100+
github.com/golang/snappy v0.0.4 // indirect
76101
github.com/google/go-cmp v0.6.0 // indirect
77-
github.com/google/go-containerregistry v0.19.0 // indirect
102+
github.com/google/go-containerregistry v0.19.1 // indirect
78103
github.com/google/go-github/v59 v59.0.0 // indirect
79104
github.com/google/go-querystring v1.1.0 // indirect
80105
github.com/google/s2a-go v0.1.7 // indirect
81106
github.com/google/uuid v1.6.0 // indirect
107+
github.com/google/wire v0.5.0 // indirect
82108
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
83109
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
84110
github.com/gorilla/mux v1.8.1 // indirect
111+
github.com/gosimple/slug v1.12.0 // indirect
112+
github.com/gosimple/unidecode v1.0.1 // indirect
113+
github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 // indirect
114+
github.com/hairyhenderson/gomplate/v3 v3.11.7 // indirect
115+
github.com/hairyhenderson/toml v0.4.2-0.20210923231440-40456b8e66cf // indirect
116+
github.com/hairyhenderson/yaml v0.0.0-20220618171115-2d35fca545ce // indirect
85117
github.com/hashicorp/cli v1.1.6 // indirect
118+
github.com/hashicorp/consul/api v1.25.1 // indirect
86119
github.com/hashicorp/errwrap v1.1.0 // indirect
87120
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
88121
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
89122
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
90123
github.com/hashicorp/go-getter v1.7.3 // indirect
91124
github.com/hashicorp/go-hclog v1.5.0 // indirect
125+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
92126
github.com/hashicorp/go-multierror v1.1.1 // indirect
93127
github.com/hashicorp/go-plugin v1.6.0 // indirect
128+
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
129+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
94130
github.com/hashicorp/go-safetemp v1.0.0 // indirect
131+
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
132+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.5 // indirect
133+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
134+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
95135
github.com/hashicorp/go-uuid v1.0.3 // indirect
96136
github.com/hashicorp/go-version v1.6.0 // indirect
137+
github.com/hashicorp/golang-lru v0.5.4 // indirect
97138
github.com/hashicorp/hc-install v0.6.3 // indirect
98139
github.com/hashicorp/hcl v1.0.0 // indirect
99-
github.com/hashicorp/hcl/v2 v2.20.0 // indirect
140+
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
100141
github.com/hashicorp/logutils v1.0.0 // indirect
142+
github.com/hashicorp/serf v0.10.1 // indirect
101143
github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect
102144
github.com/hashicorp/terraform-exec v0.20.0 // indirect
103145
github.com/hashicorp/terraform-json v0.21.0 // indirect
104146
github.com/hashicorp/terraform-plugin-go v0.22.0 // indirect
105147
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
106148
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
107149
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
150+
github.com/hashicorp/vault/api v1.6.0 // indirect
151+
github.com/hashicorp/vault/sdk v0.5.0 // indirect
108152
github.com/hashicorp/yamux v0.1.1 // indirect
109153
github.com/huandu/xstrings v1.3.3 // indirect
110154
github.com/imdario/mergo v0.3.15 // indirect
111155
github.com/inconshreveable/mousetrap v1.1.0 // indirect
112156
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
113157
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
114158
github.com/jmespath/go-jmespath v0.4.0 // indirect
159+
github.com/joho/godotenv v1.4.0 // indirect
115160
github.com/jwalton/go-supportscolor v1.2.0 // indirect
116161
github.com/kevinburke/ssh_config v1.2.0 // indirect
117162
github.com/klauspost/compress v1.17.0 // indirect
@@ -136,12 +181,13 @@ require (
136181
github.com/muesli/cancelreader v0.2.2 // indirect
137182
github.com/muesli/reflow v0.3.0 // indirect
138183
github.com/muesli/termenv v0.15.2 // indirect
139-
github.com/oklog/run v1.0.0 // indirect
140-
github.com/open-policy-agent/opa v0.62.1 // indirect
184+
github.com/oklog/run v1.1.0 // indirect
185+
github.com/open-policy-agent/opa v0.63.0 // indirect
141186
github.com/opencontainers/go-digest v1.0.0 // indirect
142187
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
143188
github.com/otiai10/copy v1.14.0 // indirect
144189
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
190+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
145191
github.com/pjbgf/sha1cd v0.3.0 // indirect
146192
github.com/pkg/errors v0.9.1 // indirect
147193
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -152,16 +198,18 @@ require (
152198
github.com/prometheus/procfs v0.12.0 // indirect
153199
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
154200
github.com/rivo/uniseg v0.4.7 // indirect
201+
github.com/rs/zerolog v1.26.1 // indirect
155202
github.com/russross/blackfriday v1.6.0 // indirect
203+
github.com/ryanuber/go-glob v1.0.0 // indirect
156204
github.com/sagikazarmark/locafero v0.4.0 // indirect
157205
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
158206
github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect
159207
github.com/samber/lo v1.39.0 // indirect
160208
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
161-
github.com/sergi/go-diff v1.3.1 // indirect
209+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
162210
github.com/shopspring/decimal v1.3.1 // indirect
163211
github.com/sirupsen/logrus v1.9.3 // indirect
164-
github.com/skeema/knownhosts v1.2.1 // indirect
212+
github.com/skeema/knownhosts v1.2.2 // indirect
165213
github.com/sourcegraph/conc v0.3.0 // indirect
166214
github.com/spf13/afero v1.11.0 // indirect
167215
github.com/spf13/cast v1.6.0 // indirect
@@ -171,6 +219,7 @@ require (
171219
github.com/subosito/gotenv v1.6.0 // indirect
172220
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
173221
github.com/tmccombs/hcl2json v0.3.3 // indirect
222+
github.com/ugorji/go/codec v1.2.7 // indirect
174223
github.com/ulikunitz/xz v0.5.11 // indirect
175224
github.com/vbatts/tar-split v0.11.3 // indirect
176225
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
@@ -182,7 +231,9 @@ require (
182231
github.com/yashtewari/glob-intersection v0.2.0 // indirect
183232
github.com/yuin/goldmark v1.6.0 // indirect
184233
github.com/yuin/goldmark-meta v1.1.0 // indirect
185-
github.com/zclconf/go-cty v1.14.3 // indirect
234+
github.com/zclconf/go-cty v1.14.4 // indirect
235+
github.com/zealic/xignore v0.3.3 // indirect
236+
go.etcd.io/bbolt v1.3.7 // indirect
186237
go.opencensus.io v0.24.0 // indirect
187238
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
188239
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
@@ -192,6 +243,9 @@ require (
192243
go.opentelemetry.io/otel/trace v1.21.0 // indirect
193244
go.uber.org/atomic v1.9.0 // indirect
194245
go.uber.org/multierr v1.9.0 // indirect
246+
go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect
247+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
248+
gocloud.dev v0.25.1-0.20220408200107-09b10f7359f7 // indirect
195249
golang.org/x/crypto v0.21.0 // indirect
196250
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
197251
golang.org/x/mod v0.15.0 // indirect
@@ -203,16 +257,20 @@ require (
203257
golang.org/x/text v0.14.0 // indirect
204258
golang.org/x/time v0.5.0 // indirect
205259
golang.org/x/tools v0.17.0 // indirect
260+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
206261
google.golang.org/api v0.155.0 // indirect
207262
google.golang.org/appengine v1.6.8 // indirect
208263
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
209264
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
210265
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
211-
google.golang.org/grpc v1.62.0 // indirect
266+
google.golang.org/grpc v1.62.1 // indirect
212267
google.golang.org/protobuf v1.33.0 // indirect
213268
gopkg.in/ini.v1 v1.67.0 // indirect
269+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
214270
gopkg.in/warnings.v0 v0.1.2 // indirect
215271
gopkg.in/yaml.v3 v3.0.1 // indirect
272+
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
273+
k8s.io/client-go v0.28.4 // indirect
216274
mvdan.cc/sh/v3 v3.8.0 // indirect
217275
oras.land/oras-go/v2 v2.3.1 // indirect
218276
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)