Skip to content

deleting dangling stacks #36

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

Open
hrai-nr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

deleting dangling stacks #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 4 additions & 49 deletions .github/workflows/run-e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: E2E Test Workflow

on:
pull_request_review:
types:
- submitted
schedule:
- cron: '0 0 1 * *'
pull_request:
branches:
- develop
- main

jobs:
build-templates:
if: github.event.review.state == 'approved'
runs-on: ubuntu-latest
permissions:
id-token: write
Expand Down Expand Up @@ -49,14 +47,6 @@ jobs:
name: ${{ matrix.TEMPLATE_FILE }}.yaml
path: .aws-sam/build/${{ matrix.TEMPLATE_FILE }}/${{ matrix.TEMPLATE_FILE }}.yaml

- name: Send failure notification to Slack
if: always()
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ job.status }}
notify_when: 'failure'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

run-e2e-tests-cloudwatch:
needs: [build-templates]
Expand Down Expand Up @@ -99,14 +89,6 @@ jobs:
cd e2e-tests
./lambda-cloudwatch-trigger.sh ${{ matrix.test-case }}

- name: Send failure notification to Slack
if: always()
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ job.status }}
notify_when: 'failure'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

run-e2e-tests-s3:
needs: [build-templates]
Expand Down Expand Up @@ -149,15 +131,6 @@ jobs:
cd e2e-tests
./lambda-s3-trigger.sh ${{ matrix.test-case }}

- name: Send failure notification to Slack
if: always()
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ job.status }}
notify_when: 'failure'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

run-e2e-tests-lambda-firehose-metrics:
needs: [build-templates]
runs-on: ubuntu-latest
Expand Down Expand Up @@ -199,15 +172,6 @@ jobs:
cd e2e-tests/
./lambda-with-metrics-test.sh ${{ matrix.test-case }}

- name: Send failure notification to Slack
if: always()
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ job.status }}
notify_when: 'failure'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

clean-up:
needs: [run-e2e-tests-cloudwatch, run-e2e-tests-s3, run-e2e-tests-lambda-firehose-metrics]
runs-on: ubuntu-latest
Expand All @@ -230,12 +194,3 @@ jobs:
S3_BUCKET: unified-lambda-e2e-test-templates
run:
aws s3 rm "s3://$S3_BUCKET" --recursive

- name: Send failure notification to Slack
if: always()
uses: ravsamhq/notify-slack-action@v1
with:
status: ${{ job.status }}
notify_when: 'failure'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
31 changes: 1 addition & 30 deletions e2e-tests/lambda-cloudwatch-trigger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ COMMON_ATTRIBUTES=$(<common_attribute.json)
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
echo "Testing for log group configuration JSON: $(<cloudwatch-parameter.json)"

log_message_with_filter_pattern=$(create_log_message "$LOG_MESSAGE_CLOUDWATCH" "$LOG_GROUP_FILTER_PATTERN")
log_message_without_filter_pattern=$(create_log_message "$LOG_MESSAGE_CLOUDWATCH" "")

deploy_cloudwatch_trigger_stack "$CLOUDWATCH_FILTER_PATTERN_CASE" "false" "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES"
validate_stack_deployment_status "$CLOUDWATCH_FILTER_PATTERN_CASE"
validate_lambda_subscription_created "$CLOUDWATCH_FILTER_PATTERN_CASE" "$LOG_GROUP_NAME" "$LOG_GROUP_FILTER_PATTERN"

# test that when logs with matching filter pattern are present, they are sent to New Relic
create_cloudwatch_log_event "$LOG_GROUP_NAME" "$LOG_STREAM_NAME" "$log_message_with_filter_pattern"
validate_logs_in_new_relic "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_CLOUDWATCH" "$LOG_STREAM_NAME" "$log_message_with_filter_pattern"

# test that when logs without matching filter pattern are present, they are not sent to New Relic
create_cloudwatch_log_event "$LOG_GROUP_NAME" "$LOG_STREAM_NAME" "$log_message_without_filter_pattern"
validate_logs_not_present "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_CLOUDWATCH" "$LOG_STREAM_NAME" "$log_message_without_filter_pattern"

delete_stack "$CLOUDWATCH_FILTER_PATTERN_CASE"
}

Expand All @@ -47,15 +32,6 @@ EOF
COMMON_ATTRIBUTES=$(<common_attribute.json)

LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
echo "Testing for log group configuration JSON: $(<cloudwatch-parameter.json)"

log_message=$(create_log_message "$LOG_MESSAGE_CLOUDWATCH" "$LOG_GROUP_FILTER_PATTERN")

deploy_cloudwatch_trigger_stack "$CLOUDWATCH_SECRET_MANAGER_CASE" "true" "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES"
validate_stack_deployment_status "$CLOUDWATCH_SECRET_MANAGER_CASE"
validate_lambda_subscription_created "$CLOUDWATCH_SECRET_MANAGER_CASE" "$LOG_GROUP_NAME_SECRET_MANAGER" "$LOG_GROUP_FILTER_PATTERN"
create_cloudwatch_log_event "$LOG_GROUP_NAME_SECRET_MANAGER" "$LOG_STREAM_NAME" "$log_message"
validate_logs_in_new_relic "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_CLOUDWATCH" "$LOG_STREAM_NAME" "$log_message"
delete_stack "$CLOUDWATCH_SECRET_MANAGER_CASE"
}

Expand All @@ -67,12 +43,7 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
echo "Testing for log group configuration JSON: $(<cloudwatch-parameter.json)"

deploy_cloudwatch_trigger_stack "$CLOUDWATCH_INVALID_LOG_GROUP_CASE" "false" "$LOG_GROUP_NAMES" "''"
validate_stack_deployment_status "$CLOUDWATCH_INVALID_LOG_GROUP_CASE"

# validate that lambda subscription is not created
validate_lambda_subscription_not_created "$CLOUDWATCH_INVALID_LOG_GROUP_CASE" "$LOG_GROUP_NAME_INVALID" "$LOG_GROUP_FILTER_PATTERN"


delete_stack "$CLOUDWATCH_INVALID_LOG_GROUP_CASE"
}

Expand Down
23 changes: 1 addition & 22 deletions e2e-tests/lambda-s3-trigger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,7 @@ COMMON_ATTRIBUTES=$(<common_attribute.json)

log_message=$(create_log_message "$LOG_MESSAGE_S3" "")

deploy_s3_trigger_stack "$S3_PREFIX_CASE" "false" "$S3_BUCKET_NAMES" "$COMMON_ATTRIBUTES"
validate_stack_deployment_status "$S3_PREFIX_CASE"
validate_lambda_s3_trigger_created "$S3_PREFIX_CASE" "$S3_BUCKET_NAME" "$S3_BUCKET_PREFIX"

upload_file_to_s3_bucket "$S3_BUCKET_NAME" "$S3_BUCKET_OBJECT_NAME" "$S3_BUCKET_PREFIX" "$log_message"
validate_logs_in_new_relic "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_S3" "$S3_BUCKET_PREFIX" "$log_message"

upload_file_to_s3_bucket "$S3_BUCKET_NAME" "$S3_BUCKET_OBJECT_NAME_FOR_INVALID_CASE" "$S3_BUCKET_PREFIX_INVALID" "$log_message"
validate_logs_not_present "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_S3" "$S3_BUCKET_PREFIX_INVALID" "$log_message"


delete_stack "$S3_PREFIX_CASE"
}

Expand All @@ -48,11 +39,6 @@ COMMON_ATTRIBUTES=$(<common_attribute.json)

log_message=$(create_log_message "$LOG_MESSAGE_S3" "")

deploy_s3_trigger_stack "$S3_SECRET_MANAGER_CASE" "true" "$S3_BUCKET_NAMES" "$COMMON_ATTRIBUTES"
validate_stack_deployment_status "$S3_SECRET_MANAGER_CASE"
validate_lambda_s3_trigger_created "$S3_SECRET_MANAGER_CASE" "$S3_BUCKET_NAME_SECRET_MANAGER" "$S3_BUCKET_PREFIX"
upload_file_to_s3_bucket "$S3_BUCKET_NAME_SECRET_MANAGER" "$S3_BUCKET_OBJECT_NAME" "$S3_BUCKET_PREFIX" "$log_message"
validate_logs_in_new_relic "$NEW_RELIC_USER_KEY" "$NEW_RELIC_ACCOUNT_ID" "$ATTRIBUTE_KEY_S3" "$S3_BUCKET_PREFIX" "$log_message"
delete_stack "$S3_SECRET_MANAGER_CASE"
}

Expand All @@ -62,13 +48,6 @@ cat <<EOF > s3-parameter.json
EOF

S3_BUCKET_NAMES=$(<s3-parameter.json)
echo "Testing for s3 bucket configuration JSON: $(<s3-parameter.json)"

deploy_s3_trigger_stack "$S3_INVALID_BUCKET_CASE" "false" "$S3_BUCKET_NAMES" "''"
validate_stack_deployment_status "$S3_INVALID_BUCKET_CASE"

# validate that lambda trigger is not created
validate_lambda_s3_trigger_not_created "$S3_INVALID_BUCKET_CASE" "$S3_BUCKET_NAME_INVALID" "$S3_BUCKET_PREFIX"
delete_stack "$S3_INVALID_BUCKET_CASE"
}

Expand Down
19 changes: 5 additions & 14 deletions e2e-tests/lambda-with-metrics-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
S3_BUCKET_NAMES=$(<s3-parameter.json)

deploy_lambda_firehose_stack "$S3_BUCKET_NAMES" "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false" "false"
validate_stack_deployment_status "$LAMBDA_FIREHOSE_CASE"

delete_stack "$LAMBDA_FIREHOSE_CASE"
}

Expand All @@ -44,8 +43,7 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
S3_BUCKET_NAMES=$(<s3-parameter.json)

deploy_lambda_metric_polling_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false" "$S3_BUCKET_NAMES"
validate_stack_deployment_status "$LAMBDA_METRIC_POLLING_CASE"

delete_stack "$LAMBDA_METRIC_POLLING_CASE"
}

Expand All @@ -66,8 +64,7 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
S3_BUCKET_NAMES=$(<s3-parameter.json)

deploy_lambda_metric_streaming_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false" "$S3_BUCKET_NAMES"
validate_stack_deployment_status "$LAMBDA_METRIC_STREAMING_CASE"

delete_stack "$LAMBDA_METRIC_STREAMING_CASE"
}

Expand All @@ -83,8 +80,7 @@ EOF
COMMON_ATTRIBUTES=$(<common_attribute.json)
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)

deploy_firehose_metric_polling_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false"
validate_stack_deployment_status "$FIREHOSE_METRIC_POLLING_CASE"

delete_stack "$FIREHOSE_METRIC_POLLING_CASE"
}

Expand All @@ -100,8 +96,7 @@ EOF
COMMON_ATTRIBUTES=$(<common_attribute.json)
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)

deploy_firehose_metric_streaming_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false"
validate_stack_deployment_status "$FIREHOSE_METRIC_STREAMING_CASE"

delete_stack "$FIREHOSE_METRIC_STREAMING_CASE"
}

Expand All @@ -123,8 +118,6 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
S3_BUCKET_NAMES=$(<s3-parameter.json)

deploy_lambda_firehose_metric_polling_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false" "$S3_BUCKET_NAMES"
validate_stack_deployment_status "$LAMBDA_FIREHOSE_METRIC_POLLING_CASE"
delete_stack "$LAMBDA_FIREHOSE_METRIC_POLLING_CASE"
}

Expand All @@ -145,8 +138,6 @@ EOF
LOG_GROUP_NAMES=$(<cloudwatch-parameter.json)
S3_BUCKET_NAMES=$(<s3-parameter.json)

deploy_lambda_firehose_metric_streaming_stack "$LOG_GROUP_NAMES" "$COMMON_ATTRIBUTES" "false" "$S3_BUCKET_NAMES"
validate_stack_deployment_status "$LAMBDA_FIREHOSE_METRIC_STREAMING_CASE"
delete_stack "$LAMBDA_FIREHOSE_METRIC_STREAMING_CASE"
}

Expand Down
Loading