Merge pull request #1790 from vasireddy99/fixtf

vasireddy99 · web-flow · commit 0062c74776db · 2025-07-23T10:39:13.000-07:00
Setting provider versions and customize mock endpoint
diff --git a/terraform/ec2/versions.tf b/terraform/ec2/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "1.5.7"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "4.67.0"
     }
   }
 }
diff --git a/terraform/ecs/versions.tf b/terraform/ecs/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "1.5.7"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "4.67.0"
     }
   }
 }
diff --git a/terraform/eks/otlp/otlp.tf b/terraform/eks/otlp/otlp.tf
@@ -16,7 +16,7 @@
 terraform {
   required_providers {
     kubernetes = {
-      version = "~> 2.0"
+      version = "2.36.0"
     }
   }
 }
diff --git a/terraform/eks/versions.tf b/terraform/eks/versions.tf
@@ -1,17 +1,21 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "1.5.7"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "4.67.0"
     }
     kubernetes = {
-      version = "~> 2.0"
+      version = "2.36.0"
+    }
+    helm ={
+      source = "hashicorp/helm"
+      version = "2.17.0"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
-      version = ">= 1.7.0"
+      version = "1.19.0"
     }
   }
 }
diff --git a/terraform/mock/variables.tf b/terraform/mock/variables.tf
@@ -18,7 +18,7 @@ variable "collector_repo_path" {
 }
 
 variable "mock_endpoint" {
-  default = "mocked-server:55671/put-data"
+  default = "mocked-server/put-data"
 }
 
 variable "otconfig_args" {
diff --git a/terraform/testcases/otlp_mock/parameters.tfvars b/terraform/testcases/otlp_mock/parameters.tfvars
@@ -4,3 +4,5 @@ soaking_data_mode = "trace"
 sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:f3c87ee4c0e3fc7cd8bf6d0eb7d8e570f75ae6dc"
+
+mock_endpoint = "mocked-server:55671/put-data"

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "~> 1.0"`
	`2`	`+ required_version = "1.5.7"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 4.0"`
	`7`	`+ version = "4.67.0"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`terraform {`
`17`	`17`	`required_providers {`
`18`	`18`	`kubernetes = {`
`19`		`- version = "~> 2.0"`
	`19`	`+ version = "2.36.0"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,21 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "~> 1.0"`
	`2`	`+ required_version = "1.5.7"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 4.0"`
	`7`	`+ version = "4.67.0"`
`8`	`8`	`}`
`9`	`9`	`kubernetes = {`
`10`		`- version = "~> 2.0"`
	`10`	`+ version = "2.36.0"`
	`11`	`+ }`
	`12`	`+ helm ={`
	`13`	`+ source = "hashicorp/helm"`
	`14`	`+ version = "2.17.0"`
`11`	`15`	`}`
`12`	`16`	`kubectl = {`
`13`	`17`	`source = "gavinbunney/kubectl"`
`14`		`- version = ">= 1.7.0"`
	`18`	`+ version = "1.19.0"`
`15`	`19`	`}`
`16`	`20`	`}`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ variable "collector_repo_path" {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`variable "mock_endpoint" {`
`21`		`- default = "mocked-server:55671/put-data"`
	`21`	`+ default = "mocked-server/put-data"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`variable "otconfig_args" {`