Skip to content

Commit 312c244

Browse files
authored
Pin terraform version to 7.19.0 (#1054)
1 parent 8e3e3bd commit 312c244

File tree

2 files changed

+114
-1
lines changed

2 files changed

+114
-1
lines changed

patch-upstream.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ CURRENT_DIR=$PWD
2222

2323
# Move to the upstream OTel Lambda Collector folder where we will build a
2424
# collector used in each Lambda layer
25-
cd opentelemetry-lambda/collector
25+
cd opentelemetry-lambda
26+
27+
# patch lambda terraform module to v7.19.0
28+
patch -p1 < ../terraformversion.patch
29+
30+
cd collector
2631

2732
# patch otel version on collector/go.mod
2833
PATCH_OTEL_VERSION="../../OTEL_Version.patch"

terraformversion.patch

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
diff --git a/dotnet/sample-apps/aws-sdk/deploy/wrapper/main.tf b/dotnet/sample-apps/aws-sdk/deploy/wrapper/main.tf
2+
index d154f09..d35a47d 100644
3+
--- a/dotnet/sample-apps/aws-sdk/deploy/wrapper/main.tf
4+
+++ b/dotnet/sample-apps/aws-sdk/deploy/wrapper/main.tf
5+
@@ -1,6 +1,6 @@
6+
module "hello-lambda-function" {
7+
source = "terraform-aws-modules/lambda/aws"
8+
- version = ">= 2.24.0"
9+
+ version = "7.19.0"
10+
11+
architectures = compact([var.architecture])
12+
function_name = var.name
13+
diff --git a/go/sample-apps/aws-sdk/deploy/wrapper/main.tf b/go/sample-apps/aws-sdk/deploy/wrapper/main.tf
14+
index f62c6ba..5d11bce 100644
15+
--- a/go/sample-apps/aws-sdk/deploy/wrapper/main.tf
16+
+++ b/go/sample-apps/aws-sdk/deploy/wrapper/main.tf
17+
@@ -1,6 +1,6 @@
18+
module "hello-lambda-function" {
19+
source = "terraform-aws-modules/lambda/aws"
20+
- version = ">= 2.24.0"
21+
+ version = "7.19.0"
22+
23+
architectures = compact([var.architecture])
24+
function_name = var.name
25+
diff --git a/java/sample-apps/aws-sdk/deploy/agent/main.tf b/java/sample-apps/aws-sdk/deploy/agent/main.tf
26+
index a9515cd..3c267a9 100644
27+
--- a/java/sample-apps/aws-sdk/deploy/agent/main.tf
28+
+++ b/java/sample-apps/aws-sdk/deploy/agent/main.tf
29+
@@ -1,6 +1,6 @@
30+
module "hello-lambda-function" {
31+
source = "terraform-aws-modules/lambda/aws"
32+
- version = ">= 2.24.0"
33+
+ version = "7.19.0"
34+
35+
architectures = compact([var.architecture])
36+
function_name = var.name
37+
diff --git a/java/sample-apps/aws-sdk/deploy/wrapper/main.tf b/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
38+
index 28b2b88..2e9e522 100644
39+
--- a/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
40+
+++ b/java/sample-apps/aws-sdk/deploy/wrapper/main.tf
41+
@@ -1,6 +1,6 @@
42+
module "hello-lambda-function" {
43+
source = "terraform-aws-modules/lambda/aws"
44+
- version = ">= 2.24.0"
45+
+ version = "7.19.0"
46+
47+
architectures = compact([var.architecture])
48+
function_name = var.name
49+
diff --git a/java/sample-apps/okhttp/deploy/wrapper/main.tf b/java/sample-apps/okhttp/deploy/wrapper/main.tf
50+
index f1d6918..cfcae0e 100644
51+
--- a/java/sample-apps/okhttp/deploy/wrapper/main.tf
52+
+++ b/java/sample-apps/okhttp/deploy/wrapper/main.tf
53+
@@ -1,6 +1,6 @@
54+
module "hello-lambda-function" {
55+
source = "terraform-aws-modules/lambda/aws"
56+
- version = ">= 2.24.0"
57+
+ version = "7.19.0"
58+
59+
architectures = compact([var.architecture])
60+
function_name = var.name
61+
diff --git a/java/sample-apps/sqs/deploy/agent/main.tf b/java/sample-apps/sqs/deploy/agent/main.tf
62+
index c898457..56b63b8 100644
63+
--- a/java/sample-apps/sqs/deploy/agent/main.tf
64+
+++ b/java/sample-apps/sqs/deploy/agent/main.tf
65+
@@ -1,6 +1,6 @@
66+
module "hello-lambda-function" {
67+
source = "terraform-aws-modules/lambda/aws"
68+
- version = ">= 2.24.0"
69+
+ version = "7.19.0"
70+
71+
architectures = compact([var.architecture])
72+
function_name = var.name
73+
diff --git a/java/sample-apps/sqs/deploy/wrapper/main.tf b/java/sample-apps/sqs/deploy/wrapper/main.tf
74+
index 354fa72..c8bae2c 100644
75+
--- a/java/sample-apps/sqs/deploy/wrapper/main.tf
76+
+++ b/java/sample-apps/sqs/deploy/wrapper/main.tf
77+
@@ -1,6 +1,6 @@
78+
module "hello-lambda-function" {
79+
source = "terraform-aws-modules/lambda/aws"
80+
- version = ">= 2.24.0"
81+
+ version = "7.19.0"
82+
83+
architectures = compact([var.architecture])
84+
function_name = var.name
85+
diff --git a/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf b/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf
86+
index 17ede9f..cb20e1b 100644
87+
--- a/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf
88+
+++ b/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf
89+
@@ -1,6 +1,6 @@
90+
module "hello-lambda-function" {
91+
source = "terraform-aws-modules/lambda/aws"
92+
- version = ">= 2.24.0"
93+
+ version = "7.19.0"
94+
95+
architectures = compact([var.architecture])
96+
function_name = var.name
97+
diff --git a/python/sample-apps/aws-sdk/deploy/wrapper/main.tf b/python/sample-apps/aws-sdk/deploy/wrapper/main.tf
98+
index 0470841..ad7e325 100644
99+
--- a/python/sample-apps/aws-sdk/deploy/wrapper/main.tf
100+
+++ b/python/sample-apps/aws-sdk/deploy/wrapper/main.tf
101+
@@ -1,6 +1,6 @@
102+
module "hello-lambda-function" {
103+
source = "terraform-aws-modules/lambda/aws"
104+
- version = ">= 2.24.0"
105+
+ version = "7.19.0"
106+
107+
architectures = compact([var.architecture])
108+
function_name = var.name

0 commit comments

Comments
 (0)