feedback changes

Author: magreenbaum

README.md

@@ -419,7 +419,7 @@ No modules.
 | <a name="input_list_steps_states"></a> [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 |
 | <a name="input_log_encryption_kms_key_id"></a> [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 |
 | <a name="input_log_uri"></a> [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 |
-| <a name="input_managed_scaling_policy"></a> [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) | <pre>object({<br/>    maximum_capacity_units          = number<br/>    maximum_core_capacity_units     = optional(number)<br/>    maximum_ondemand_capacity_units = optional(number)<br/>    minimum_capacity_units          = number<br/>    unit_type                       = string<br/>  })</pre> | `null` | no |
+| <a name="input_managed_scaling_policy"></a> [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) | <pre>object({<br/>    maximum_capacity_units          = number<br/>    maximum_core_capacity_units     = optional(number)<br/>    maximum_ondemand_capacity_units = optional(number)<br/>    minimum_capacity_units          = number<br/>    unit_type                       = string<br/>    scaling_strategy                = optional(string)<br/>    utilization_performance_index   = optional(number)<br/>  })</pre> | `null` | no |
 | <a name="input_managed_security_group_name"></a> [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 |
 | <a name="input_managed_security_group_tags"></a> [managed\_security\_group\_tags](#input\_managed\_security\_group\_tags) | A map of additional tags to add to the security group created | `map(string)` | `{}` | no |
 | <a name="input_managed_security_group_use_name_prefix"></a> [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 |
@@ -435,7 +435,6 @@ No modules.
 | <a name="input_release_label"></a> [release\_label](#input\_release\_label) | Release label for the Amazon EMR release | `string` | `null` | no |
 | <a name="input_release_label_filters"></a> [release\_label\_filters](#input\_release\_label\_filters) | Map of release label filters use to lookup a release label | <pre>map(object({<br/>    application = optional(string)<br/>    prefix      = optional(string)<br/>  }))</pre> | <pre>{<br/>  "default": {<br/>    "prefix": "emr-7"<br/>  }<br/>}</pre> | no |
 | <a name="input_scale_down_behavior"></a> [scale\_down\_behavior](#input\_scale\_down\_behavior) | Way that individual Amazon EC2 instances terminate when an automatic scale-in activity occurs or an instance group is resized | `string` | `"TERMINATE_AT_TASK_COMPLETION"` | no |
-| <a name="input_scaling_strategy"></a> [scaling\_strategy](#input\_scaling\_strategy) | Specifies the scaling strategy. When set to ADVANCED, the utilization\_performance\_index argument can be used to configure an advanced scaling strategy. An advanced scaling strategy requires Amazon EMR on EC2 version 7.0 or later. Valid values: ADVANCED, DEFAULT | `string` | `null` | no |
 | <a name="input_security_configuration"></a> [security\_configuration](#input\_security\_configuration) | Security configuration to create, or attach if `create_security_configuration` is `false`. Only valid for EMR clusters with `release_label` 4.8.0 or greater | `string` | `null` | no |
 | <a name="input_security_configuration_name"></a> [security\_configuration\_name](#input\_security\_configuration\_name) | Name of the security configuration to create, or attach if `create_security_configuration` is `false`. Only valid for EMR clusters with `release_label` 4.8.0 or greater | `string` | `null` | no |
 | <a name="input_security_configuration_use_name_prefix"></a> [security\_configuration\_use\_name\_prefix](#input\_security\_configuration\_use\_name\_prefix) | Determines whether `security_configuration_name` is used as a prefix | `bool` | `true` | no |
@@ -458,7 +457,6 @@ No modules.
 | <a name="input_task_instance_group"></a> [task\_instance\_group](#input\_task\_instance\_group) | Configuration block to use an [Instance Group](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-instance-group-configuration.html#emr-plan-instance-groups) for the [task node type](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-master-core-task-nodes.html#emr-plan-master) | <pre>object({<br/>    autoscaling_policy  = optional(string)<br/>    bid_price           = optional(string)<br/>    configurations_json = optional(string)<br/>    ebs_config = optional(list(object({<br/>      iops                 = optional(number)<br/>      size                 = optional(number, 256)<br/>      type                 = optional(string, "gp3")<br/>      volumes_per_instance = optional(number)<br/>    })))<br/>    ebs_optimized  = optional(bool, true)<br/>    instance_count = optional(number)<br/>    instance_type  = string<br/>    name           = optional(string)<br/>  })</pre> | `null` | no |
 | <a name="input_termination_protection"></a> [termination\_protection](#input\_termination\_protection) | Switch on/off termination protection (default is `false`, except when using multiple master nodes). Before attempting to destroy the resource when termination protection is enabled, this configuration must be applied with its value set to `false` | `bool` | `null` | no |
 | <a name="input_unhealthy_node_replacement"></a> [unhealthy\_node\_replacement](#input\_unhealthy\_node\_replacement) | Whether whether Amazon EMR should gracefully replace core nodes that have degraded within the cluster. Default value is `true` | `bool` | `true` | no |
-| <a name="input_utilization_performance_index"></a> [utilization\_performance\_index](#input\_utilization\_performance\_index) | Integer value that represents the advanced scaling strategy. Higher values optimize for performance, while lower values optimize for resource conservation. A value of 50 provides a balance between performance and resource conservation. Required when scaling\_strategy is set to ADVANCED. Valid values: 1, 25, 50, 75, 100 | `number` | `null` | no |
 | <a name="input_visible_to_all_users"></a> [visible\_to\_all\_users](#input\_visible\_to\_all\_users) | Whether the job flow is visible to all IAM users of the AWS account associated with the job flow. Default value is `true` | `bool` | `null` | no |
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The ID of the Amazon Virtual Private Cloud (Amazon VPC) where the security groups will be created | `string` | `""` | no |
 

main.tf

@@ -484,8 +484,8 @@ resource "aws_emr_managed_scaling_policy" "this" {
     unit_type                       = var.managed_scaling_policy.unit_type
   }
 
-  scaling_strategy              = var.scaling_strategy
-  utilization_performance_index = var.utilization_performance_index
+  scaling_strategy              = var.managed_scaling_policy.scaling_strategy
+  utilization_performance_index = var.managed_scaling_policy.utilization_performance_index
 }
 
 ################################################################################

variables.tf

@@ -402,22 +402,12 @@ 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
 }
 
-variable "scaling_strategy" {
-  description = "Specifies the scaling strategy. When set to ADVANCED, the utilization_performance_index argument can be used to configure an advanced scaling strategy. An advanced scaling strategy requires Amazon EMR on EC2 version 7.0 or later. Valid values: ADVANCED, DEFAULT"
-  type        = string
-  default     = null
-}
-
-variable "utilization_performance_index" {
-  description = "Integer value that represents the advanced scaling strategy. Higher values optimize for performance, while lower values optimize for resource conservation. A value of 50 provides a balance between performance and resource conservation. Required when scaling_strategy is set to ADVANCED. Valid values: 1, 25, 50, 75, 100"
-  type        = number
-  default     = null
-}
-
 ################################################################################
 # Security Configuration
 ################################################################################