|
1 | 1 | module "tags" {
|
2 |
| - source = "git::https://github.com/rhythmictech/terraform-terraform-tags.git?ref=v0.0.2" |
| 2 | + source = "git::https://github.com/rhythmictech/terraform-terraform-tags.git?ref=v1.0.0" |
3 | 3 |
|
4 | 4 | names = [
|
5 | 5 | "account",
|
6 | 6 | var.env,
|
7 | 7 | var.namespace
|
8 | 8 | ]
|
9 | 9 |
|
10 |
| - tags = { |
| 10 | + tags = merge(var.tags, { |
11 | 11 | "Env" = var.env,
|
12 | 12 | "Namespace" = var.namespace,
|
13 | 13 | "Owner" = var.owner
|
14 |
| - } |
| 14 | + }) |
15 | 15 | }
|
16 | 16 |
|
17 |
| -module "rhythmic-iam-roles" { |
18 |
| - source = "git::https://github.com/rhythmictech/terraform-aws-rhythmic-iam-roles.git?ref=v1.0.0" |
19 |
| - role_prefix = var.iam_role_prefix |
20 |
| - master_account = var.iam_master_account |
| 17 | +locals { |
| 18 | + tags = module.tags.tags_no_name |
21 | 19 | }
|
22 | 20 |
|
23 | 21 | module "s3logging-bucket" {
|
24 |
| - source = "git::https://github.com/rhythmictech/terraform-aws-s3logging-bucket?ref=v1.0.0" |
| 22 | + source = "git::https://github.com/rhythmictech/terraform-aws-s3logging-bucket?ref=v1.0.1" |
25 | 23 | bucket_suffix = "account"
|
26 | 24 | region = var.region
|
27 |
| - tags = module.tags.tags_no_name |
| 25 | + tags = local.tags |
28 | 26 | }
|
29 | 27 |
|
30 | 28 | module "cloudtrail-bucket" {
|
31 |
| - source = "git::https://github.com/rhythmictech/terraform-aws-cloudtrail-bucket?ref=v1.0.0" |
| 29 | + source = "git::https://github.com/rhythmictech/terraform-aws-cloudtrail-bucket?ref=v1.2.0" |
32 | 30 | logging_bucket = module.s3logging-bucket.s3logging_bucket_name
|
33 | 31 | region = var.region
|
34 |
| - tags = module.tags.tags_no_name |
| 32 | + tags = local.tags |
35 | 33 |
|
36 | 34 | }
|
37 | 35 |
|
38 | 36 | module "cloudtrail-logging" {
|
39 |
| - source = "git::https://github.com/rhythmictech/terraform-aws-cloudtrail-logging?ref=v1.0.0" |
40 |
| - region = var.region |
41 |
| - cloudtrail_bucket = module.cloudtrail-bucket.bucket_name |
| 37 | + source = "git::https://github.com/rhythmictech/terraform-aws-cloudtrail-logging?ref=v1.1.0" |
| 38 | + cloudtrail_bucket = module.cloudtrail-bucket.s3_bucket_name |
42 | 39 | kms_key_id = module.cloudtrail-bucket.kms_key_id
|
| 40 | + region = var.region |
43 | 41 | }
|
44 | 42 |
|
45 | 43 | module "iam-password-policy" {
|
46 |
| - source = "git::ssh://git@github.com/rhythmictech/terraform-aws-iam-password-policy?ref=v1.0.0" |
| 44 | + source = "git::https://github.com/rhythmictech/terraform-aws-iam-password-policy?ref=v1.0.0" |
47 | 45 | }
|
0 commit comments