feat: Add provider meta user-agent, replacing static tag (#49)

bryantbiggs · web-flow · commit 70d83d3c172e · 2026-01-08T13:21:01.000-06:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.103.0
+    rev: v1.105.0
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
diff --git a/README.md b/README.md
@@ -332,13 +332,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/examples/private-cluster/README.md b/examples/private-cluster/README.md
@@ -29,13 +29,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/examples/private-cluster/versions.tf b/examples/private-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
 }
diff --git a/examples/public-cluster/README.md b/examples/public-cluster/README.md
@@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/examples/public-cluster/versions.tf b/examples/public-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
 }
diff --git a/examples/serverless-cluster/README.md b/examples/serverless-cluster/README.md
@@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/examples/serverless-cluster/versions.tf b/examples/serverless-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
 }
diff --git a/examples/studio/README.md b/examples/studio/README.md
@@ -22,13 +22,13 @@ terraform apply
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/examples/studio/versions.tf b/examples/studio/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
 }
diff --git a/examples/virtual-cluster/README.md b/examples/virtual-cluster/README.md
@@ -41,7 +41,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.38 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.7 |
@@ -50,7 +50,7 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 | <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
 
 ## Modules
diff --git a/examples/virtual-cluster/versions.tf b/examples/virtual-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/main.tf b/main.tf
@@ -42,7 +42,7 @@ locals {
   ec2_sp_name                     = try(data.aws_service_principal.this["ec2"].name, "")
   elasticmapreduce_sp_name        = try(data.aws_service_principal.this["elasticmapreduce"].name, "")
 
-  tags = merge(var.tags, { terraform-aws-modules = "emr" })
+  tags = var.tags
 }
 
 ################################################################################
diff --git a/modules/serverless/README.md b/modules/serverless/README.md
@@ -132,13 +132,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/modules/serverless/main.tf b/modules/serverless/main.tf
@@ -13,10 +13,6 @@ data "aws_emr_release_labels" "this" {
   }
 }
 
-locals {
-  tags = merge(var.tags, { terraform-aws-modules = "emr" })
-}
-
 ################################################################################
 # Application
 ################################################################################
@@ -183,7 +179,7 @@ resource "aws_emrserverless_application" "this" {
 
   type = var.type
 
-  tags = local.tags
+  tags = var.tags
 }
 
 ################################################################################
@@ -214,7 +210,7 @@ resource "aws_security_group" "this" {
   vpc_id      = data.aws_subnet.this[0].vpc_id
 
   tags = merge(
-    local.tags,
+    var.tags,
     var.security_group_tags,
     { "Name" = local.security_group_name },
   )
diff --git a/modules/serverless/versions.tf b/modules/serverless/versions.tf
@@ -4,7 +4,13 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
+
+  provider_meta "aws" {
+    user_agent = [
+      "github.com/terraform-aws-modules/terraform-aws-emr"
+    ]
+  }
 }
diff --git 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 |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 
 ## Modules
 
diff --git a/modules/studio/main.tf b/modules/studio/main.tf
@@ -26,8 +26,6 @@ locals {
   elasticmapreduce_sp_name = try(data.aws_service_principal.elasticmapreduce[0].name, "")
 
   auth_mode_is_sso = var.auth_mode == "SSO"
-
-  tags = merge(var.tags, { terraform-aws-modules = "emr" })
 }
 
 ################################################################################
@@ -53,7 +51,7 @@ resource "aws_emr_studio" "this" {
   vpc_id                         = var.vpc_id
   workspace_security_group_id    = local.create_security_groups ? aws_security_group.workspace[0].id : var.workspace_security_group_id
 
-  tags = local.tags
+  tags = var.tags
 }
 
 ################################################################################
@@ -79,7 +77,7 @@ resource "aws_iam_role" "service" {
   permissions_boundary  = var.service_role_permissions_boundary
   force_detach_policies = true
 
-  tags = merge(local.tags, var.service_role_tags)
+  tags = merge(var.tags, var.service_role_tags)
 }
 
 data "aws_iam_policy_document" "service_assume" {
@@ -369,7 +367,7 @@ resource "aws_iam_policy" "service" {
 
   policy = data.aws_iam_policy_document.service[0].json
 
-  tags = merge(local.tags, var.service_role_tags)
+  tags = merge(var.tags, var.service_role_tags)
 }
 
 resource "aws_iam_role_policy_attachment" "service" {
@@ -424,7 +422,7 @@ resource "aws_iam_role" "user" {
   permissions_boundary  = var.user_role_permissions_boundary
   force_detach_policies = true
 
-  tags = merge(local.tags, var.user_role_tags)
+  tags = merge(var.tags, var.user_role_tags)
 }
 
 data "aws_iam_policy_document" "user_assume" {
@@ -666,7 +664,7 @@ resource "aws_iam_policy" "user" {
 
   policy = data.aws_iam_policy_document.user[0].json
 
-  tags = merge(local.tags, var.user_role_tags)
+  tags = merge(var.tags, var.user_role_tags)
 }
 
 resource "aws_iam_role_policy_attachment" "user" {
@@ -714,7 +712,7 @@ resource "aws_security_group" "engine" {
   vpc_id      = var.vpc_id
 
   tags = merge(
-    local.tags,
+    var.tags,
     var.security_group_tags,
     { "Name" = local.engine_security_group_name },
   )
@@ -815,7 +813,7 @@ resource "aws_security_group" "workspace" {
   vpc_id      = var.vpc_id
 
   tags = merge(
-    local.tags,
+    var.tags,
     var.security_group_tags,
     { "Name" = local.workspace_security_group_name },
   )
diff --git a/modules/studio/versions.tf b/modules/studio/versions.tf
@@ -4,7 +4,13 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.22"
+      version = ">= 6.28"
     }
   }
+
+  provider_meta "aws" {
+    user_agent = [
+      "github.com/terraform-aws-modules/terraform-aws-emr"
+    ]
+  }
 }
diff --git a/modules/virtual-cluster/README.md b/modules/virtual-cluster/README.md
@@ -73,14 +73,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.22 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.28 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.38 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.22 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.28 |
 | <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.38 |
 
 ## Modules
diff --git a/modules/virtual-cluster/main.tf b/modules/virtual-cluster/main.tf
@@ -10,8 +10,6 @@ locals {
   role_name                 = var.create_kubernetes_role ? try(kubernetes_role_v1.this[0].metadata[0].name, "") : local.internal_role_name
   namespace                 = var.create_namespace ? try(kubernetes_namespace_v1.this[0].metadata[0].name, "") : var.namespace
   cloudwatch_log_group_name = coalesce(var.cloudwatch_log_group_name, "/emr-on-eks-logs/emr-workload/${local.namespace}")
-
-  tags = merge(var.tags, { terraform-aws-modules = "emr" })
 }
 
 ################################################################################
@@ -36,7 +34,7 @@ resource "aws_emrcontainers_virtual_cluster" "this" {
     }
   }
 
-  tags = local.tags
+  tags = var.tags
 }
 
 ################################################################################
@@ -228,7 +226,7 @@ resource "aws_iam_role" "this" {
   permissions_boundary  = var.iam_role_permissions_boundary
   force_detach_policies = true
 
-  tags = local.tags
+  tags = var.tags
 }
 
 resource "aws_iam_policy" "this" {
@@ -241,7 +239,7 @@ resource "aws_iam_policy" "this" {
 
   policy = data.aws_iam_policy_document.this[0].json
 
-  tags = local.tags
+  tags = var.tags
 }
 
 resource "aws_iam_role_policy_attachment" "this" {
@@ -274,5 +272,5 @@ resource "aws_cloudwatch_log_group" "this" {
   log_group_class   = var.cloudwatch_log_group_class
   skip_destroy      = var.cloudwatch_log_group_skip_destroy
 
-  tags = local.tags
+  tags = var.tags
 }
diff --git a/modules/virtual-cluster/versions.tf b/modules/virtual-cluster/versions.tf
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = ">= 6.22"`
	`7`	`+ version = ">= 6.28"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`