diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 1044f8b98..0163feaef 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -150,6 +150,7 @@ jobs: TF_VAR_app_azuread_tenantid: ${{ secrets.AZUREAD_TENANTID }} TF_VAR_app_azuread_groupid: ${{ secrets.AZUREAD_GROUPID }} TF_VAR_app_cypresstest_secret : ${{ secrets.CYPRESS_TEST_SECRET }} + TF_VAR_app_support_email: ${{ secrets.SUPPORT_EMAIL }} create-tag: needs: deploy-image diff --git a/.github/workflows/tf-apply.yml b/.github/workflows/tf-apply.yml index 6d0a47b29..fb52e4f5d 100644 --- a/.github/workflows/tf-apply.yml +++ b/.github/workflows/tf-apply.yml @@ -80,6 +80,7 @@ jobs: TF_VAR_app_azuread_tenantid: ${{ secrets.AZUREAD_TENANTID }} TF_VAR_app_azuread_groupid: ${{ secrets.AZUREAD_GROUPID }} TF_VAR_app_cypresstest_secret : ${{ secrets.CYPRESS_TEST_SECRET }} + TF_VAR_app_support_email: ${{ secrets.SUPPORT_EMAIL }} run_tests: needs: terraform-apply @@ -104,7 +105,7 @@ jobs: node-version: '18.x' - name: Npm install - run: npm install + run: npm install - name: Run tests run: npm run cypress:run -- --key ${{ secrets.CYPRESS_KEY }} --env url='${{ secrets.ENDPOINT }}',authorizationHeader='${{ secrets.AUTH_HEADER_CYPRESS }}' @@ -114,13 +115,13 @@ jobs: with: name: cypress-screenshots path: end-to-end-tests/cypress/screenshots - + create-tag: needs: terraform-apply runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@v2 - - name: Create tag string + - name: Create tag string run: echo "RELEASE_TAGNAME=${{ github.event.inputs.environment }}-`date +%Y-%m-%d`.${{ github.run_number }}" >> $GITHUB_ENV - name: Create git tag run: | diff --git a/Frontend/Pages/AccessibilityStatement.cshtml b/Frontend/Pages/AccessibilityStatement.cshtml index 12cc6e824..45bd5fdf7 100644 --- a/Frontend/Pages/AccessibilityStatement.cshtml +++ b/Frontend/Pages/AccessibilityStatement.cshtml @@ -1,4 +1,7 @@ @page +@using Microsoft.Extensions.Configuration + +@inject IConfiguration _configuration @{ ViewData["Title"] = "Accessibility statement for the Manage an academy transfer website"; @@ -37,7 +40,7 @@

@@ -47,7 +50,7 @@

Reporting accessibility problems with this website

- We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, email us at: regionalservices.rg@education.gov.uk. + We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, email us at: @_configuration["SupportEmail"].

Enforcement procedure

diff --git a/Frontend/Views/Shared/_Layout.cshtml b/Frontend/Views/Shared/_Layout.cshtml index 98d519221..f29403e23 100644 --- a/Frontend/Views/Shared/_Layout.cshtml +++ b/Frontend/Views/Shared/_Layout.cshtml @@ -115,7 +115,7 @@

Get support

diff --git a/terraform/main.tf b/terraform/main.tf index f875e5b58..670059167 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -4,7 +4,7 @@ resource cloudfoundry_app worker_app { docker_image = local.docker_image strategy = "blue-green-v3" - service_binding { + service_binding { service_instance = cloudfoundry_service_instance.redis.id } @@ -14,13 +14,13 @@ resource cloudfoundry_app worker_app { routes { route = cloudfoundry_route.web_app_cloudapp_digital_route.id - } + } environment = { "ASPNETCORE_ENVIRONMENT" = var.aspnetcore_environment "ASPNETCORE_URLS" = "http://+:8080" "TRAMS_API_BASE" = var.app_trams_api_base - "TRAMS_API_KEY" = var.app_trams_api_key + "TRAMS_API_KEY" = var.app_trams_api_key "SENTRY_RELEASE" = "academy-transfers-api:${var.cf_app_image_tag}" "ServiceLink__ConversionsUrl" = var.app_servicelink_conversionsurl "AzureAd__ClientSecret" = var.app_azuread_clientsecret @@ -28,6 +28,7 @@ resource cloudfoundry_app worker_app { "AzureAd__TenantId" = var.app_azuread_tenantid "AzureAd__GroupId" = var.app_azuread_groupid "CypressTestSecret" = var.app_cypresstest_secret + "SupportEmail" = var.app_support_email } } diff --git a/terraform/variables.tf b/terraform/variables.tf index 17fd78cb4..c47d0a9f8 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -57,27 +57,27 @@ variable app_trams_api_key { variable app_azuread_clientsecret { type = string description = "Application variable for the Azure AD Authorization header" -} +} variable app_azuread_clientid { type = string description = "Application variable for the Azure AD client id" -} +} variable app_azuread_tenantid { type = string description = "Application variable for the Azure AD tenant id" -} +} variable app_azuread_groupid { type = string description = "Application variable for the Azure AD group id" -} +} variable app_cypresstest_secret { type = string description = "Application variable for the Cypress tests secret" -} +} variable logit_sink_url { type = string description = "Target URL (HTTPS) for logs to be streamed to" @@ -88,6 +88,11 @@ variable app_servicelink_conversionsurl { description = "Application variable for the Conversions service URL" } +variable app_support_email { + type = string + description = "email address for support" +} + ## ========================================================================== ## # Locals # ## ========================================================================== ##