Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
374e999
Updates
aknysh Dec 20, 2022
b91843f
Merge remote-tracking branch 'origin/master' into update-describe-com…
aknysh Dec 21, 2022
1f781b4
Updates
aknysh Dec 21, 2022
f26cf26
Updates
aknysh Dec 22, 2022
f98d567
Updates
aknysh Dec 22, 2022
4bbfbe3
Updates
aknysh Dec 22, 2022
0e6dc1c
Updates
aknysh Dec 22, 2022
0d31f5b
Updates
aknysh Dec 22, 2022
1caa6b5
Updates
aknysh Dec 23, 2022
ae69193
Updates
aknysh Dec 23, 2022
1e403da
Updates
aknysh Dec 23, 2022
ec61508
Updates
aknysh Dec 23, 2022
669adbc
Updates
aknysh Dec 23, 2022
1100418
Updates
aknysh Dec 23, 2022
3629978
Updates
aknysh Dec 23, 2022
419d020
Updates
aknysh Dec 23, 2022
1843b39
Updates
aknysh Dec 23, 2022
81af81e
Updates
aknysh Dec 23, 2022
101fca1
Updates
aknysh Dec 23, 2022
a53886c
Updates
aknysh Dec 23, 2022
745d688
Updates
aknysh Dec 23, 2022
2d1f8fd
Updates
aknysh Dec 23, 2022
85a048b
Updates
aknysh Dec 23, 2022
4c8d7a8
Updates
aknysh Dec 23, 2022
25a9268
Updates
aknysh Dec 23, 2022
b84bd1f
Updates
aknysh Dec 23, 2022
dcdd559
Updates
aknysh Dec 23, 2022
587167f
Updates
aknysh Dec 23, 2022
d4b7f7e
Updates
aknysh Dec 24, 2022
615d550
Updates
aknysh Dec 24, 2022
1f5dcea
Updates
aknysh Dec 24, 2022
824bc7f
Updates
aknysh Dec 24, 2022
46fe149
Updates
aknysh Dec 24, 2022
c4fc1b9
Updates
aknysh Dec 24, 2022
8cf2341
Updates
aknysh Dec 24, 2022
0785732
Updates
aknysh Dec 24, 2022
47e8ce6
Updates
aknysh Dec 24, 2022
9378ca4
Updates
aknysh Dec 24, 2022
f71221c
Updates
aknysh Dec 24, 2022
8fa6ce7
Updates
aknysh Dec 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# Build and release
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3
uses: goreleaser/goreleaser-action@v4
with:
version: latest
args: release --parallelism 2 --rm-dist
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ARG GEODESIC_VERSION=1.6.0
ARG GEODESIC_OS=debian
# atmos: https://github.com/cloudposse/atmos
ARG ATMOS_VERSION=1.17.0
ARG ATMOS_VERSION=1.19.0
# Terraform: https://github.com/hashicorp/terraform/releases
ARG TF_VERSION=1.3.6

Expand Down
7 changes: 7 additions & 0 deletions examples/complete/stacks/orgs/cp/tenant1/dev/us-east-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ import:
- catalog/helmfile/infra-server
- catalog/helmfile/infra-server-override

vars:
enabled: true

terraform:
vars:
enabled: false

components:
terraform:
"infra/vpc":
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.5.0
github.com/open-policy-agent/opa v0.47.3
github.com/open-policy-agent/opa v0.47.4
github.com/otiai10/copy v1.9.0
github.com/pkg/errors v0.9.1
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/open-policy-agent/opa v0.47.3 h1:Uj8zw+q6Cvv1iiQFh704Q6sl3fKVvk35WZNJLsd6mgk=
github.com/open-policy-agent/opa v0.47.3/go.mod h1:I5DbT677OGqfk9gvu5i54oIt0rrVf4B5pedpqDquAXo=
github.com/open-policy-agent/opa v0.47.4 h1:CTPIoAv6/UJX+BkSkqytbofWrZHyfQ/A0ESE4FSKR9A=
github.com/open-policy-agent/opa v0.47.4/go.mod h1:I5DbT677OGqfk9gvu5i54oIt0rrVf4B5pedpqDquAXo=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/atlantis_generate_repo_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func ExecuteAtlantisGenerateRepoConfig(
stacks []string,
components []string) error {

stacksMap, err := FindStacksMap(cliConfig)
stacksMap, _, err := FindStacksMap(cliConfig)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/describe_stacks.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func ExecuteDescribeStacks(
sections []string,
) (map[string]any, error) {

stacksMap, err := FindStacksMap(cliConfig)
stacksMap, _, err := FindStacksMap(cliConfig)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/terraform_generate_backends.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func ExecuteTerraformGenerateBackendsCmd(cmd *cobra.Command, args []string) erro

// ExecuteTerraformGenerateBackends generates backend configs for all terraform components
func ExecuteTerraformGenerateBackends(cliConfig cfg.CliConfiguration, fileTemplate string, format string, stacks []string, components []string) error {
stacksMap, err := FindStacksMap(cliConfig)
stacksMap, _, err := FindStacksMap(cliConfig)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/terraform_generate_varfiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func ExecuteTerraformGenerateVarfilesCmd(cmd *cobra.Command, args []string) erro

// ExecuteTerraformGenerateVarfiles generates varfiles for all terraform components in all stacks
func ExecuteTerraformGenerateVarfiles(cliConfig cfg.CliConfiguration, fileTemplate string, format string, stacks []string, components []string) error {
stacksMap, err := FindStacksMap(cliConfig)
stacksMap, _, err := FindStacksMap(cliConfig)
if err != nil {
return err
}
Expand Down
Loading