Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CTX-601] chore: fix various AWS acceptance tests #1662

Merged
merged 4 commits into from
Jun 1, 2023
Merged

[CTX-601] chore: fix various AWS acceptance tests #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aac9461
chore: fix various AWS acceptance tests
craigfurman May 31, 2023
969cf36
chore: re-enable nightly acceptance tests
craigfurman May 31, 2023
01b24be
chore: manual acceptance test job
craigfurman May 31, 2023
7e92a79
chore: remove references to non-Snyk domains in acc test fixtures
craigfurman Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 42 additions & 22 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ orbs:
codecov: codecov/[email protected]
snyk: snyk/[email protected]
gh: circleci/[email protected]
parameters:
ACC_TESTS:
type: string
description: manually run acceptance tests
default: '0'
jobs:
test_acc:
parameters:
Expand Down Expand Up @@ -216,28 +221,43 @@ jobs:
project: ${CIRCLE_PROJECT_REPONAME}
organization: cloud-cloud
workflows:
# Temporarily disabled
# nightly:
# jobs:
# - test_acc:
# name: "Acceptance tests: << matrix.pattern >>"
# matrix:
# parameters:
# pattern:
# - TestAcc_Aws
# - TestAcc_Github_
# - TestAcc_Google
# - TestAcc_Azure_
# - TestAcc_StateReader_
# context:
# - driftctl-acc
# triggers:
# - schedule:
# cron: "0 3 * * *"
# filters:
# branches:
# only:
# - main
nightly:
jobs:
- test_acc:
name: "Acceptance tests: << matrix.pattern >>"
matrix:
parameters:
pattern:
- TestAcc_Aws
- TestAcc_Github_
- TestAcc_Google
- TestAcc_Azure_
- TestAcc_StateReader_
context:
- driftctl-acc
triggers:
- schedule:
cron: "0 3 * * *"
filters:
branches:
only:
- main
manual-acc-tests:
when:
equal: ['1', << pipeline.parameters.ACC_TESTS >>]
jobs:
- test_acc:
name: "Acceptance tests: << matrix.pattern >>"
matrix:
parameters:
pattern:
- TestAcc_Aws
- TestAcc_Github_
- TestAcc_Google
- TestAcc_Azure_
- TestAcc_StateReader_
context:
- driftctl-acc
pullrequest:
jobs:
- lint:
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/aws/aws_api_gateway_authorizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestAcc_Aws_ApiGatewayAuthorizer(t *testing.T) {
acceptance.Run(t, acceptance.AccTestCase{
TerraformVersion: "0.15.5",
TerraformVersion: "1.4.6",
Paths: []string{"./testdata/acc/aws_api_gateway_authorizer"},
Args: []string{"scan"},
Checks: []acceptance.AccCheck{
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/aws/aws_lambda_event_source_mapping_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

func TestAcc_Aws_LambdaEventSourceMapping(t *testing.T) {
acceptance.Run(t, acceptance.AccTestCase{
TerraformVersion: "0.15.5",
TerraformVersion: "1.4.6",
Paths: []string{"./testdata/acc/aws_lambda_event_source_mapping"},
Args: []string{"scan", "--deep"},
Checks: []acceptance.AccCheck{
Expand Down
4 changes: 2 additions & 2 deletions pkg/resource/aws/aws_s3_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestAcc_Aws_S3Bucket_BucketInUsEast1(t *testing.T) {
acceptance.Run(t, acceptance.AccTestCase{
TerraformVersion: "0.15.5",
TerraformVersion: "1.4.6",
Paths: []string{"./testdata/acc/aws_s3_bucket"},
Args: []string{"scan", "--deep"},
Checks: []acceptance.AccCheck{
Expand All @@ -21,7 +21,7 @@ func TestAcc_Aws_S3Bucket_BucketInUsEast1(t *testing.T) {
if err != nil {
t.Fatal(err)
}
result.AssertManagedCount(5)
result.AssertManagedCount(1)
result.AssertDriftCountTotal(0)
},
},
Expand Down
31 changes: 18 additions & 13 deletions pkg/resource/aws/testdata/acc/aws_api_gateway_authorizer/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions pkg/resource/aws/testdata/acc/aws_api_gateway_authorizer/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@ provider "aws" {

terraform {
required_providers {
aws = "3.19.0"
aws = "~> 5.0.0"
}
}

resource "aws_api_gateway_rest_api" "foo" {
name = "foo"
description = "This is foo API"
name = "foo"
description = "This is foo API"
}

resource "aws_api_gateway_authorizer" "foo" {
name = "foo"
rest_api_id = aws_api_gateway_rest_api.foo.id
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
authorizer_credentials = aws_iam_role.invocation_role.arn
name = "foo"
rest_api_id = aws_api_gateway_rest_api.foo.id
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
authorizer_credentials = aws_iam_role.invocation_role.arn
}

resource "aws_api_gateway_authorizer" "bar" {
name = "bar"
rest_api_id = aws_api_gateway_rest_api.foo.id
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
authorizer_credentials = aws_iam_role.invocation_role.arn
name = "bar"
rest_api_id = aws_api_gateway_rest_api.foo.id
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
authorizer_credentials = aws_iam_role.invocation_role.arn
}

resource "aws_iam_role" "invocation_role" {
name = "api_gateway_auth_invocation"
path = "/"
name = "api_gateway_auth_invocation"
path = "/"

assume_role_policy = <<EOF
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -49,10 +49,10 @@ EOF
}

resource "aws_iam_role_policy" "invocation_policy" {
name = "default"
role = aws_iam_role.invocation_role.id
name = "default"
role = aws_iam_role.invocation_role.id

policy = <<EOF
policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -67,9 +67,9 @@ EOF
}

resource "aws_iam_role" "lambda" {
name = "demo-lambda"
name = "demo-lambda"

assume_role_policy = <<EOF
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -87,9 +87,9 @@ EOF
}

resource "aws_lambda_function" "authorizer" {
filename = "lambda.zip"
function_name = "api_gateway_authorizer"
role = aws_iam_role.lambda.arn
handler = "lambda.handler"
runtime = "nodejs12.x"
filename = "lambda.zip"
function_name = "api_gateway_authorizer"
role = aws_iam_role.lambda.arn
handler = "lambda.handler"
runtime = "nodejs18.x"
}
31 changes: 18 additions & 13 deletions pkg/resource/aws/testdata/acc/aws_apigatewayv2_authorizer/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions pkg/resource/aws/testdata/acc/aws_apigatewayv2_authorizer/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ provider "aws" {

terraform {
required_providers {
aws = "3.19.0"
aws = "~> 5.0.0"
}
}

Expand All @@ -15,18 +15,18 @@ resource "aws_apigatewayv2_api" "example" {
}

resource "aws_apigatewayv2_authorizer" "foo" {
api_id = aws_apigatewayv2_api.example.id
authorizer_type = "REQUEST"
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
identity_sources = ["route.request.header.Auth"]
name = "foo"
api_id = aws_apigatewayv2_api.example.id
authorizer_type = "REQUEST"
authorizer_uri = aws_lambda_function.authorizer.invoke_arn
identity_sources = ["route.request.header.Auth"]
name = "foo"
}

resource "aws_iam_role" "invocation_role" {
name = "apigatewayv2_auth_invocation"
path = "/"
name = "apigatewayv2_auth_invocation"
path = "/"

assume_role_policy = <<EOF
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -44,10 +44,10 @@ EOF
}

resource "aws_iam_role_policy" "invocation_policy" {
name = "apigatewayv2_authorizer_policy"
role = aws_iam_role.invocation_role.id
name = "apigatewayv2_authorizer_policy"
role = aws_iam_role.invocation_role.id

policy = <<EOF
policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -62,9 +62,9 @@ EOF
}

resource "aws_iam_role" "lambda" {
name = "apigatewayv2_authorizer_lambda_role"
name = "apigatewayv2_authorizer_lambda_role"

assume_role_policy = <<EOF
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
Expand All @@ -82,9 +82,9 @@ EOF
}

resource "aws_lambda_function" "authorizer" {
filename = "lambda.zip"
function_name = "apigatewayv2_authorizer"
role = aws_iam_role.lambda.arn
handler = "lambda.handler"
runtime = "nodejs12.x"
filename = "lambda.zip"
function_name = "apigatewayv2_authorizer"
role = aws_iam_role.lambda.arn
handler = "lambda.handler"
runtime = "nodejs18.x"
}
20 changes: 10 additions & 10 deletions pkg/resource/aws/testdata/acc/aws_lambda_event_source_mapping/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ provider "aws" {
}

locals {
timestamp = formatdate("YYYYMMDDhhmmss", timestamp())
timestamp = formatdate("YYYYMMDDhhmmss", timestamp())
}

resource "aws_sqs_queue" "queue1" {
Expand All @@ -23,10 +23,10 @@ resource "aws_sqs_queue" "queue2" {
}

resource "aws_dynamodb_table" "dynamo-event-source-mapping-test" {
name = "event-source-mapping-test-${local.timestamp}"
hash_key = "TestTableHashKey"
billing_mode = "PAY_PER_REQUEST"
stream_enabled = true
name = "event-source-mapping-test-${local.timestamp}"
hash_key = "TestTableHashKey"
billing_mode = "PAY_PER_REQUEST"
stream_enabled = true
stream_view_type = "NEW_AND_OLD_IMAGES"

attribute {
Expand Down Expand Up @@ -88,11 +88,11 @@ resource "aws_iam_policy_attachment" "policy_attachment" {
}

resource "aws_lambda_function" "test_lambda" {
filename = "function.zip"
function_name = "event-source-mapping-test-lambda-${local.timestamp}"
role = aws_iam_role.iam_for_lambda.arn
handler = "exports.test"
runtime = "nodejs12.x"
filename = "function.zip"
function_name = "event-source-mapping-test-lambda-${local.timestamp}"
role = aws_iam_role.iam_for_lambda.arn
handler = "exports.test"
runtime = "nodejs14.x"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the reason this one is node 14 and line 89 at pkg/resource/aws/testdata/acc/aws_apigatewayv2_authorizer/terraform.tf is node 18? can't spot the difference and the original one are both the same version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See description 🙂


environment {
variables = {
Expand Down
Loading