Skip to content

Commit 295ef2c

Browse files
committed
fix: resolved the macie configuration
1 parent 54c479e commit 295ef2c

File tree

9 files changed

+13
-59
lines changed

9 files changed

+13
-59
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ The `terraform-docs` utility is used to generate this README. Follow the below s
698698

699699
| Name | Version |
700700
|------|---------|
701-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0.0 |
701+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0.0 |
702702

703703
## Inputs
704704

examples/basic/README.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,9 @@
11
<!-- BEGIN_TF_DOCS -->
2-
## Requirements
3-
4-
| Name | Version |
5-
|------|---------|
6-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
7-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0.0 |
8-
92
## Providers
103

114
| Name | Version |
125
|------|---------|
13-
| <a name="provider_aws.audit_eu_west_2"></a> [aws.audit\_eu\_west\_2](#provider\_aws.audit\_eu\_west\_2) | >= 5.0.0 |
14-
15-
## Modules
16-
17-
| Name | Source | Version |
18-
|------|--------|---------|
19-
| <a name="module_compliance"></a> [compliance](#module\_compliance) | ../.. | n/a |
20-
| <a name="module_config_home"></a> [config\_home](#module\_config\_home) | ../../modules/config | n/a |
21-
| <a name="module_config_us_east_1"></a> [config\_us\_east\_1](#module\_config\_us\_east\_1) | ../../modules/config | n/a |
22-
| <a name="module_guardduty_home"></a> [guardduty\_home](#module\_guardduty\_home) | ../../modules/guardduty | n/a |
23-
| <a name="module_guardduty_us_east_1"></a> [guardduty\_us\_east\_1](#module\_guardduty\_us\_east\_1) | ../../modules/guardduty | n/a |
24-
25-
## Resources
26-
27-
| Name | Type |
28-
|------|------|
29-
| [aws_guardduty_detector.guardduty](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/guardduty_detector) | data source |
6+
| <a name="provider_aws.audit_eu_west_2"></a> [aws.audit\_eu\_west\_2](#provider\_aws.audit\_eu\_west\_2) | >= 6.0.0 |
307

318
## Inputs
329

examples/basic/terraform.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ terraform {
55
required_providers {
66
aws = {
77
source = "hashicorp/aws"
8-
version = ">= 5.0.0"
8+
version = ">= 6.0.0"
99
}
1010
}
1111
}

macie.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
locals {
33
## Determine if the macie service is managed by the landing zone
4-
macie_enabled = var.macie != null
4+
macie_enabled = try(var.macie.enable, false)
55
}
66

77
## Provision the stackset to enable the macie service across all the accounts
@@ -10,9 +10,11 @@ module "macie" {
1010
source = "appvia/stackset/aws"
1111
version = "0.2.6"
1212

13-
name = try(var.macie.stackset_name, null)
13+
name = try(var.macie.stackset_name, "lz-macie-configuration")
1414
description = "Configuration for the AWS macie service, configured by the landing zone"
15+
call_as = "DELEGATED_ADMIN"
1516
exclude_accounts = try(var.macie.exclude_accounts, null)
17+
permission_model = "SERVICE_MANAGED"
1618
region = var.region
1719
tags = local.tags
1820

modules/config/README.md

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,19 @@
11
<!-- BEGIN_TF_DOCS -->
2-
## Requirements
3-
4-
| Name | Version |
5-
|------|---------|
6-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.7 |
7-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0.0 |
8-
92
## Providers
103

114
| Name | Version |
125
|------|---------|
13-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0.0 |
14-
15-
## Modules
16-
17-
No modules.
18-
19-
## Resources
20-
21-
| Name | Type |
22-
|------|------|
23-
| [aws_cloudformation_stack.mgmt_config_rules_cloudformation_stack](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack) | resource |
24-
| [aws_config_configuration_recorder.mgmt_config_recorder](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/config_configuration_recorder) | resource |
25-
| [aws_config_configuration_recorder_status.mgmt_config_recorder_status](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/config_configuration_recorder_status) | resource |
26-
| [aws_config_delivery_channel.mgmt_config_delivery_channel](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/config_delivery_channel) | resource |
27-
| [aws_config_retention_configuration.mgmt_config_retention](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/config_retention_configuration) | resource |
28-
| [aws_iam_role.mgmt_config_recorder_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
29-
| [aws_iam_policy_document.mgmt_config_recorder_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
30-
| [aws_organizations_organization.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/organizations_organization) | data source |
31-
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
6+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0.0 |
327

338
## Inputs
349

3510
| Name | Description | Type | Default | Required |
3611
|------|-------------|------|---------|:--------:|
3712
| <a name="input_config"></a> [config](#input\_config) | Configuration for the securityhub organization managed rules | <pre>object({<br/> stackset_name_prefix = optional(string, "lza-config-")<br/><br/> # The prefix added to the stacksets<br/> rule_groups = optional(map(object({<br/> associations = list(string)<br/> # List of organizational units to deploy the managed rules<br/> description = string<br/> # Description for the rule group<br/> enabled_regions = optional(list(string), null)<br/> # List of regions to enable these rules<br/> exclude_accounts = optional(list(string), null)<br/> # The list of accounts to exclude from the organization managed rule<br/> rules = map(object({<br/> description = string<br/> # The description of the organization managed rules<br/> identifier = string<br/> # The identifier of the organization managed rule<br/> inputs = optional(map(string), {})<br/> # The identifier of the organization managed rule scope<br/> resource_types = list(string)<br/> # The list of resource types to scope the organization managed rule<br/> max_execution_frequency = optional(string, null)<br/> # The max_execution_frequency of the rule<br/> }))<br/> })), {})<br/> # The configuration for the securityhub organization managed rules<br/> })</pre> | n/a | yes |
38-
| <a name="input_config_retention_in_days"></a> [config\_retention\_in\_days](#input\_config\_retention\_in\_days) | The number of days to store config historical data (defaults to one year) | `number` | `366` | no |
3913
| <a name="input_control_tower_sns_topic_arn"></a> [control\_tower\_sns\_topic\_arn](#input\_control\_tower\_sns\_topic\_arn) | The ARN of the SNS topic created by Control Tower for AWS notifications | `string` | n/a | yes |
4014
| <a name="input_home_region"></a> [home\_region](#input\_home\_region) | The home Region in which Control Tower created the Config S3 buckiet (namely, in logarchive account | `string` | n/a | yes |
4115
| <a name="input_logarchive_account_id"></a> [logarchive\_account\_id](#input\_logarchive\_account\_id) | The AWS account id for the logarchive account created by Control Tower | `string` | n/a | yes |
16+
| <a name="input_config_retention_in_days"></a> [config\_retention\_in\_days](#input\_config\_retention\_in\_days) | The number of days to store config historical data (defaults to one year) | `number` | `366` | no |
4217
| <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to the resources | `map(string)` | `{}` | no |
4318

4419
## Outputs

modules/config/terraform.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ terraform {
55
required_providers {
66
aws = {
77
source = "hashicorp/aws"
8-
version = ">= 5.0.0"
8+
version = ">= 6.0.0"
99
}
1010
}
1111
}

modules/guardduty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
| Name | Version |
55
|------|---------|
6-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0.0 |
6+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0.0 |
77

88
## Inputs
99

modules/guardduty/terraform.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ terraform {
55
required_providers {
66
aws = {
77
source = "hashicorp/aws"
8-
version = ">= 5.0.0"
8+
version = ">= 6.0.0"
99
}
1010
}
1111
}

terraform.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ terraform {
55
required_providers {
66
aws = {
77
source = "hashicorp/aws"
8-
version = ">= 5.0.0"
8+
version = ">= 6.0.0"
99
}
1010
}
1111
}

0 commit comments

Comments
 (0)