diff --git a/README.md b/README.md index fa5bb55..d74b1d5 100644 --- a/README.md +++ b/README.md @@ -330,13 +330,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.83 | +| [aws](#requirement\_aws) | >= 6.2 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.83 | +| [aws](#provider\_aws) | >= 6.2 | ## Modules @@ -422,6 +422,7 @@ No modules. | [master\_security\_group\_description](#input\_master\_security\_group\_description) | Description of the security group created | `string` | `"Managed master security group"` | no | | [master\_security\_group\_rules](#input\_master\_security\_group\_rules) | Security group rules to add to the security group created | `any` |
{
"default": {
"cidr_blocks": [
"0.0.0.0/0"
],
"description": "Allow all egress traffic",
"from_port": 0,
"ipv6_cidr_blocks": [
"::/0"
],
"protocol": "-1",
"to_port": 0,
"type": "egress"
}
} | no |
| [name](#input\_name) | Name of the job flow | `string` | `""` | no |
+| [os\_release\_label](#input\_os\_release\_label) | OS release label for the Amazon EMR release | `string` | `"2023.7.20250512.0"` | no |
| [placement\_group\_config](#input\_placement\_group\_config) | The specified placement group configuration | `any` | `{}` | no |
| [release\_label](#input\_release\_label) | Release label for the Amazon EMR release | `string` | `null` | no |
| [release\_label\_filters](#input\_release\_label\_filters) | Map of release label filters use to lookup a release label | `any` | {
"default": {
"prefix": "emr-6"
}
} | no |
diff --git a/main.tf b/main.tf
index 1ed6e6c..f7b8c20 100644
--- a/main.tf
+++ b/main.tf
@@ -283,6 +283,7 @@ resource "aws_emr_cluster" "this" {
name = var.name
release_label = try(coalesce(var.release_label, element(data.aws_emr_release_labels.this[0].release_labels, 0)), "")
+ os_release_label = var.os_release_label
scale_down_behavior = var.scale_down_behavior
security_configuration = var.create_security_configuration ? aws_emr_security_configuration.this[0].name : var.security_configuration_name
service_role = local.create_service_iam_role ? aws_iam_role.service[0].arn : var.service_iam_role_arn
@@ -526,7 +527,7 @@ data "aws_iam_policy_document" "autoscaling" {
condition {
test = "ArnLike"
variable = "aws:SourceArn"
- values = ["arn:aws:elasticmapreduce:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:*"]
+ values = ["arn:aws:elasticmapreduce:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:*"]
}
}
}
@@ -590,7 +591,7 @@ data "aws_iam_policy_document" "service" {
condition {
test = "ArnLike"
variable = "aws:SourceArn"
- values = ["arn:aws:elasticmapreduce:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:*"]
+ values = ["arn:aws:elasticmapreduce:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:*"]
}
}
}
diff --git a/variables.tf b/variables.tf
index 0ad0bf6..15ba928 100644
--- a/variables.tf
+++ b/variables.tf
@@ -128,6 +128,12 @@ variable "name" {
default = ""
}
+variable "os_release_label" {
+ description = "OS release label for the Amazon EMR release"
+ type = string
+ default = "2023.7.20250512.0"
+}
+
variable "placement_group_config" {
description = "The specified placement group configuration"
type = any
diff --git a/versions.tf b/versions.tf
index e0d6884..67aa5bd 100644
--- a/versions.tf
+++ b/versions.tf
@@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
- version = ">= 5.83"
+ version = ">= 6.2"
}
}
}