Release 202410 - release 3

.ddev/commands/web/phpcbf

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+## Description: Run phpcbf to automatically fix some phpcs errors.
+## Usage: phpcbf
+## Example: "ddev phpcbf"
+
+{
+    /var/www/html/bin/phpcbf --standard=phpcbf-ecc.xml $*
+} || {
+    echo Fix the remaining issues manually.
+}

.ddev/commands/web/phpcs

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+## Description: Run phpcs in the web container.
+## Usage: phpcs
+## Example: "ddev phpcs"
+
+{
+    /var/www/html/bin/phpcs --standard=phpcs-ecc.xml $*
+} || {
+    echo Please fix these issues.
+}

.ddev/commands/web/phpunit

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+## Description: Run phpunit in the web container to run phpunit tests.
+## Usage: phpunit
+## Example: "ddev phpunit"
+
+export SYMFONY_DEPRECATIONS_HELPER=weak
+/var/www/html/bin/phpunit -c /var/www/html/phpunit-ecc.xml --verbose $*

.ddev/commands/web/phpunit-lgd

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+## Description: Run phpunit in the web container to run phpunit tests on LGD.
+## Usage: phpunit-lgd
+## Example: "ddev phpunit-lgd"
+
+/var/www/html/bin/phpunit -c /var/www/html/phpunit-lgd.xml $*
+

.ddev/commands/web/phpunit-with-deprecations

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Run phpunit in the web container to run phpunit tests.
+## Usage: phpunit-with-deprecations
+## Example: "ddev phpunit-with-deprecations"
+
+/var/www/html/bin/phpunit -c /var/www/html/phpunit-ecc.xml $*

.docksal/docksal.env

@@ -8,7 +8,7 @@ DOCKSAL_STACK=default
 
 # Match Platformsh stack
 CLI_IMAGE='docksal/cli:php8.1-3'
-DB_IMAGE='docksal/mariadb:10.4'
+DB_IMAGE='docksal/mariadb:10.3'
 NGINX_VHOST_PRESET=drupal
 
 # Docksal configuration.

.github/workflows/comment.yml

@@ -273,6 +273,124 @@ jobs:
             Rebuilt the Review App
             https://portal---${{ steps.deploy.outputs.env_slug }}.livelyforest-609fad32.uksouth.azurecontainerapps.io/
 
+
+  redeploy_code_reviewapp:
+    name: Redeploy code to Review App
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '/redeploy code')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add comment for start of job
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Redeploy code to the Review App (no changes to the database)
+
+      - name: Get PR branch
+        uses: xt0rted/pull-request-comment-branch@v1
+        id: comment-branch
+
+      - name: Log in to Azure
+        uses: azure/login@v1
+        with:
+          creds: '{"clientId":"${{ vars.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ vars.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ vars.ARM_TENANT_ID }}"}'
+
+      - name: Deactivate revisions
+        id: deactivate
+        env:
+          ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+          REF_NAME: ${{ steps.comment-branch.outputs.head_ref }}
+        shell: bash
+        run: |
+          ENV_SLUG=$(echo "${REF_NAME}" | sed -e 's:[^[:alpha:]|^[:digit:]]:-:g' | sed -e 's/\(.*\)/\L\1/')
+          jq -n --argjson revisions $(az containerapp revision list -n portal -g rg-ecc-portal-uks-dev --subscription "Essex County Council (Portal)" | jq -c '[.[].name]') --argjson ingress $(az containerapp ingress show -n portal -g rg-ecc-portal-uks-dev --subscription "Essex County Council (Portal)"  | jq -c ".traffic | [.[].revisionName]") '{"revisions": $revisions, "ingress": $ingress} | .revisions-.ingress | .[]' | tr -d '"' | while read revision
+          do
+            echo Deactivating "$revision"
+            az containerapp revision deactivate --revision $revision -g rg-ecc-portal-uks-dev --subscription "Essex County Council (Portal)"
+          done
+
+      - name: Deploy review app
+        id: deploy
+        env:
+          ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+          REF_NAME: ${{ steps.comment-branch.outputs.head_ref }}
+        run: |
+          CI_COMMIT_BRANCH="$REF_NAME"
+          ENV_SLUG=$(echo "${REF_NAME}" | sed -e 's:[^[:alpha:]|^[:digit:]]:-:g' | sed -e 's/\(.*\)/\L\1/')
+          tag=":$ENV_SLUG"
+          echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+          echo "Creating new revision of Container App"
+          cat > revision.yml <<EOF
+          properties:
+            template:
+              revisionSuffix: gh${GITHUB_RUN_ID}
+              scale:
+                minReplicas: 0
+                maxReplicas: 1
+                rules:
+                  - name: "http-rule"
+                    http:
+                      metadata:
+                        concurrentRequests: 40
+              containers:
+                - image: acreccuksdev.azurecr.io/portal-nginx-drupal$tag
+                  name: nginx
+                  resources:
+                    cpu: 0.25
+                    memory: 0.5Gi
+                  volumeMounts:
+                  - mountPath: /drupal/web/sites/default/files
+                    volumeName: filesharevol
+                  env:
+                  - name: X_ROBOTS_TAG
+                    value: noindex
+                  probes:
+                  - type: liveness
+                    httpGet:
+                      path: "/dd822309-ae33-4e29-addf-869b07453a06"
+                      port: 80
+                    initialDelaySeconds: 5
+                    periodSeconds: 3
+                - image: acreccuksdev.azurecr.io/portal-drupal-fpm$tag
+                  name: drupal
+                  resources:
+                    cpu: 0.75
+                    memory: 1.5Gi
+                  volumeMounts:
+                  - mountPath: /drupal/web/sites/default/files
+                    volumeName: filesharevol
+                  - mountPath: /drupal/data/default/private
+                    volumeName: privsharevol
+                  env:
+                  - name: MYSQL_HOST
+                    value: mariadb-ecc-uks-dev.mariadb.database.azure.com
+                  - name: MYSQL_USER
+                    value: mariadb-root
+                  - name: MYSQL_DATABASE
+                    value: drupal_ci_${ENV_SLUG}
+                  - name: MYSQL_PASSWORD
+                    secretRef: mysql-password
+                  - name: OPENID_CONNECT_PARAMS
+                    secretRef: openid-connect-params
+                  probes:
+                  - type: liveness
+                    tcpSocket:
+                      port: 9000
+                    initialDelaySeconds: 5
+                    periodSeconds: 3
+          EOF
+          az containerapp revision copy -n portal -g rg-ecc-portal-uks-dev --yaml revision.yml --subscription "Essex County Council (Portal)" | tee revision.json
+          az containerapp revision label add --no-prompt -g rg-ecc-portal-uks-dev -n portal --label ${ENV_SLUG} --revision portal--gh${GITHUB_RUN_ID} --subscription "Essex County Council (Portal)"
+          echo "env_slug=${ENV_SLUG}" >> "$GITHUB_OUTPUT"
+
+      - name: Add comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Redeployed code to the Review App (no changes to the database)
+            https://portal---${{ steps.deploy.outputs.env_slug }}.livelyforest-609fad32.uksouth.azurecontainerapps.io/
+
   stop_reviewapp:
     name: Stop Review App
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/stop')

.gitignore

@@ -1,13 +1,19 @@
+# Ignore web folder except custom modules.
+/web/*
+!/web/modules/
+/web/modules/contrib/
+/web/modules/README.txt
+!/web/modules/custom/
+!/web/modules/custom/*
+
 # Ignore directories generated by Composer
 /bin
 /drush/contrib/
 /vendor/
-/web/
 
 # Ignore scaffold files
 /.editorconfig
 /.gitattributes
-/web
 
 # Ignore IDE files
 .idea/
@@ -36,4 +42,7 @@ certs/
 /private
 
 # Ignore config which may contain secrets
-.ddev/.env
+.ddev/.env
+
+# Ignore custom ddev domain
+.ddev/nginx_full/essexgov.conf

.gitlab-ci.yml

@@ -15,7 +15,7 @@ Test:Required:
     - ''
   script:
     - composer install && composer tests-required
-  allow_failure: true
+  allow_failure: false
 
 build-and-push-images:
   stage: build
@@ -184,7 +184,7 @@ drush-deploy-dev:
   stage: development-postdeploy
   needs: ["deploy-to-dev"]
   before_script:
-    - apk add socat
+    - tdnf -y install socat
     - az extension add --name containerapp
     - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID}
     - az account set --subscription "Essex County Council (Portal)"
@@ -293,7 +293,7 @@ drush-deploy-preprod:
   stage: preproduction-postdeploy
   needs: ["deploy-to-preprod"]
   before_script:
-    - apk add socat
+    - tdnf -y install socat
     - az extension add --name containerapp
     - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID}
     - az account set --subscription "Essex County Council (Portal)"
@@ -384,7 +384,7 @@ deploy-to-prod:
                 initialDelaySeconds: 5
                 periodSeconds: 3
       EOF
-    - az containerapp revision copy --name portal --resource-group rg-ecc-portal-uks-prod --yaml revision.yml --subscription "Essex County Council (Portal)"
+    - az containerapp revision copy --name portalrb --resource-group rg-ecc-portal-uks-prod --yaml revision.yml --subscription "Essex County Council (Portal)"
     - az containerapp revision copy --name portal-redirect --resource-group rg-ecc-portal-redirect-uks-prod --image acreccuksprod.azurecr.io/portal-nginx-redirect:${CI_COMMIT_REF_SLUG} --subscription "Essex County Council (Portal)"
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
@@ -397,12 +397,12 @@ drush-deploy-prod:
   stage: production-postdeploy
   needs: ["deploy-to-prod"]
   before_script:
-    - apk add socat
+    - tdnf -y install socat
     - az extension add --name containerapp
     - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID}
     - az account set --subscription "Essex County Council (Portal)"
   script:
-    - timeout 1200 socat EXEC:'az containerapp exec --command /drupal/deploy.sh --name portal --container drupal --resource-group rg-ecc-portal-uks-prod',pty,setsid,ctty STDIO,ignoreeof
+    - timeout 1200 socat EXEC:'az containerapp exec --command /drupal/deploy.sh --name portalrb --container drupal --resource-group rg-ecc-portal-uks-prod',pty,setsid,ctty STDIO,ignoreeof
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
       when: manual
@@ -504,12 +504,12 @@ drush-deploy-straight-to-prod:
   stage: production-postdeploy
   needs: ["deploy-straight-to-prod"]
   before_script:
-    - apk add socat
+    - tdnf -y install socat
     - az extension add --name containerapp
     - az login --service-principal -u${ARM_CLIENT_ID} -p${ARM_CLIENT_SECRET} -t${ARM_TENANT_ID}
     - az account set --subscription "Essex County Council (Portal)"
   script:
-    - timeout 1200 socat EXEC:'az containerapp exec --command /drupal/deploy.sh --name portal --container drupal --resource-group rg-ecc-portal-uks-prod',pty,setsid,ctty STDIO,ignoreeof
+    - timeout 1200 socat EXEC:'az containerapp exec --command /drupal/deploy.sh --name portalrb --container drupal --resource-group rg-ecc-portal-uks-prod',pty,setsid,ctty STDIO,ignoreeof
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
       when: manual