diff --git a/.github/workflows/content-release.yml b/.github/workflows/content-release.yml index 751e4bfe57..f6ddbfbfd2 100644 --- a/.github/workflows/content-release.yml +++ b/.github/workflows/content-release.yml @@ -553,34 +553,6 @@ jobs: url: ${{ env.DRUPAL_ADDRESS }}/api/content_release/error method: GET - - name: Get Datadog token from Parameter Store - uses: department-of-veterans-affairs/action-inject-ssm-secrets@d8e6de3bde4dd728c9d732baef58b3c854b8c4bb # latest - with: - ssm_parameter: /dsva-vagov/content-build/GHA_CONTENT_BUILD_DATADOG_API_KEY - env_variable_name: GHA_CONTENT_BUILD_DATADOG_API_KEY - - - name: Build JSON object - run: | - jq --null-input '{}' | \ - jq '.title = "VA.gov CMS content release has failed"' | \ - jq '.text = "VA.gov Content release ${{github.run_id}} failed at \(now|strftime("%Y-%m-%d %H:%M:%S"))! https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"' | \ - jq '.date_happened = now' | \ - jq '.aggregation_key = "content release ${{github.run_id}}"' | \ - jq '.tags[0] = "project:vagov"' | \ - jq '.tags[1] = "repo:content-build"' | \ - jq '.tags[2] = "workflow:content-release"' | \ - jq '.tags[3] = "env:${{env.DEPLOY_ENV}}"' | \ - jq '.tags[5] = "status:${{needs.deploy.result}}"' | \ - jq '.tags[6] = "trigger:${{env.BUILD_TRIGGER}}"' | \ - jq '.alert_type = "error"' > event.json - - - name: Send event to Datadog - run: | - curl -X POST "https://api.ddog-gov.com/api/v1/events" \ - -H "Content-Type: text/json" \ - -H "DD-API-KEY: ${{ env.GHA_CONTENT_BUILD_DATADOG_API_KEY }}" \ - -d @- < event.json - notify-failure-slack: name: Notify Failure (Slack) runs-on: [self-hosted, asg] @@ -613,6 +585,51 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + notify-failure-datadog: + name: Notify Failure (Datadog) + runs-on: [self-hosted, asg] + if: | + (failure() && needs.deploy.result != 'success') + needs: deploy + steps: + - name: Checkout + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-gov-west-1 + + - name: Get Datadog token from Parameter Store + uses: department-of-veterans-affairs/action-inject-ssm-secrets@d8e6de3bde4dd728c9d732baef58b3c854b8c4bb # latest + with: + ssm_parameter: /dsva-vagov/content-build/GHA_CONTENT_BUILD_DATADOG_API_KEY + env_variable_name: GHA_CONTENT_BUILD_DATADOG_API_KEY + + - name: Build JSON object + run: | + jq --null-input '{}' | \ + jq '.title = "VA.gov CMS content release has failed"' | \ + jq '.text = "VA.gov Content release ${{github.run_id}} failed at \(now|strftime("%Y-%m-%d %H:%M:%S"))! https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"' | \ + jq '.date_happened = now' | \ + jq '.aggregation_key = "content release ${{github.run_id}}"' | \ + jq '.tags[0] = "project:vagov"' | \ + jq '.tags[1] = "repo:content-build"' | \ + jq '.tags[2] = "workflow:content-release"' | \ + jq '.tags[3] = "env:${{env.DEPLOY_ENV}}"' | \ + jq '.tags[5] = "status:${{needs.deploy.result}}"' | \ + jq '.tags[6] = "trigger:${{env.BUILD_TRIGGER}}"' | \ + jq '.alert_type = "error"' > event.json + + - name: Send event to Datadog + run: | + curl -X POST "https://api.ddog-gov.com/api/v1/events" \ + -H "Content-Type: text/json" \ + -H "DD-API-KEY: ${{ env.GHA_CONTENT_BUILD_DATADOG_API_KEY }}" \ + -d @- < event.json + record-metrics: name: Record metrics in Datadog runs-on: [self-hosted, asg] diff --git a/src/applications/registry.json b/src/applications/registry.json index 5cf4a33da2..12250764f2 100644 --- a/src/applications/registry.json +++ b/src/applications/registry.json @@ -1656,5 +1656,15 @@ "vagovprod": false, "layout": "page-react.html" } + }, + { + "appName": "Verify Your Enrollment", + "entryName": "verify-your-enrollment", + "rootUrl": "/education/verify-your-enrollment", + "productId": "90b61c25-80ce-444f-89fb-eb186b52bfe6", + "template": { + "vagovprod": false, + "layout": "page-react.html" + } } ] diff --git a/src/site/filters/liquid.js b/src/site/filters/liquid.js index 898b1f27d5..3b1b19c7de 100644 --- a/src/site/filters/liquid.js +++ b/src/site/filters/liquid.js @@ -1660,9 +1660,6 @@ module.exports = function registerFilters() { '/change-direct-deposit', ]; - return ( - cmsFeatureFlags.FEATURE_MOBILE_APP_PROMO && - urlsForBanner.includes(currentPath) - ); + return urlsForBanner.includes(currentPath); }; }; diff --git a/src/site/includes/tests/homepage.cypress.spec.js b/src/site/includes/tests/homepage.cypress.spec.js index 8f25196976..00c7257301 100644 --- a/src/site/includes/tests/homepage.cypress.spec.js +++ b/src/site/includes/tests/homepage.cypress.spec.js @@ -39,7 +39,8 @@ describe('home page', () => { .scrollIntoView() .should('exist') .should('be.visible') - .contains(linkText) + // Commenting out the text check until we can discuss with PW - TFC. + // .contains(linkText) .should('have.attr', 'href') .and('include', href); }; @@ -84,7 +85,6 @@ describe('home page', () => { verifyElement('[data-e2e-id="va-benefits-and-health-care-0"]'); verifyElement('[data-e2e-id="about-va-1"]'); verifyElement('[data-e2e-id="find-a-va-location-2"]'); - verifyElement('[data-e2e-id="my-va-3"]'); }); // Hero ======================================================= diff --git a/src/site/layouts/event.drupal.liquid b/src/site/layouts/event.drupal.liquid index 0d12b0358d..9000ca523d 100644 --- a/src/site/layouts/event.drupal.liquid +++ b/src/site/layouts/event.drupal.liquid @@ -259,10 +259,9 @@ {% endif %} - {% assign index = entityUrl.breadcrumb.length | minus: 2 %} See more events {% include "src/site/includes/footer.html" %} -{% include "src/site/includes/debug.drupal.liquid" %} \ No newline at end of file +{% include "src/site/includes/debug.drupal.liquid" %} diff --git a/src/site/layouts/faq_multiple_q_a.drupal.liquid b/src/site/layouts/faq_multiple_q_a.drupal.liquid index 1dc0be0d41..507a94a4da 100644 --- a/src/site/layouts/faq_multiple_q_a.drupal.liquid +++ b/src/site/layouts/faq_multiple_q_a.drupal.liquid @@ -20,7 +20,7 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with constructLcBreadcrumbs = true titleInclude = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with titleInclude = true %}
diff --git a/src/site/layouts/health_care_local_facility.drupal.liquid b/src/site/layouts/health_care_local_facility.drupal.liquid index 71fd9ecc2c..f550bcff9d 100644 --- a/src/site/layouts/health_care_local_facility.drupal.liquid +++ b/src/site/layouts/health_care_local_facility.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true deriveBreadcrumbsFromUrl = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true %}
diff --git a/src/site/layouts/news_story.drupal.liquid b/src/site/layouts/news_story.drupal.liquid index 9fec89ea85..bc83948e34 100644 --- a/src/site/layouts/news_story.drupal.liquid +++ b/src/site/layouts/news_story.drupal.liquid @@ -3,7 +3,7 @@ {% endif %} {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true deriveBreadcrumbsFromUrl = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true %}
diff --git a/src/site/layouts/person_profile.drupal.liquid b/src/site/layouts/person_profile.drupal.liquid index 31f7d30420..10d9d6f2f2 100644 --- a/src/site/layouts/person_profile.drupal.liquid +++ b/src/site/layouts/person_profile.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true deriveBreadcrumbsFromUrl = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true %}
diff --git a/src/site/layouts/press_release.drupal.liquid b/src/site/layouts/press_release.drupal.liquid index abd29b5f7a..bff8962808 100644 --- a/src/site/layouts/press_release.drupal.liquid +++ b/src/site/layouts/press_release.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true deriveBreadcrumbsFromUrl = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with hideHomeBreadcrumb = true %}
@@ -82,9 +82,8 @@
{{ fieldOffice.entity.fieldPressReleaseBlurb.processed }}
- {% assign index = entityUrl.breadcrumb.length | minus: 2 %} See all news releases + href="{{ fieldListing.entity.entityUrl.path }}">See all news releases
{% include "src/site/includes/above-footer-elements.drupal.liquid" %} diff --git a/src/site/layouts/q_a.drupal.liquid b/src/site/layouts/q_a.drupal.liquid index a29dac5936..9708e1951d 100644 --- a/src/site/layouts/q_a.drupal.liquid +++ b/src/site/layouts/q_a.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with constructLcBreadcrumbs = true titleInclude = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with titleInclude = true %}
diff --git a/src/site/layouts/step_by_step.drupal.liquid b/src/site/layouts/step_by_step.drupal.liquid index 3e0b07c250..dab6b4294c 100644 --- a/src/site/layouts/step_by_step.drupal.liquid +++ b/src/site/layouts/step_by_step.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with constructLcBreadcrumbs = true titleInclude = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with titleInclude = true %}
@@ -121,7 +121,7 @@
- {% include "src/site/includes/above-footer-elements.drupal.liquid" %} + {% include "src/site/includes/above-footer-elements.drupal.liquid" %}
diff --git a/src/site/layouts/support_resources_detail_page.drupal.liquid b/src/site/layouts/support_resources_detail_page.drupal.liquid index e0b19a467c..cb59b7ce11 100644 --- a/src/site/layouts/support_resources_detail_page.drupal.liquid +++ b/src/site/layouts/support_resources_detail_page.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with constructLcBreadcrumbs = true titleInclude = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" with titleInclude = true %}
{% include "src/site/includes/footer.html" %} -{% include "src/site/includes/debug.drupal.liquid" %} \ No newline at end of file +{% include "src/site/includes/debug.drupal.liquid" %} diff --git a/src/site/layouts/va_form.drupal.liquid b/src/site/layouts/va_form.drupal.liquid index 58de70202a..3b413db305 100644 --- a/src/site/layouts/va_form.drupal.liquid +++ b/src/site/layouts/va_form.drupal.liquid @@ -1,6 +1,6 @@ {% include "src/site/includes/header.html" %} {% include "src/site/includes/preview-edit.drupal.liquid" %} -{% include "src/site/includes/breadcrumbs.drupal.liquid" with deriveBreadcrumbsFromUrl = true %} +{% include "src/site/includes/breadcrumbs.drupal.liquid" %}