diff --git a/README.md b/README.md index 896c748..54bc1de 100644 --- a/README.md +++ b/README.md @@ -332,13 +332,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules @@ -419,7 +419,7 @@ No modules. | [list\_steps\_states](#input\_list\_steps\_states) | List of [step states](https://docs.aws.amazon.com/emr/latest/APIReference/API_StepStatus.html) used to filter returned steps | `list(string)` | `[]` | no | | [log\_encryption\_kms\_key\_id](#input\_log\_encryption\_kms\_key\_id) | AWS KMS customer master key (CMK) key ID or arn used for encrypting log files. This attribute is only available with EMR version 5.30.0 and later, excluding EMR 6.0.0 | `string` | `null` | no | | [log\_uri](#input\_log\_uri) | S3 bucket to write the log files of the job flow. If a value is not provided, logs are not created | `string` | `null` | no | -| [managed\_scaling\_policy](#input\_managed\_scaling\_policy) | Compute limit configuration for a [Managed Scaling Policy](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-scaling.html) |
object({
maximum_capacity_units = number
maximum_core_capacity_units = optional(number)
maximum_ondemand_capacity_units = optional(number)
minimum_capacity_units = number
unit_type = string
})
| `null` | no | +| [managed\_scaling\_policy](#input\_managed\_scaling\_policy) | Compute limit configuration for a [Managed Scaling Policy](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-scaling.html) |
object({
maximum_capacity_units = number
maximum_core_capacity_units = optional(number)
maximum_ondemand_capacity_units = optional(number)
minimum_capacity_units = number
unit_type = string
scaling_strategy = optional(string)
utilization_performance_index = optional(number)
})
| `null` | no | | [managed\_security\_group\_name](#input\_managed\_security\_group\_name) | Name to use on manged security group created. Note - `-master`, `-slave`, and `-service` will be appended to this name to distinguish | `string` | `null` | no | | [managed\_security\_group\_tags](#input\_managed\_security\_group\_tags) | A map of additional tags to add to the security group created | `map(string)` | `{}` | no | | [managed\_security\_group\_use\_name\_prefix](#input\_managed\_security\_group\_use\_name\_prefix) | Determines whether the security group name (`security_group_name`) is used as a prefix | `bool` | `true` | no | diff --git a/examples/private-cluster/README.md b/examples/private-cluster/README.md index 4178ca4..803db0e 100644 --- a/examples/private-cluster/README.md +++ b/examples/private-cluster/README.md @@ -29,13 +29,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/examples/private-cluster/versions.tf b/examples/private-cluster/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/examples/private-cluster/versions.tf +++ b/examples/private-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/examples/public-cluster/README.md b/examples/public-cluster/README.md index c3ffaec..3834394 100644 --- a/examples/public-cluster/README.md +++ b/examples/public-cluster/README.md @@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/examples/public-cluster/versions.tf b/examples/public-cluster/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/examples/public-cluster/versions.tf +++ b/examples/public-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/examples/serverless-cluster/README.md b/examples/serverless-cluster/README.md index 1ae7bdb..f5338b2 100644 --- a/examples/serverless-cluster/README.md +++ b/examples/serverless-cluster/README.md @@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/examples/serverless-cluster/versions.tf b/examples/serverless-cluster/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/examples/serverless-cluster/versions.tf +++ b/examples/serverless-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/examples/studio/README.md b/examples/studio/README.md index 833d7f0..2bf8af6 100644 --- a/examples/studio/README.md +++ b/examples/studio/README.md @@ -22,13 +22,13 @@ terraform apply | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/examples/studio/versions.tf b/examples/studio/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/examples/studio/versions.tf +++ b/examples/studio/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/examples/virtual-cluster/README.md b/examples/virtual-cluster/README.md index 89e6801..e04c29f 100644 --- a/examples/virtual-cluster/README.md +++ b/examples/virtual-cluster/README.md @@ -41,7 +41,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | | [kubernetes](#requirement\_kubernetes) | >= 2.38 | | [null](#requirement\_null) | >= 3.0 | | [time](#requirement\_time) | >= 0.7 | @@ -50,7 +50,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \ | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | | [null](#provider\_null) | >= 3.0 | ## Modules diff --git a/examples/virtual-cluster/versions.tf b/examples/virtual-cluster/versions.tf index 89104a5..e9df45c 100644 --- a/examples/virtual-cluster/versions.tf +++ b/examples/virtual-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/main.tf b/main.tf index 848679d..8a4f5ec 100644 --- a/main.tf +++ b/main.tf @@ -483,6 +483,9 @@ resource "aws_emr_managed_scaling_policy" "this" { minimum_capacity_units = var.managed_scaling_policy.minimum_capacity_units unit_type = var.managed_scaling_policy.unit_type } + + scaling_strategy = var.managed_scaling_policy.scaling_strategy + utilization_performance_index = var.managed_scaling_policy.utilization_performance_index } ################################################################################ diff --git a/modules/serverless/README.md b/modules/serverless/README.md index d3eb32e..bb1ec39 100644 --- a/modules/serverless/README.md +++ b/modules/serverless/README.md @@ -132,13 +132,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/modules/serverless/versions.tf b/modules/serverless/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/modules/serverless/versions.tf +++ b/modules/serverless/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/modules/studio/README.md b/modules/studio/README.md index f7daed1..40111c6 100644 --- a/modules/studio/README.md +++ b/modules/studio/README.md @@ -68,13 +68,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | ## Modules diff --git a/modules/studio/versions.tf b/modules/studio/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/modules/studio/versions.tf +++ b/modules/studio/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } } diff --git a/modules/virtual-cluster/README.md b/modules/virtual-cluster/README.md index 72a0fb9..432f67f 100644 --- a/modules/virtual-cluster/README.md +++ b/modules/virtual-cluster/README.md @@ -73,14 +73,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.19 | +| [aws](#requirement\_aws) | >= 6.22 | | [kubernetes](#requirement\_kubernetes) | >= 2.38 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.19 | +| [aws](#provider\_aws) | >= 6.22 | | [kubernetes](#provider\_kubernetes) | >= 2.38 | ## Modules diff --git a/modules/virtual-cluster/versions.tf b/modules/virtual-cluster/versions.tf index fd1ccc8..e97acdd 100644 --- a/modules/virtual-cluster/versions.tf +++ b/modules/virtual-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/variables.tf b/variables.tf index 6e13851..8cecb20 100644 --- a/variables.tf +++ b/variables.tf @@ -402,6 +402,8 @@ variable "managed_scaling_policy" { maximum_ondemand_capacity_units = optional(number) minimum_capacity_units = number unit_type = string + scaling_strategy = optional(string) + utilization_performance_index = optional(number) }) default = null } diff --git a/versions.tf b/versions.tf index 0d5ee58..0cf1cd7 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.19" + version = ">= 6.22" } } }