Skip to content

Commit

Permalink
Fix composition of integration tests by using path.module (open-telem…
Browse files Browse the repository at this point in the history 
…etry#62)
  • Loading branch information
Anuraag Agrawal authored Apr 21, 2021
1 parent 97d7c7c commit 86dfb92
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions java/integration-tests/aws-sdk/agent/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
resource "aws_lambda_layer_version" "sdk_layer" {
layer_name = var.sdk_layer_name
filename = "../../../layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip"
filename = "${path.module}/../../../layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip"
compatible_runtimes = ["java8", "java8.al2", "java11"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip")
source_code_hash = filebase64sha256("${path.module}/../../../layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip")
}

resource "aws_lambda_layer_version" "collector_layer" {
layer_name = var.collector_layer_name
filename = "../../../../collector/build/collector-extension.zip"
filename = "${path.module}/../../../../collector/build/collector-extension.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../../collector/build/collector-extension.zip")
source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension.zip")
}

module "hello-lambda-function" {
Expand Down
4 changes: 2 additions & 2 deletions java/integration-tests/aws-sdk/wrapper/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
resource "aws_lambda_layer_version" "sdk_layer" {
layer_name = var.sdk_layer_name
filename = "../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
filename = "${path.module}/../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
compatible_runtimes = ["java8", "java8.al2", "java11"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
}

resource "aws_lambda_layer_version" "collector_layer" {
layer_name = var.collector_layer_name
filename = "../../../../collector/build/collector-extension.zip"
filename = "${path.module}/../../../../collector/build/collector-extension.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../../collector/build/collector-extension.zip")
Expand Down
4 changes: 2 additions & 2 deletions java/integration-tests/okhttp/wrapper/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
resource "aws_lambda_layer_version" "sdk_layer" {
layer_name = var.sdk_layer_name
filename = "../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
filename = "${path.module}/../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
compatible_runtimes = ["java8", "java8.al2", "java11"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
}

resource "aws_lambda_layer_version" "collector_layer" {
layer_name = var.collector_layer_name
filename = "../../../../collector/build/collector-extension.zip"
filename = "${path.module}/../../../../collector/build/collector-extension.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../../collector/build/collector-extension.zip")
Expand Down
8 changes: 4 additions & 4 deletions nodejs/integration-tests/aws-sdk/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
resource "aws_lambda_layer_version" "sdk_layer" {
layer_name = var.sdk_layer_name
filename = "../../packages/layer/build/layer.zip"
filename = "${path.module}/../../packages/layer/build/layer.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../packages/layer/build/layer.zip")
source_code_hash = filebase64sha256("${path.module}/../../packages/layer/build/layer.zip")
}

resource "aws_lambda_layer_version" "collector_layer" {
layer_name = var.collector_layer_name
filename = "../../../collector/build/collector-extension.zip"
filename = "${path.module}/../../../collector/build/collector-extension.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../collector/build/collector-extension.zip")
source_code_hash = filebase64sha256("${path.module}/../../../collector/build/collector-extension.zip")
}

module "hello-lambda-function" {
Expand Down
4 changes: 2 additions & 2 deletions python/integration-tests/function/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
resource "aws_lambda_layer_version" "sdk_layer" {
layer_name = var.sdk_layer_name
filename = "../../src/build/layer.zip"
filename = "${path.module}/../../src/build/layer.zip"
compatible_runtimes = ["python3.8"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../src/build/layer.zip")
}

resource "aws_lambda_layer_version" "collector_layer" {
layer_name = var.collector_layer_name
filename = "../../../collector/build/collector-extension.zip"
filename = "${path.module}/../../../collector/build/collector-extension.zip"
compatible_runtimes = ["nodejs10.x", "nodejs12.x", "nodejs14.x"]
license_info = "Apache-2.0"
source_code_hash = filebase64sha256("../../../collector/build/collector-extension.zip")
Expand Down

0 comments on commit 86dfb92

Please sign in to comment.