feat(resource-group): support region variable for aws provider v6

Author: posquit0

modules/resource-group/README.md

@@ -9,14 +9,14 @@ This module creates following resources.
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.14 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.12 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.15.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.12.0 |
 
 ## Modules
 
@@ -35,7 +35,8 @@ No modules.
 | <a name="input_name"></a> [name](#input\_name) | (Required) A name to identify the resource group. A resource group name can have a maximum of 127 characters, including letters, numbers, hyphens, dots, and underscores. The name cannot start with `AWS` or `aws`. | `string` | n/a | yes |
 | <a name="input_description"></a> [description](#input\_description) | (Optional) The description of the resource group. | `string` | `"Managed by Terraform."` | no |
 | <a name="input_module_tags_enabled"></a> [module\_tags\_enabled](#input\_module\_tags\_enabled) | (Optional) Whether to create AWS Resource Tags for the module informations. | `bool` | `true` | no |
-| <a name="input_query"></a> [query](#input\_query) | (Optional) A configuration for the actual query used to match against resources. It supports `resource_types` and `resource_tags`. `query` block as defined below.<br>    (Optional) `resource_tags` - A map of key/value pairs that are compared to the tags attached to resources.<br>    (Optional) `resource_types` - A list of resource-type specification strings with `AWS::service-id::resource-type` format. Limit the results to only those resource types that match the filter. Specify `AWS::AllSupported` to include resources of any resources that are currently supported by Resource Group. | <pre>object({<br>    resource_tags  = optional(map(string), {})<br>    resource_types = optional(list(string), ["AWS::AllSupported"])<br>  })</pre> | `{}` | no |
+| <a name="input_query"></a> [query](#input\_query) | (Optional) A configuration for the actual query used to match against resources. It supports `resource_types` and `resource_tags`. `query` block as defined below.<br/>    (Optional) `resource_tags` - A map of key/value pairs that are compared to the tags attached to resources.<br/>    (Optional) `resource_types` - A list of resource-type specification strings with `AWS::service-id::resource-type` format. Limit the results to only those resource types that match the filter. Specify `AWS::AllSupported` to include resources of any resources that are currently supported by Resource Group. | <pre>object({<br/>    resource_tags  = optional(map(string), {})<br/>    resource_types = optional(list(string), ["AWS::AllSupported"])<br/>  })</pre> | `{}` | no |
+| <a name="input_region"></a> [region](#input\_region) | (Optional) The region in which to create the resource group. If not provided, the resource group will be created in the provider's configured region. | `string` | `null` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | (Optional) A map of tags to add to all resources. | `map(string)` | `{}` | no |
 
 ## Outputs
@@ -44,7 +45,9 @@ No modules.
 |------|-------------|
 | <a name="output_arn"></a> [arn](#output\_arn) | The ARN of the resource group. |
 | <a name="output_description"></a> [description](#output\_description) | The description of the resource group. |
+| <a name="output_id"></a> [id](#output\_id) | The ID of the resource group. |
 | <a name="output_name"></a> [name](#output\_name) | The name of the resource group. |
+| <a name="output_region"></a> [region](#output\_region) | The region in which the resource group is created. |
 | <a name="output_resource_tags"></a> [resource\_tags](#output\_resource\_tags) | The resource tags used by the resource group to query resources. |
 | <a name="output_resource_types"></a> [resource\_types](#output\_resource\_types) | The resource types used by the resource group to query resources. |
 <!-- END_TF_DOCS -->

modules/resource-group/main.tf

@@ -5,13 +5,13 @@ locals {
     module  = basename(path.module)
     name    = var.name
   }
-  module_tags = {
+  module_tags = var.module_tags_enabled ? {
     "module.terraform.io/package"   = local.metadata.package
     "module.terraform.io/version"   = local.metadata.version
     "module.terraform.io/name"      = local.metadata.module
     "module.terraform.io/full-name" = "${local.metadata.package}/${local.metadata.module}"
     "module.terraform.io/instance"  = local.metadata.name
-  }
+  } : {}
 }
 
 
@@ -35,6 +35,8 @@ locals {
 }
 
 resource "aws_resourcegroups_group" "this" {
+  region = var.region
+
   name        = var.name
   description = var.description
 
@@ -47,7 +49,7 @@ resource "aws_resourcegroups_group" "this" {
     {
       "Name" = var.name
     },
-    var.module_tags_enabled ? local.module_tags : {},
+    local.module_tags,
     var.tags,
   )
 }

modules/resource-group/outputs.tf

@@ -1,8 +1,18 @@
+output "region" {
+  description = "The region in which the resource group is created."
+  value       = aws_resourcegroups_group.this.region
+}
+
 output "arn" {
   description = "The ARN of the resource group."
   value       = aws_resourcegroups_group.this.arn
 }
 
+output "id" {
+  description = "The ID of the resource group."
+  value       = aws_resourcegroups_group.this.id
+}
+
 output "name" {
   description = "The name of the resource group."
   value       = aws_resourcegroups_group.this.name
@@ -22,3 +32,11 @@ output "resource_tags" {
   description = "The resource tags used by the resource group to query resources."
   value       = var.query.resource_tags
 }
+
+# output "debug" {
+#   value = {
+#     for k, v in aws_resourcegroups_group.this :
+#     k => v
+#     if !contains(["tags_all", "tags", "region", "arn", "id", "name", "description", "resource_query", "timeouts"], k)
+#   }
+# }

modules/resource-group/variables.tf

@@ -1,3 +1,10 @@
+variable "region" {
+  description = "(Optional) The region in which to create the resource group. If not provided, the resource group will be created in the provider's configured region."
+  type        = string
+  default     = null
+  nullable    = true
+}
+
 variable "name" {
   description = "(Required) A name to identify the resource group. A resource group name can have a maximum of 127 characters, including letters, numbers, hyphens, dots, and underscores. The name cannot start with `AWS` or `aws`."
   type        = string

modules/resource-group/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.5"
+  required_version = ">= 1.12"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.14"
+      version = ">= 6.0"
     }
   }
 }