Merge branch 'main' into integration-test-generator-fixes

ONSdigital · Sep 17, 2024 · 91d235c · 91d235c
2 parents d2a5164 + 5adfe30
commit 91d235c
Show file tree

Hide file tree

Showing 17 changed files with 566 additions and 499 deletions.
diff --git a/.design-system-version b/.design-system-version
@@ -1 +1 @@
-70.0.5
+70.0.15
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -1,9 +1,59 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    labels:
+      - "dependencies"
+      - "github-actions"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "node"
+    groups:
+      development-dependencies:
+        dependency-type: "development"
+        patterns:
+          - "@wdio*"
+          - "@babel*"
+          - "eslint*"
+          - "json*"
+          - "jsrsasign*"
+          - "lint-staged*"
+          - "livereload*"
+          - "node-forge*"
+          - "prettier*"
+          - "typescript*"
+          - "uuid*"
+          - "webdriverio*"
+
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    # Workaround to have two "pip" ecosystems: actively setting "target-branch: main" for one config, and leaving it unset for the other config
+    target-branch: main
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "python"
+    allow:
+      - dependency-type: "production"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -38,6 +88,25 @@ updates:
           - "cachetools"
           - "gevent"
           - "babel"
+    ignore:
+      # "babel" temporarily pinned to v2.14.0 - problem for translations found in v2.15.0, see: https://github.com/ONSdigital/eq-questionnaire-runner/pull/1384
+      - dependency-name: "babel"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "python-dev"
+    allow:
+      - dependency-type: "development"
+    groups:
       development-dependencies:
         dependency-type: "development"
         patterns:
@@ -58,39 +127,3 @@ updates:
           - "playwright"
           - "black"
           - "djlint"
-    ignore:
-      # Temporarily pinned to v2.14.0 - problem for translations found in v2.15.0, see: https://github.com/ONSdigital/eq-questionnaire-runner/pull/1384
-      - dependency-name: "babel"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
-      - dependency-name: "pytest*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "flake8*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "types*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "pep8"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "mock"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "jsonschema"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "beautifulsoup4"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "httmock"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "moto"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "freezegun"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "fakeredis"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "mypy"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "responses"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "playwright"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "black"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "djlint"
-        update-types: ["version-update:semver-minor"]
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,19 +38,18 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        setup-python-dependencies: false
 
     # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +63,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.2
+          version: 1.8.3
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -58,7 +58,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.2
+          version: 1.8.3
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -98,7 +98,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.2
+          version: 1.8.3
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -143,7 +143,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.2
+          version: 1.8.3
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -158,9 +158,20 @@ jobs:
       - name: Docker compose shutdown
         run: RUNNER_ENV_FILE=.functional-tests.env docker compose kill
   docker-push:
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - id: auth
+        name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: 'access_token'
+          workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.SERVICE_ACCOUNT }}
+
       - name: Set Tag and SHA
         run: |
           CLEAN_TAG=$(echo "${{ github.event.pull_request.head.ref  }}"  | tr / -)
@@ -181,10 +192,7 @@ jobs:
           docker push onsdigital/eq-questionnaire-runner:$TAG
 
       - name: Push to GAR
-        env:
-          GAR_SERVICE_KEY: ${{ secrets.GAR_SERVICE_KEY }}
         run: |
-          echo $GAR_SERVICE_KEY | docker login -u _json_key --password-stdin https://${{ secrets.GAR_LOCATION }}
           gcloud auth configure-docker ${{ secrets.GAR_LOCATION }}
           echo "Pushing to GAR with tag $TAG"
           docker push ${{ secrets.GAR_LOCATION }}/${{ secrets.GAR_PROJECT_ID }}/docker-images/eq-questionnaire-runner:$TAG
diff --git a/.schemas-version b/.schemas-version
@@ -1 +1 @@
-v5.9.0
+v5.13.0
diff --git a/Dockerfile b/Dockerfile
@@ -15,10 +15,10 @@ ENV HTTP_KEEP_ALIVE 2
 ENV GUNICORN_CMD_ARGS -c gunicorn_config.py
 
 COPY pyproject.toml pyproject.toml
-COPY poetry.lock poetry.lock 
+COPY poetry.lock poetry.lock
 
 RUN groupadd -r appuser && useradd -r -g appuser -u 9000 appuser && chown -R appuser:appuser .
-RUN pip install "poetry==1.8.2" && \
+RUN pip install "poetry==1.8.3" && \
     poetry config virtualenvs.create false && \
     poetry install --only main && \
     make build

diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ pip install --upgrade pip setuptools
 Install poetry, poetry dotenv plugin and install dependencies:
 
 ``` shell
-curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
+curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
 poetry self add poetry-plugin-dotenv
 poetry install
 ```

diff --git a/app/translations/messages.pot b/app/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-07-02 16:54+0100\n"
+"POT-Creation-Date: 2024-09-12 12:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,63 +366,63 @@ msgstr ""
 msgid "Save and exit survey"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:16
+#: app/views/contexts/hub_context.py:18
 msgid "Completed"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:18
+#: app/views/contexts/hub_context.py:20
 msgid "View answers"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:19
+#: app/views/contexts/hub_context.py:21
 msgid "View answers: {section_name}"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:23
+#: app/views/contexts/hub_context.py:25
 msgid "Partially completed"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:25
+#: app/views/contexts/hub_context.py:27
 msgid "Continue with section"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:26
+#: app/views/contexts/hub_context.py:28
 msgid "Continue with section: {section_name}"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:30
+#: app/views/contexts/hub_context.py:32
 msgid "Not started"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:32
+#: app/views/contexts/hub_context.py:34
 msgid "Start section"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:33
+#: app/views/contexts/hub_context.py:35
 msgid "Start section: {section_name}"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:37
+#: app/views/contexts/hub_context.py:39
 msgid "Separate census requested"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:39 app/views/contexts/hub_context.py:40
+#: app/views/contexts/hub_context.py:41 app/views/contexts/hub_context.py:42
 msgid "Change or resend"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:52 app/views/contexts/hub_context.py:53
+#: app/views/contexts/hub_context.py:54 app/views/contexts/hub_context.py:55
 msgid "Submit survey"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:57
+#: app/views/contexts/hub_context.py:59
 msgid "You must submit this survey to complete it"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:64
+#: app/views/contexts/hub_context.py:66
 msgid "Choose another section to complete"
 msgstr ""
 
-#: app/views/contexts/hub_context.py:65 templates/confirm-email.html:28
+#: app/views/contexts/hub_context.py:67 templates/confirm-email.html:28
 #: templates/individual_response/confirmation-post.html:26
 #: templates/individual_response/confirmation-text-message.html:39
 #: templates/individual_response/question.html:5 templates/interstitial.html:7
@@ -912,37 +912,41 @@ msgstr ""
 msgid "Get a copy of your answers"
 msgstr ""
 
-#: templates/thank-you.html:77
+#: templates/thank-you.html:76
+msgid "We may contact you to query your answers."
+msgstr ""
+
+#: templates/thank-you.html:78
 msgid ""
-"You can <a href=\"{url}\" id=\"view-submitted-response-link\">save or "
-"print your answers</a> for your records."
+"If you need a copy for your records, <a href=\"{url}\" id=\"view-"
+"submitted-response-link\">save or print your answers</a>."
 msgstr ""
 
-#: templates/layouts/_base.html:148 templates/thank-you.html:83
+#: templates/layouts/_base.html:148 templates/thank-you.html:84
 msgid "minute"
 msgstr ""
 
-#: templates/layouts/_base.html:149 templates/thank-you.html:84
+#: templates/layouts/_base.html:149 templates/thank-you.html:85
 msgid "minutes"
 msgstr ""
 
-#: templates/layouts/_base.html:150 templates/thank-you.html:85
+#: templates/layouts/_base.html:150 templates/thank-you.html:86
 msgid "second"
 msgstr ""
 
-#: templates/layouts/_base.html:151 templates/thank-you.html:86
+#: templates/layouts/_base.html:151 templates/thank-you.html:87
 msgid "seconds"
 msgstr ""
 
-#: templates/thank-you.html:88
+#: templates/thank-you.html:89
 msgid "For security, your answers will only be available to view for 45 minutes"
 msgstr ""
 
-#: templates/thank-you.html:98
+#: templates/thank-you.html:99
 msgid "Get confirmation email"
 msgstr ""
 
-#: templates/thank-you.html:100
+#: templates/thank-you.html:101
 msgid ""
 "If you would like to be sent confirmation that you have completed your "
 "survey, enter your email address"

diff --git a/ci/purge_expired_questionnaire_state.yaml b/ci/purge_expired_questionnaire_state.yaml
@@ -6,7 +6,7 @@ image_resource:
 params:
     SERVICE_ACCOUNT_JSON: ((gcp.service_account_json))
     PROJECT_ID:
-    DATAFLOW_TEMPLATE_VERSION: '2024-01-09-00_RC01'
+    DATAFLOW_TEMPLATE_VERSION: '2024-07-23-00_RC00'
 run:
     path: bash
     args: