Dependency updates, shield module, lando updates (#32)

* Dependency updates, shield module, lando updates

* updated to latest profile

* updated lock file

* updated to tagged profile

Author: imonroe

.gitignore

@@ -166,3 +166,6 @@ docroot/sites/*/settings/settings.ddev.php
 
 # notes
 *-notes.txt
+
+# logs
+logs/

composer.json

@@ -83,10 +83,10 @@
         "drupal/node_revision_delete": "2.0.x-dev",
         "drupal/oembed_lazyload": "^2.0",
         "drupal/paranoia": "^1.9",
-        "drupal/trash": "^3.0",
+        "drupal/trash": "3.0.21",
         "drush/drush": "13.3.3 as 12.5.3",
         "su-sws/stanford_profile": "11.6.2",
-        "su-sws/vpge_profile": "11.4.1"
+        "su-sws/vpge_profile": "11.4.2"
     },
     "require-dev": {
         "acquia/blt-drupal-test": "^1.0",
@@ -106,6 +106,7 @@
         "sort-packages": true,
         "discard-changes": true,
         "allow-plugins": true,
+        "process-timeout": 0,
         "preferred-install": {
             "su-sws/vpge_profile": "source"
         }
@@ -176,9 +177,6 @@
             "drupal/core": {
                 "https://www.drupal.org/node/2833734": "https://www.drupal.org/files/issues/2020-11-29/2833734-allow-attachment-pager-42.patch"
             },
-            "drupal/next": {
-                "Fix CORS": "https://sws-devguide.stanford.edu/sites/g/files/sbiybj17516/files/next-cors.patch"
-            },
             "drupal/paranoia": {
                 "https://stanfordits.atlassian.net/browse/D8CORE-1351": "patches/contrib/paranoia.patch"
             },

composer.lock

@@ -0,0 +1,18 @@
+_core:
+  default_config_hash: FLJZME3II5fjmMSrdEvJHp95ZJf8V_X0jbX0VdVU1BU
+shield_enable: true
+credential_provider: shield
+credentials:
+  shield:
+    user: sws
+    pass: sws
+allow_cli: true
+debug_header: false
+unset_basic_auth_headers: true
+print: Authenticate
+method: 0
+paths: /graphql
+allowlist: ''
+http_method_allowlist:
+  post: post
+domains: ''

config/envs/dev/shield.settings.yml

@@ -0,0 +1,18 @@
+_core:
+  default_config_hash: FLJZME3II5fjmMSrdEvJHp95ZJf8V_X0jbX0VdVU1BU
+shield_enable: true
+credential_provider: shield
+credentials:
+  shield:
+    user: sws
+    pass: sws
+allow_cli: true
+debug_header: false
+unset_basic_auth_headers: true
+print: Authenticate
+method: 0
+paths: /graphql
+allowlist: ''
+http_method_allowlist:
+  post: post
+domains: ''

config/envs/stage/shield.settings.yml

@@ -6,8 +6,26 @@ drush:
     config:
       # Load a drush.yml configuration file from the current working directory.
       - docroot/sites/default/local.drush.yml
+      - ../docroot/sites/default/local.drush.yml
       # Allow local global config overrides.
       - local.drush.yml
+      - drush/local.drush.yml
     include:
       - '${env.home}/.drush'
       - /usr/share/drush/commands
+command:
+  sws:
+    options:
+      git-url:
+        - stanfordvpge@svn-23450.prod.hosting.acquia.com:stanfordvpge.git
+      alias-dir: drush/sites
+      app-id: eed9a501-bc72-4e69-8d48-82e211f15f5a
+      sync-ssh: stanfordvpge.test@stanfordvpgetest.ssh.prod.acquia-sites.com
+      sync-files:
+        - /mnt/gfs/stanfordvpge.test/nobackup/simplesamlphp/
+        - /mnt/gfs/stanfordvpge.test/secrets.settings.php
+        - /mnt/gfs/stanfordvpge.test/nobackup/oauth/
+      multisites:
+        # - anes
+        - default
+        - diversityworks

drush/drush.yml

@@ -2,7 +2,7 @@ name: vpge-gryphon
 recipe: drupal10
 config:
   webroot: docroot
-  php: '8.2'
+  php: '8.3'
   xdebug: false
 proxy:
   appserver:
@@ -17,13 +17,10 @@ services:
       - docker-php-ext-enable pcov
     build:
       - composer install
-      - composer init-lando
     volumes:
       - ~/.acquia:/var/www/.acquia
-      - ~/.ssh:/var/www/.ssh
     ssl: true
     config:
-      php: lando/php.ini
     # Uncomment the below for behat testing
       overrides:
         environment:
@@ -37,37 +34,32 @@ services:
               }
             }
   database:
-    type: mysql:5.7
+    type: mysql:8.0
     portforward: 33061
     creds:
       user: drupal
       password: drupal
       database: vpge
+    overrides:
+      volumes:
+        - ./lando/mysql8.cnf:/opt/bitnami/mysql/conf/my_custom.cnf
   adminer:
     type: compose
     services:
       image: dehy/adminer
       command: /bin/s6-svscan /etc/services.d
     portforward: true
   diversityworks:
-    type: mysql:5.7
+    type: mysql:8.0
     portforward: 33062
     creds:
       user: drupal
       password: drupal
       database: diversityworks
-  # Uncomment the below for behat testing
-      overrides:
-        environment:
-          MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless"]}}, "http://chromedriver:4444"]'
-          BEHAT_PARAMS: >-
-            {
-              "extensions" : {
-                "Behat\\MinkExtension" : {
-                  "base_url" : "http://diversityworks.lndo.site/"
-                }
-              }
-            }
+    overrides:
+      volumes:
+        - ./lando/mysql8.cnf:/opt/bitnami/mysql/conf/my_custom.cnf
+
   # Uncomment the below for behat testing.
   chromedriver:
     type: lando
@@ -83,9 +75,6 @@ services:
       ports:
         - 4444
 tooling:
-  blt:
-    service: appserver
-    cmd: /app/vendor/bin/blt
   git:
     service: appserver
   phpcs:

lando/example.lando.yml

@@ -0,0 +1,55 @@
+[mysqld]
+#
+# * Basic Settings
+#
+default-storage-engine = innodb
+
+#
+# * Fine Tuning
+#
+key_buffer_size    = 384M
+max_allowed_packet  = 32M
+thread_stack    = 400K
+thread_cache_size       = 8
+read_rnd_buffer_size = 8M
+myisam_sort_buffer_size = 64M
+table_open_cache = 512
+sort_buffer_size = 2M
+read_buffer_size = 2M
+
+#
+# * Logging and Replication
+#
+# MySQL 8.0 uses binlog_expire_logs_seconds instead of expire_logs_days
+binlog_expire_logs_seconds = 864000
+max_binlog_size = 100M
+
+#
+# * InnoDB
+#
+innodb_log_file_size = 101M
+innodb_flush_log_at_trx_commit = 0
+innodb_buffer_pool_size = 384M
+innodb_log_buffer_size  = 4M
+innodb_file_per_table   = 1
+innodb_open_files       = 256
+innodb_io_capacity      = 512
+innodb_flush_method     = O_DIRECT
+innodb_thread_concurrency = 8
+innodb_lock_wait_timeout = 121
+
+# MySQL 8.0 Authentication
+default_authentication_plugin = mysql_native_password
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet  = 32M
+
+[mysql]
+
+[isamchk]
+key_buffer_size = 384M
+sort_buffer_size = 256M
+read_buffer = 2M
+write_buffer = 2M

lando/mysql8.cnf

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Three-fingered Claw Technique
+yell() { echo "$0: $*" >&2; }
+die() { yell "$*"; exit 111; }
+try() { "$@" || die "cannot $*"; }
+
+yell "Setting up your site using lando."
+
+try cp ./lando/example.lando.yml ./.lando.yml
+try lando start
+try lando composer install --prefer-source
+
+# copy the local versions of the necessary files.
+try cp ./docroot/sites/settings/default.local.settings.php ./docroot/sites/settings/local.settings.php
+try cp ./docroot/sites/default/default.local.drush.yml ./docroot/sites/default/local.drush.yml
+try cp ./docroot/sites/default/settings/default.local.settings.php ./docroot/sites/default/settings/local.settings.php
+
+try lando drush settings
+try lando drush sws:keys
+try lando drush drupal:install --site=default
+# Uncomment the next line to install with content from the DEV environment.
+try lando composer sync-soe-dev
+try lando drush deploy
+
+yell "Your site is good to go."
+try lando info --format table --filter service=appserver

lando/setup_lando.sh

@@ -63,12 +63,12 @@ index 5b54c2b..00b8871 100644
 +++ b/modules/ui_patterns_views/ui_patterns_views.module
 @@ -6,6 +6,9 @@
   */
- 
+
  use Drupal\ui_patterns\Element\PatternContext;
 +use Drupal\Component\Utility\Xss;
 +use Drupal\Core\Template\Attribute;
 +use Drupal\Component\Utility\Html;
- 
+
  /**
   * Implements hook_theme().
 @@ -19,6 +22,9 @@ function ui_patterns_views_theme() {
@@ -80,14 +80,14 @@ index 5b54c2b..00b8871 100644
 +    ],
    ];
  }
- 
+
 @@ -39,41 +45,122 @@ function template_preprocess_pattern_views_row(array &$variables) {
    $options = $variables['options'];
    $row = $variables['row'];
- 
+
 -  foreach ($options['pattern_mapping'] as $mapping) {
 -    $field_name = $mapping['source'];
--    if (!isset($view->field[$field_name])) {
+-    if (empty($view->field[$field_name])) {
 -      continue;
 -    }
 -    $field = $view->field[$field_name];
@@ -196,7 +196,7 @@ index 5b54c2b..00b8871 100644
 +      ];
      }
    }
- 
+
 -  $variables['pattern'] = [];
 -  if ($view->preview && !isset($view->element['#embed'])) {
 -    \Drupal::messenger()->addWarning(t('Pattern Views row plugin does not support preview.'));
@@ -234,5 +234,5 @@ index 5b54c2b..00b8871 100644
 +  $variables['pattern']['#context']['view'] = $view;
 +  $variables['pattern']['#context']['row'] = $row;
  }
- 
+
  /**