diff --git a/README.md b/README.md index 9d11385..5f287bf 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.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/examples/private-cluster/README.md b/examples/private-cluster/README.md index 0479183..fda227a 100644 --- a/examples/private-cluster/README.md +++ b/examples/private-cluster/README.md @@ -28,13 +28,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/examples/private-cluster/versions.tf b/examples/private-cluster/versions.tf index 7575fc1..7ea0158 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 = ">= 5.44" + version = ">= 5.59" } } } diff --git a/examples/public-cluster/README.md b/examples/public-cluster/README.md index 3a18d4c..6d78b64 100644 --- a/examples/public-cluster/README.md +++ b/examples/public-cluster/README.md @@ -26,13 +26,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/examples/public-cluster/versions.tf b/examples/public-cluster/versions.tf index 7575fc1..7ea0158 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 = ">= 5.44" + version = ">= 5.59" } } } diff --git a/examples/serverless-cluster/README.md b/examples/serverless-cluster/README.md index d23972c..ee159c7 100644 --- a/examples/serverless-cluster/README.md +++ b/examples/serverless-cluster/README.md @@ -26,13 +26,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/examples/serverless-cluster/main.tf b/examples/serverless-cluster/main.tf index 7058dd7..d3d2846 100644 --- a/examples/serverless-cluster/main.tf +++ b/examples/serverless-cluster/main.tf @@ -74,6 +74,11 @@ module "emr_serverless_spark" { } } + interactive_configuration = { + livy_endpoint_enabled = true + studio_enabled = true + } + tags = local.tags } diff --git a/examples/serverless-cluster/versions.tf b/examples/serverless-cluster/versions.tf index 7575fc1..7ea0158 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 = ">= 5.44" + version = ">= 5.59" } } } diff --git a/examples/studio/README.md b/examples/studio/README.md index d091a88..8b0b215 100644 --- a/examples/studio/README.md +++ b/examples/studio/README.md @@ -22,13 +22,13 @@ $ terraform apply | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/examples/studio/versions.tf b/examples/studio/versions.tf index 7575fc1..7ea0158 100644 --- a/examples/studio/versions.tf +++ b/examples/studio/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.44" + version = ">= 5.59" } } } diff --git a/examples/virtual-cluster/README.md b/examples/virtual-cluster/README.md index 63d739e..eb7cd99 100644 --- a/examples/virtual-cluster/README.md +++ b/examples/virtual-cluster/README.md @@ -45,7 +45,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | | [kubernetes](#requirement\_kubernetes) | >= 2.17 | | [null](#requirement\_null) | >= 3.0 | | [time](#requirement\_time) | >= 0.7 | @@ -54,7 +54,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \ | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | | [null](#provider\_null) | >= 3.0 | | [time](#provider\_time) | >= 0.7 | diff --git a/examples/virtual-cluster/versions.tf b/examples/virtual-cluster/versions.tf index d108425..ba6c676 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 = ">= 5.44" + version = ">= 5.59" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/serverless/README.md b/modules/serverless/README.md index aa9748d..431dd10 100644 --- a/modules/serverless/README.md +++ b/modules/serverless/README.md @@ -134,13 +134,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules @@ -167,6 +167,7 @@ No modules. | [create\_security\_group](#input\_create\_security\_group) | Determines whether the security group is created | `bool` | `true` | no | | [image\_configuration](#input\_image\_configuration) | The image configuration applied to all worker types | `any` | `{}` | no | | [initial\_capacity](#input\_initial\_capacity) | The capacity to initialize when the application is created | `any` | `{}` | no | +| [interactive\_configuration](#input\_interactive\_configuration) | Enables the interactive use cases to use when running an application | `any` | `{}` | no | | [maximum\_capacity](#input\_maximum\_capacity) | The maximum capacity to allocate when the application is created. This is cumulative across all workers at any given point in time, not just when an application is created. No new resources will be created once any one of the defined limits is hit | `any` | `{}` | no | | [name](#input\_name) | The name of the application | `string` | `""` | no | | [network\_configuration](#input\_network\_configuration) | The network configuration for customer VPC connectivity | `any` | `{}` | no | diff --git a/modules/serverless/main.tf b/modules/serverless/main.tf index b9395bf..1d41c57 100644 --- a/modules/serverless/main.tf +++ b/modules/serverless/main.tf @@ -62,6 +62,14 @@ resource "aws_emrserverless_application" "this" { } } + dynamic "interactive_configuration" { + for_each = [var.interactive_configuration] + content { + livy_endpoint_enabled = try(interactive_configuration.value.livy_endpoint_enabled, null) + studio_enabled = try(interactive_configuration.value.studio_enabled, null) + } + } + dynamic "maximum_capacity" { for_each = length(var.maximum_capacity) > 0 ? [var.maximum_capacity] : [] diff --git a/modules/serverless/variables.tf b/modules/serverless/variables.tf index ad0f90f..91bc021 100644 --- a/modules/serverless/variables.tf +++ b/modules/serverless/variables.tf @@ -44,6 +44,12 @@ variable "initial_capacity" { default = {} } +variable "interactive_configuration" { + description = "Enables the interactive use cases to use when running an application" + type = any + default = {} +} + variable "maximum_capacity" { description = "The maximum capacity to allocate when the application is created. This is cumulative across all workers at any given point in time, not just when an application is created. No new resources will be created once any one of the defined limits is hit" type = any diff --git a/modules/serverless/versions.tf b/modules/serverless/versions.tf index 7575fc1..7ea0158 100644 --- a/modules/serverless/versions.tf +++ b/modules/serverless/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.44" + version = ">= 5.59" } } } diff --git a/modules/studio/README.md b/modules/studio/README.md index 990bff2..97ec03e 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.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | ## Modules diff --git a/modules/studio/versions.tf b/modules/studio/versions.tf index 7575fc1..7ea0158 100644 --- a/modules/studio/versions.tf +++ b/modules/studio/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.44" + version = ">= 5.59" } } } diff --git a/modules/virtual-cluster/README.md b/modules/virtual-cluster/README.md index 3b3e0a4..e6bb359 100644 --- a/modules/virtual-cluster/README.md +++ b/modules/virtual-cluster/README.md @@ -82,14 +82,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.44 | +| [aws](#requirement\_aws) | >= 5.59 | | [kubernetes](#requirement\_kubernetes) | >= 2.10 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.44 | +| [aws](#provider\_aws) | >= 5.59 | | [kubernetes](#provider\_kubernetes) | >= 2.10 | ## Modules diff --git a/modules/virtual-cluster/versions.tf b/modules/virtual-cluster/versions.tf index 7e795df..a1c56fc 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 = ">= 5.44" + version = ">= 5.59" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/versions.tf b/versions.tf index 7575fc1..7ea0158 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.44" + version = ">= 5.59" } } }