acceptance: merge delete_one local+cloud, replace sort_acls_json with gron --sort-arrays#5104
Merged
Conversation
…ith gron --sort-arrays
Combine bundle/resources/permissions/jobs/delete_one/{local,cloud} into a
single test that runs in both modes. Add --sort-arrays to gron.py to canonicalize
commutative ACL arrays before flattening, replacing sort_acls_json.py.
Also fixes the cloud-only failure where display_name was missing from the
permissions get response for freshly-created test principals: the script now
pipes through grep -v display_name, which gron's flat output makes trivial.
Co-authored-by: Isaac
The previous commit deleted sort_acls_json.py and updated the test scripts to call gron.py --sort-arrays, but the gron.py change itself and the permissions/output.txt aggregate refresh were never staged. Tests passed locally only because both lived in the working tree. This commit completes the change so HEAD is self-consistent. Co-authored-by: Isaac
andrewnester
approved these changes
Apr 28, 2026
1 task
denik
added a commit
that referenced
this pull request
Apr 29, 2026
PR #5104 (80f7a54) renamed the secret_scopes/basic per-step files from *.json to *.txt when migrating to gron.py --sort-arrays. The regen commit 4d38526cc on this branch accidentally resurrected the old .json file with stale content. The script writes .txt, so the .json is unused and test-update flags it as an unexpected output. Task: 010.md Co-authored-by: Isaac
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
bundle/resources/permissions/jobs/delete_one/{local,cloud}into a single test that runs in both modes (Local=true, Cloud=true).--sort-arrays KEY1,KEY2flag toacceptance/bin/gron.pyfor canonicalizing commutative arrays before flattening; replacesacceptance/bin/sort_acls_json.py(deleted).secret_scopes/basicwas the other caller ofsort_acls_json.pyand is migrated togron.py --sort-arrays aclsin the same change.Test plan
go test ./acceptance -run 'TestAccept/bundle/resources/permissions'— 34 pass, 0 fail, 3 cloud-only skipped.go test ./acceptance -run 'TestAccept/bundle/resources/secret_scopes/basic$'— pass on terraform + direct.testme-awsagainstaws-prod-ucwsforbundle/resources/permissions/jobs/delete_one— pass on terraform + direct.This pull request was AI-assisted by Isaac.