Merge gnm 2026-09-16 - #302

Merged

AndyKilmory merged 537 commits into

mainfrom

merge-gnm-2026-09-16

Sep 16, 2026

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 4, 2026

Merge pull request #4833 from guardian/ld/upgrade-aws-s3-part3
lindseydew
authored
f7e05ad
Merge pull request #4834 from guardian/ld/upgrade-aws-s3-part4
lindseydew
authored
9c8631f

Commits on Aug 5, 2026

Merge pull request #4835 from guardian/ld/upgrade-aws-s3-part5
lindseydew
authored
04381e7
Merge pull request #4836 from guardian/ld/upgrade-aws-s3-part6
lindseydew
authored
6a53515

Commits on Aug 6, 2026

Merge pull request #4837 from guardian/ld/upgrade-aws-s3-part7
lindseydew
authored
40b4d96
chore(deps): bump actions/setup-node from 6 to 7
dependabot[bot]
authored
f732aa0
Pin actions/setup-node to commit hash
hk-15
authored
c822b8a
Merge pull request #4809 from guardian/dependabot/github_actions/actions/setup-node-7
hk-15
authored
f4c4418
First pass at the script
lindseydew
committed
92785e4
Track the progress of the script
lindseydew
committed
2e61484
Read from the csv
lindseydew
committed
edbca8a
Set a stage variable
lindseydew
committed
1e970c2
Infer the domain from the stage set
lindseydew
committed
764d881
Consolidate log statements
lindseydew
committed
582f3e6
Merge pull request #4856 from guardian/ld/script-alamy
lindseydew
authored
bd0ff4a
Build the presigner client for a local run
lindseydew
committed
4623216

Commits on Aug 10, 2026

Commits on Aug 11, 2026

Commits on Aug 12, 2026

Commits on Aug 13, 2026

Commits on Aug 14, 2026

Commits on Aug 17, 2026

Merge pull request #4877 from guardian/08-14-tweak_top-bar_spacing
junyuanxue
authored
c4651cd

Commits on Aug 18, 2026

Commits on Aug 20, 2026

Commits on Aug 21, 2026

Commits on Aug 25, 2026

use multiple aggs
junyuanxue
committed
c831f8b
Merge pull request #4889 from guardian/08-21-use_multiple_aggs
junyuanxue
authored
5407c33
Add playwright
jonathonherbert
committed
4b3ebfb
Add testcontainers configuration to playwright, with Kahuna booting correctly
jonathonherbert
committed
2c85017
Add permissions fixture
jonathonherbert
committed
f99875e
Add permissions bucket on startup, and populate with permissions fixture
jonathonherbert
committed
6d2425d
Add user permissions to permissions.json fixture
jonathonherbert
committed
975c0ff
Correct path in Dockerfile
jonathonherbert
committed
b2c276a
Fix ports to enable us to resolve with dev-nginx locally, and via a reverse proxy in CI
jonathonherbert
committed
467815d
Add a reverse proxy, similar to dev-nginx's setup, that ensures we resolve the service endpoints to local ports in CI
jonathonherbert
committed
0662ce7
Amend Playwright workflow
jonathonherbert
committed
8a5c03c
Seed elasticsearch with images on container start
jonathonherbert
committed
56a129e
Add a separate Dockerfile for local development
jonathonherbert
committed
66be13e
Translate spec files to bdd features and steps
jonathonherbert
committed
72d7b02
Clean up files and add documentation after review
jonathonherbert
committed
bc1310e
Potential fix for pull request finding 'CodeQL / Workflow does not contain permissions'

jonathonherbert
and
github-advanced-security[bot]
committed
2535fa4
Amend permissions user
jonathonherbert
committed
cb322be
Consolidate the two dockerfiles into a single dockerfile, separating the local env from CI with --target
jonathonherbert
committed
5c02f41
grid-all, grid-dev -> grid-e2e-ci, grid-e2e-dev
jonathonherbert
committed
a47ed16
Add workflow_dispatch
jonathonherbert
committed
72ec295
Temporarily add branch to workflow
jonathonherbert
committed
7be08d4
Update/trim documentation
jonathonherbert
committed
31969c0
Bump to latest GHA
jonathonherbert
committed
245017f
Remove GRID_JAVA_OPTS
jonathonherbert
committed
03f21ad
Remove unnecessary env args and comments
jonathonherbert
committed
aacdf30
Consolidate entrypoint scripts
jonathonherbert
committed
a2311f7
Use docker/build-push-action to add layer caching
jonathonherbert
committed
ad881e8
Add caches for npm and playwright browser deps
jonathonherbert
committed
4f690b7
Correct entrypoint path
jonathonherbert
committed
90eff74
Remove media-api fixture and docs
jonathonherbert
committed
a367119
Remove redundant feature file
jonathonherbert
committed
7794056
Turn off Docker layer cache for now
jonathonherbert
committed
30d09a6
Remove branch-specific workflow trigger
jonathonherbert
committed
712285a
Potential fix for pull request finding

jonathonherbert
and
Copilot
committed
6d39ad4
Fix a doc regression
jonathonherbert
committed
ebbb390
Remove generated features files
jonathonherbert
committed
2398236
More doc tweaks
jonathonherbert
committed
23f37db
Assume e2e-ci when env CI is true, e2e-dev otherwise
jonathonherbert
committed
dbaabe7
Add test:ui
jonathonherbert
committed
92f866b
srv -> service
jonathonherbert
committed
c3b6942
entrypoint.sh -> entrypoint.ci.sh
jonathonherbert
committed
1a24f42
Docs improvement
jonathonherbert
committed
c78207a
Colocate comment with fn to describe purpose
jonathonherbert
committed
fe71706
More readable list of localstack services
jonathonherbert
committed
2739d66
Add example output of caddyfile
jonathonherbert
committed
e9ab22c
Remove devcontainer setup
jonathonherbert
committed
9f79df1

Commits on Aug 26, 2026

Merge pull request #4826 from guardian/jsh/e2e-tests
jonathonherbert
authored
e298077

Commits on Aug 27, 2026

Commits on Aug 28, 2026

Clean up files and add documentation after review
jonathonherbert
committed
a3ac2fd
Add SBT
jonathonherbert
committed
2afdd13
Add configuration to devenv
jonathonherbert
committed
a012810
Remove aws-cli as a dep from tool-versions, as it's taken care of by the devenv feature
jonathonherbert
committed
1b48f8d
Use ui-port rather than --ui, as we're now in a devcontainer context
jonathonherbert
committed
5048e6c
Revert Java version change
jonathonherbert
committed
e9a1ee2
Run Playwright tests on pull_request
jonathonherbert
committed
a09c568
Adjust whitespace in .tool-versions, which may fix setup-scala
jonathonherbert
committed
1ac810e
Regenerate devcontainer config
jonathonherbert
committed
3be76ca
Tidy up after rebase
jonathonherbert
committed
b409073
Add npm ci (in ./e2e-tests) to postCreateCommand
jonathonherbert
committed
8d396ff
pin SBT to v1 in .tool-versions
jonathonherbert
committed
aa4238b
Regenerate devenv
jonathonherbert
committed
f094179
Ensure npm is on the PATH when running in postCreateCommand
jonathonherbert
committed
efa01b5
Enable recording download usage for local config creation
junyuanxue
committed
5e5178c
Merge pull request #4882 from guardian/jsh/dev-containers
jonathonherbert
authored
194dae0

Commits on Aug 31, 2026

Merge pull request #4899 from guardian/08-28-enable_recording_download_usage_for_local_config_creation
junyuanxue
authored
6650206

Commits on Sep 1, 2026

Commits on Sep 2, 2026

Commits on Sep 3, 2026

Commits on Sep 4, 2026

Update PhotographerRenamer.scala
paperboyo
authored
efbdaa9

Commits on Sep 7, 2026

Merge pull request #4908 from guardian/jsh/improve-test-startup-speed
jonathonherbert
authored
fc90e5b
Migrate to ESM
jonathonherbert
committed
7e59c9b
Add dev:e2e command, which spins up the test environment without running tests
jonathonherbert
committed
27c63d0
Pin Elasticsearch to 9200
jonathonherbert
committed
e6a89cc
For test commands, only boot a stack if it doesn't already exist
jonathonherbert
committed
2a695ff
Update readme
jonathonherbert
committed
d3f6d85
Hold process open indefinitely
jonathonherbert
committed
265e2f4
Regenerate package-lock.json
jonathonherbert
committed
4ca4bd7
Listen for ES and Localstack when probing stack
jonathonherbert
committed
4a9c207
Update script to remove reference to run command
jonathonherbert
committed
70619f7
Move testcontainers folder to ./setup, per other projects
jonathonherbert
committed
54f9dbd
Potential fix for pull request finding

jonathonherbert
and
Copilot
committed
0c47b6e
Move testcontainers folder to ./setup, per other projects
jonathonherbert
committed
f09d564
Remove GRID_NO_REUSE, and amend docs
jonathonherbert
committed
134d2e5
Correct imgops healthcheck
jonathonherbert
committed
abf16ce
Correct hostname of kahuna service in output

jonathonherbert
and
Copilot
committed
97a15c6
Remove missing whitespace

jonathonherbert
and
Copilot
committed
58e3abb
Pin the config dir to a stable path, and clear it out if the running process owns it on exit
jonathonherbert
committed
63b3273
Remove explicit host port listing
jonathonherbert
committed
895c241
Do not record download usages from InDesign
junyuanxue
committed
afab927
Merge pull request #4912 from guardian/09-03-do_not_record_download_usages_from_indesign
junyuanxue
authored
9ce6a61
Pre-seed lease table to skip the long wait to establish a lease in e2e-tests
jonathonherbert
committed
ed615c0
Use listr2 to manage task DAG and give nice output, removing the URL task in the process (it's redundant after moving to static ports)
jonathonherbert
committed
ac1daa1
Fix collection modal overlay z-index
junyuanxue
committed
92d92b7
Merge pull request #4917 from guardian/09-07-fix_collection_modal_overlay_z-index
junyuanxue
authored
6955d4c
Spike C2PA detection
junyuanxue
committed
dde2599
Address a few nits after a review
jonathonherbert
committed
5466c47
Define ES and Kahuna URLs statically, rather than relying on mapped ports
jonathonherbert
committed
47ec1fe
Define localstack as local var
jonathonherbert
committed
414eaaa
Small helper for reportTo
jonathonherbert
committed
ac31d44
Remove listr for ensureStaack for consistency with dev.ts
jonathonherbert
committed
d9748ef
Minor tidies after a manual review
jonathonherbert
committed
584dcb9
Make timeout for ES seeding consistent with Grid startup timeout, and lower startup timeout
jonathonherbert
committed
09d1d10
await result of network.stop()
jonathonherbert
committed
c4dc40b

Commits on Sep 8, 2026

Merge pull request #4915 from guardian/mk-dict-add-37
paperboyo
authored
910478d

Commits on Sep 9, 2026

Commits on Sep 10, 2026

Commits on Sep 11, 2026

Commits on Sep 14, 2026

Commits on Sep 15, 2026

Remove redundant spec
jonathonherbert
committed
ac5e036
Tag unimplemented upload scenarios @todo and skip them
jonathonherbert
committed
f6b1db7
Implement the runnable upload e2e scenarios
jonathonherbert
committed
6520661
Restore the uploads-in-progress leave warning scenario
jonathonherbert
committed
7b371f0
Show the upload prompt's example label when no labels are applied
jonathonherbert
committed
8b5af0b
Minor scenario changes to accommodate testing requirements
jonathonherbert
committed
1eda379
Adapt tests to feature changes
jonathonherbert
committed
f361d4f
Move comments out of todo directives
jonathonherbert
committed
e1dd82d
Move uploads steps to own folder
jonathonherbert
committed
e94a877
Add detail to metadata w/o edito permission scenario
jonathonherbert
committed
208587b
Colocate variable definitions with usage, and use lower camel case
jonathonherbert
committed
fb208b2
Shorter comments
jonathonherbert
committed
7aa175c
Remove the prompt test and changes, which can be another PR
jonathonherbert
committed
67f7d42
Use list reporter to view timings in CI
jonathonherbert
committed
606337c
Potential fix for pull request finding

jonathonherbert
and
Copilot
authored
26c803b
Add assertion that the current uploads UI is not visible if no uploads are active to the 'An authorised user sees the upload tools' scenario
jonathonherbert
committed
7617a06
Test for specific user in query params
jonathonherbert
committed
4c3c1cc
Merge pull request #4900 from guardian/jsh/add-upload-features
jonathonherbert
authored
f6089bc
Always start caddy, which is necessary for Playwright to run tests locally
jonathonherbert
committed
acaaad6
Remove metadata logging
jonathonherbert
authored
66d181a
Merge pull request #4941 from guardian/jsh/remove-metadata-logging
jonathonherbert
authored
d66af8a

Commits on Sep 16, 2026

Merge pull request #4929 from guardian/jsh/add-upload-tests
jonathonherbert
authored
bf623da