From 0c708e1a686bb1f45bcf396447593b22645c2fd2 Mon Sep 17 00:00:00 2001
From: inge4pres <francesco.gualazzi@elastic.co>
Date: Wed, 26 Nov 2025 17:56:20 +0100
Subject: [PATCH] infra(testing): upgrade AWS provider to 6.x

Signed-off-by: inge4pres <francesco.gualazzi@elastic.co>
---
 testing/benchmark/main.tf                                    | 4 ++--
 .../infra/terraform/modules/benchmark_executor/instance.tf   | 2 +-
 .../infra/terraform/modules/standalone_apm_server/main.tf    | 2 +-
 testing/smoke/supported-os/main.tf                           | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/testing/benchmark/main.tf b/testing/benchmark/main.tf
index 1a05217705a..79c8529f3f5 100644
--- a/testing/benchmark/main.tf
+++ b/testing/benchmark/main.tf
@@ -7,7 +7,7 @@ terraform {
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "~>4.17"
+      version = "~>6"
     }
     time = {
       source  = "hashicorp/time"
@@ -48,7 +48,7 @@ locals {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "3.14.0"
+  version = "6.5.1"
 
   name = "${var.user_name}-worker"
   cidr = var.vpc_cidr
diff --git a/testing/infra/terraform/modules/benchmark_executor/instance.tf b/testing/infra/terraform/modules/benchmark_executor/instance.tf
index 7b41f643ebf..e3ef5c4bea8 100644
--- a/testing/infra/terraform/modules/benchmark_executor/instance.tf
+++ b/testing/infra/terraform/modules/benchmark_executor/instance.tf
@@ -31,7 +31,7 @@ data "aws_security_group" "security_group" {
 
 module "ec2_instance" {
   source  = "terraform-aws-modules/ec2-instance/aws"
-  version = "3.5.0"
+  version = "6.1.5"
 
   ami                         = data.aws_ami.worker_ami.id
   instance_type               = var.instance_type
diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf
index 90b54273d64..3f5373dc68f 100644
--- a/testing/infra/terraform/modules/standalone_apm_server/main.tf
+++ b/testing/infra/terraform/modules/standalone_apm_server/main.tf
@@ -136,7 +136,7 @@ data "aws_subnets" "public_subnets" {
   }
   filter {
     name   = "availability-zone"
-    values = ["${data.aws_region.current.name}a"]
+    values = ["${data.aws_region.current.region}a"]
   }
 }
 
diff --git a/testing/smoke/supported-os/main.tf b/testing/smoke/supported-os/main.tf
index 7ab76434112..a29c4e268c5 100644
--- a/testing/smoke/supported-os/main.tf
+++ b/testing/smoke/supported-os/main.tf
@@ -5,6 +5,11 @@ terraform {
       source  = "elastic/ec"
       version = "0.5.1"
     }
+
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~>6"
+    }
   }
 }