Skip to content

Commit e4136fa

Browse files
authored
Add providers section to Atmos manifests. Update docs (#555)
* updates * Check and configure `prefix` for Terraform backend of type `gcs` * Check and configure `prefix` for Terraform backend of type `gcs` * Check and configure `prefix` for Terraform backend of type `gcs` * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates
1 parent f0a622b commit e4136fa

File tree

37 files changed

+442
-42
lines changed

37 files changed

+442
-42
lines changed

‎examples/quick-start/components/terraform/vpc/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ locals {
6767

6868
module "utils" {
6969
source = "cloudposse/utils/aws"
70-
version = "1.3.0"
70+
version = "1.4.0"
7171
}
7272

7373
module "vpc" {
7474
source = "cloudposse/vpc/aws"
75-
version = "2.1.0"
75+
version = "2.1.1"
7676

7777
ipv4_primary_cidr_block = var.ipv4_primary_cidr_block
7878
internet_gateway_enabled = var.public_subnets_enabled

‎examples/quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@
175175
},
176176
"overrides": {
177177
"$ref": "#/definitions/overrides"
178+
},
179+
"providers": {
180+
"$ref": "#/definitions/providers"
178181
}
179182
},
180183
"required": [],
@@ -225,6 +228,9 @@
225228
},
226229
"remote_state_backend": {
227230
"$ref": "#/definitions/remote_state_backend"
231+
},
232+
"providers": {
233+
"$ref": "#/definitions/providers"
228234
}
229235
},
230236
"required": [],
@@ -432,7 +438,8 @@
432438
"remote",
433439
"vault",
434440
"static",
435-
"azurerm"
441+
"azurerm",
442+
"gcs"
436443
],
437444
"description": "Backend type",
438445
"title": "backend_type"
@@ -537,6 +544,9 @@
537544
},
538545
"settings": {
539546
"$ref": "#/definitions/settings"
547+
},
548+
"providers": {
549+
"$ref": "#/definitions/providers"
540550
}
541551
},
542552
"required": [],
@@ -716,6 +726,12 @@
716726
"steps"
717727
],
718728
"title": "workflow_manifest"
729+
},
730+
"providers": {
731+
"type": "object",
732+
"description": "Providers section",
733+
"additionalProperties": true,
734+
"title": "providers"
719735
}
720736
}
721737
}

‎examples/tests/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Atmos Tests
22

3-
These configurations are used by the Atmos tests and CI to test/validate configurations and behaviors of Atmos. Thus, they contain many deliberately
4-
broken examples and should not be used. Instead, please see our [Quick Start](../quick-start) example.
3+
These configurations are used by the Atmos tests and CI to test/validate configurations and behaviors of Atmos.
4+
Thus, they contain many deliberately broken examples and should not be used.
5+
Instead, please see our [Quick Start](../quick-start) example.

‎examples/tests/components/terraform/infra/vpc/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ locals {
6666

6767
module "utils" {
6868
source = "cloudposse/utils/aws"
69-
version = "1.1.0"
69+
version = "1.4.0"
7070
}
7171

7272
module "vpc" {
7373
source = "cloudposse/vpc/aws"
74-
version = "2.1.0"
74+
version = "2.1.1"
7575

7676
ipv4_primary_cidr_block = var.ipv4_primary_cidr_block
7777
internet_gateway_enabled = var.public_subnets_enabled

‎examples/tests/components/terraform/infra/vpc/versions.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@ terraform {
66
source = "hashicorp/aws"
77
version = ">= 4.9.0"
88
}
9+
utils = {
10+
source = "cloudposse/utils"
11+
version = ">= 1.18.0"
12+
}
913
}
1014
}

‎examples/tests/stacks/catalog/terraform/vpc.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,11 @@ components:
4040
nat_instance_enabled: false
4141
max_subnet_count: 3
4242
map_public_ip_on_launch: true
43-
dns_hostnames_enabled: true
43+
subnet_type_tag_key: "type"
44+
providers:
45+
context:
46+
values:
47+
component: vpc
48+
atmos_component: infra/vpc
49+
aws:
50+
assume_role: "test_role"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
vars:
22
region: us-east-2
33
environment: gbl
4+
5+
terraform:
6+
providers:
7+
context:
8+
values:
9+
environment: gbl

‎examples/tests/stacks/mixins/region/us-east-1.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ components:
1212
- us-east-1a
1313
- us-east-1b
1414
- us-east-1c
15+
16+
terraform:
17+
providers:
18+
context:
19+
values:
20+
environment: ue1

‎examples/tests/stacks/mixins/region/us-east-2.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ components:
1212
- us-east-2a
1313
- us-east-2b
1414
- us-east-2c
15+
16+
terraform:
17+
providers:
18+
context:
19+
values:
20+
environment: ue2
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
vars:
22
region: us-west-1
33
environment: uw1
4+
5+
terraform:
6+
providers:
7+
context:
8+
values:
9+
environment: uw1

0 commit comments

Comments
 (0)