diff --git a/README.md b/README.md index c123406..8432d99 100644 --- a/README.md +++ b/README.md @@ -80,13 +80,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.59 | +| [aws](#requirement\_aws) | >= 5.63 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.59 | +| [aws](#provider\_aws) | >= 5.63 | ## Modules @@ -131,6 +131,7 @@ No modules. | [data\_sources](#input\_data\_sources) | The data sources for the workspace. Valid values are `AMAZON_OPENSEARCH_SERVICE`, `ATHENA`, `CLOUDWATCH`, `PROMETHEUS`, `REDSHIFT`, `SITEWISE`, `TIMESTREAM`, `XRAY` | `list(string)` | `[]` | no | | [description](#input\_description) | The workspace description | `string` | `null` | no | | [enable\_alerts](#input\_enable\_alerts) | Determines whether IAM permissions for alerting are enabled for the workspace IAM role | `bool` | `false` | no | +| [grafana\_token](#input\_grafana\_token) | A token from Grafana Labs that ties your AWS account with a Grafana Labs account | `string` | `null` | no | | [grafana\_version](#input\_grafana\_version) | Specifies the version of Grafana to support in the new workspace. If not specified, the default version for the `aws_grafana_workspace` resource will be used. See `aws_grafana_workspace` documentation for available options. | `string` | `null` | no | | [iam\_role\_arn](#input\_iam\_role\_arn) | Existing IAM role ARN for the workspace. Required if `create_iam_role` is set to `false` | `string` | `null` | no | | [iam\_role\_description](#input\_iam\_role\_description) | The description of the workspace IAM role | `string` | `null` | no | diff --git a/examples/complete/README.md b/examples/complete/README.md index 022f2d9..0eea199 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -24,13 +24,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.59 | +| [aws](#requirement\_aws) | >= 5.63 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.59 | +| [aws](#provider\_aws) | >= 5.63 | ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 7ea0158..6edb421 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.59" + version = ">= 5.63" } } } diff --git a/main.tf b/main.tf index 2bf7062..71d491e 100644 --- a/main.tf +++ b/main.tf @@ -399,8 +399,9 @@ resource "aws_grafana_workspace_saml_configuration" "this" { resource "aws_grafana_license_association" "this" { count = var.create && var.associate_license ? 1 : 0 - license_type = var.license_type - workspace_id = local.workspace_id + grafana_token = var.grafana_token + license_type = var.license_type + workspace_id = local.workspace_id } ################################################################################ diff --git a/variables.tf b/variables.tf index f8edfb7..81b791f 100644 --- a/variables.tf +++ b/variables.tf @@ -310,6 +310,12 @@ variable "license_type" { default = "ENTERPRISE" } +variable "grafana_token" { + description = "A token from Grafana Labs that ties your AWS account with a Grafana Labs account" + type = string + default = null +} + ################################################################################ # Role Association ################################################################################ diff --git a/versions.tf b/versions.tf index 7ea0158..6edb421 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.59" + version = ">= 5.63" } } }