Merge pull request #1519 from USEPA/main

Version 2024-09-25
USEPA · Sep 25, 2024 · 3612143 · 3612143
2 parents 29c1b5e + b6c547c
commit 3612143
Show file tree

Hide file tree

Showing 88 changed files with 1,270 additions and 906 deletions.
diff --git a/.buildkite/feature.yml b/.buildkite/feature.yml
@@ -42,10 +42,9 @@ steps:
           #
           # [1]: https://getcomposer.org/doc/articles/authentication-for-private-packages.md#authentication-in-auth-json-per-project
           - seek-oss/aws-sm#v2.3.1:
-              region: us-east-1
               file:
                 - path: services/drupal/auth.json
-                  secret-id: buildkite/github_access_token
+                  secret-id: forumone/composer-auth
 
           # Assume cross-account build role. We don't log in directly to ECR as Kaniko is able
           # to do that for us.

diff --git a/.buildkite/webcms.yml b/.buildkite/webcms.yml
@@ -39,10 +39,9 @@ steps:
 
         plugins:
           - seek-oss/aws-sm#v2.3.1:
-              region: us-east-1
               file:
                 - path: services/drupal/auth.json
-                  secret-id: buildkite/github_access_token
+                  secret-id: forumone/composer-auth
 
           - cultureamp/aws-assume-role#v0.1.0:
               role: arn:aws:iam::316981092358:role/BuildkiteRoleForImageBuilds

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
@@ -170,7 +170,7 @@
         "drupal/anchor": "^1.0",
         "drupal/anchor_link": "3.0.x-dev",
         "drupal/auto_entitylabel": "^3.0",
-        "drupal/autologout": "^1.3",
+        "drupal/autologout": "^2.0",
         "drupal/autosave_form": "^1.3",
         "drupal/block_content_permissions": "^1.8",
         "drupal/block_in_page_403": "^2.0",