From 622db05db4718a7c8e8935f7f590ae814a652511 Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Thu, 24 Oct 2024 11:48:39 -0400 Subject: [PATCH] filter fix (#1626) --- .github/workflows/terragrunt_plan_staging.yml | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/terragrunt_plan_staging.yml b/.github/workflows/terragrunt_plan_staging.yml index fe60561af..309cacfe8 100644 --- a/.github/workflows/terragrunt_plan_staging.yml +++ b/.github/workflows/terragrunt_plan_staging.yml @@ -30,6 +30,7 @@ jobs: outputs: common: ${{ steps.filter.outputs.common }} ecr: ${{ steps.filter.outputs.ecr }} + ecr-us-east: ${{ steps.filter.outputs.ecr-us-east }} ses_receiving_emails: ${{ steps.filter.outputs.ses_receiving_emails }} ses_to_sqs_email_callbacks: ${{ steps.filter.outputs.ses_to_sqs_email_callbacks }} sns_to_sqs_sms_callbacks: ${{ steps.filter.outputs.sns_to_sqs_sms_callbacks }} @@ -67,6 +68,9 @@ jobs: ecr: - 'aws/ecr/**' - 'env/${{env.ENVIRONMENT}}/ecr/**' + ecr-us-east: + - 'aws/ecr-us-east/**' + - 'env/${{env.ENVIRONMENT}}/ecr-us-east/**' eks: - 'aws/eks/**' - 'env/${{env.ENVIRONMENT}}/eks/**' @@ -159,7 +163,7 @@ jobs: terragrunt-plan-ecr: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.ecr == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') needs: terragrunt-filter @@ -194,7 +198,7 @@ jobs: terragrunt-plan-ecr-us-east: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.ecr-us-east == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') needs: terragrunt-filter @@ -230,7 +234,7 @@ jobs: terragrunt-plan-ses_receiving_emails: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.ses_receiving_emails == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -264,7 +268,7 @@ jobs: terragrunt-plan-dns: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.dns == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -298,7 +302,7 @@ jobs: terragrunt-plan-ses_validation_dns_entries: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.ses_validation_dns_entries == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -332,7 +336,7 @@ jobs: terragrunt-plan-cloudfront: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.cloudfront == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -366,7 +370,7 @@ jobs: terragrunt-plan-eks: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.eks == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -400,7 +404,7 @@ jobs: terragrunt-plan-elasticache: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.elasticache == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -434,7 +438,7 @@ jobs: terragrunt-plan-rds: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.rds == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -468,7 +472,7 @@ jobs: terragrunt-plan-lambda-api: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.api == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -502,7 +506,7 @@ jobs: terragrunt-plan-lambda-admin-pr: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.lambda-admin-pr == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -536,7 +540,7 @@ jobs: terragrunt-plan-performance-test: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.performance-test == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -571,7 +575,7 @@ jobs: terragrunt-plan-heartbeat: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.heartbeat == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -605,7 +609,7 @@ jobs: terragrunt-plan-database-tools: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.database-tools == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -639,7 +643,7 @@ jobs: terragrunt-plan-quicksight: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.quicksight == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -673,7 +677,7 @@ jobs: terragrunt-plan-lambda-google-cidr: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.lambda-google-cidr == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -707,7 +711,7 @@ jobs: terragrunt-plan-ses_to_sqs_email_callbacks: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.ses_to_sqs_email_callbacks == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -741,7 +745,7 @@ jobs: terragrunt-plan-sns_to_sqs_sms_callbacks: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.sns_to_sqs_sms_callbacks == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -775,7 +779,7 @@ jobs: terragrunt-plan-pinpoint_to_sqs_sms_callbacks: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.pinpoint_to_sqs_sms_callbacks == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -809,7 +813,7 @@ jobs: terragrunt-plan-system_status: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.system_status == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') runs-on: ubuntu-latest @@ -843,7 +847,7 @@ jobs: terragrunt-plan-system_status_static_site: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.system_status_static_site == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') needs: [terragrunt-filter,terragrunt-plan-common,terragrunt-plan-system_status] @@ -877,7 +881,7 @@ jobs: terragrunt-plan-newrelic: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.newrelic == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') needs: [terragrunt-filter,terragrunt-plan-common] @@ -911,7 +915,7 @@ jobs: terragrunt-plan-manifest_secrets: if: | always() && - needs.terragrunt-filter.outputs.common == 'true' && + needs.terragrunt-filter.outputs.manifest_secrets == 'true' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') needs: [terragrunt-filter,terragrunt-plan-rds, terragrunt-plan-elasticache, terragrunt-plan-eks, terragrunt-plan-lambda-api, terragrunt-plan-lambda-admin-pr, terragrunt-plan-performance-test, terragrunt-plan-heartbeat, terragrunt-plan-database-tools, terragrunt-plan-quicksight, terragrunt-plan-lambda-google-cidr, terragrunt-plan-ses_to_sqs_email_callbacks, terragrunt-plan-sns_to_sqs_sms_callbacks, terragrunt-plan-pinpoint_to_sqs_sms_callbacks, terragrunt-plan-system_status, terragrunt-plan-system_status_static_site, terragrunt-plan-newrelic]