Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve imports and deep-merging of variables of any complex types #13

Merged
merged 2 commits into from
Jan 6, 2021
Merged

Improve imports and deep-merging of variables of any complex types #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1828ce9
Updates
aknysh Jan 6, 2021
13649d0
Updates
aknysh Jan 6, 2021
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 LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2020 Cloud Posse, LLC
Copyright 2020-2021 Cloud Posse, LLC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ __NOTE:__ For the example, we import all the CLI modules, but they could be incl

```hcl
imports = [
"git::https://git@github.com/cloudposse/atmos@modules/utils?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/vendor?ref=master"
"git::https://git@github.com/cloudposse/atmos@modules/utils?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/vendor?ref=master"
]
```

Expand Down Expand Up @@ -558,7 +558,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.

## Copyright

Copyright © 2017-2020 [Cloud Posse, LLC](https://cpco.io/copyright)
Copyright © 2017-2021 [Cloud Posse, LLC](https://cpco.io/copyright)



Expand Down
18 changes: 9 additions & 9 deletions README.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ introduction: |-

```hcl
imports = [
"git::https://git@github.com/cloudposse/atmos@modules/utils?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/vendor?ref=master"
"git::https://git@github.com/cloudposse/atmos@modules/utils?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=master",
"git::https://git@github.com/cloudposse/atmos@modules/vendor?ref=master"
]
```

Expand Down
16 changes: 16 additions & 0 deletions example/stacks/globals-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
vars: {}

terraform:
vars:
test-map:
g: g1
atr-2:
atr1: 1
atr2: 2
list2:
- 1
- 2
- 3

helmfile:
vars: {}
13 changes: 12 additions & 1 deletion example/stacks/globals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@ vars:

terraform:
vars:
test-map:
a: a1
b: b1
c: c1
atr:
atr1: 1
atr2: 2
list:
- 1
- 2
- 3

helmfile:
vars:
vars: {}

components:
terraform:
Expand Down
21 changes: 20 additions & 1 deletion example/stacks/ue2-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,18 @@ vars:

terraform:
vars:
test-map:
a: a3
d: d3
e: e3
atr:
atr2: 2-3
atr4: 4
list:
- 1b

helmfile:
vars:
vars: {}

components:
terraform:
Expand All @@ -17,6 +26,16 @@ components:
cidr_block: "10.100.0.0/18"
eks:
vars:
test-map:
a: a4
d: d4
e: e4
f: f4
atr:
atr2: 2-4
atr5: 5
list:
- 1c

helmfile:
nginx-ingress:
Expand Down
26 changes: 13 additions & 13 deletions example/stacks/ue2-globals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import:
- globals
- globals-2

vars:
region: us-east-2
environment: ue2

terraform:
vars:
backend_type: s3 # s3, remote, vault, etc.
backend:
s3:
encrypt: true
bucket: "eg-ue2-root-tfstate"
key: "terraform.tfstate"
dynamodb_table: "eg-ue2-root-tfstate-lock"
role_arn: "arn:aws:iam::xxxxxxxx:role/eg-gbl-root-terraform"
acl: "bucket-owner-full-control"
region: "us-east-2"
remote:
vault:
test-map:
b: b2
atr:
atr1: 1-1
atr3: 3
list:
- 1a
list:
- 4
- 5
- 6

helmfile:
vars:
vars: {}
6 changes: 3 additions & 3 deletions example/stacks/ue2-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ vars:
stage: prod

terraform:
vars:
vars: {}

helmfile:
vars:
vars: {}

components:
terraform:
Expand All @@ -17,7 +17,7 @@ components:
vars:
cidr_block: "10.102.0.0/18"
eks:
vars:
vars: {}

helmfile:
nginx-ingress:
Expand Down
6 changes: 3 additions & 3 deletions example/stacks/ue2-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ vars:
stage: staging

terraform:
vars:
vars: {}

helmfile:
vars:
vars: {}

components:
terraform:
vpc:
vars:
cidr_block: "10.104.0.0/18"
eks:
vars:
vars: {}

helmfile:
nginx-ingress:
Expand Down
Loading