Fix secret scope ACL deletion loop exiting early on NotFound #4212
+1
−1
Conversation
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
pietern
requested review from
andrewnester,
anton-107,
denik and
shreyas-goenka
as code owners
pietern
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
denik
reviewed
Jan 7, 2026
| title "Manually delete one ACL to simulate race condition" | ||
| # This simulates a race condition where an ACL is deleted between when we | ||
| # list them and when bundle deploy tries to delete them | ||
| trace $CLI secrets delete-acl test-scope [email protected] |
Contributor
There was a problem hiding this comment.
how can sequential call before "bundle deploy" simulate race condition?
If I understand correctly the race condition this refers too is the one in setACLs() function which indeed does list + delete,
Contributor
Author
There was a problem hiding this comment.
It turned out this was a red herring when investigating the flaky test. It happens exclusively with TF.
The fix in this PR is real but the acceptance test doesn't properly test the fix. It can be useful in general though.
I will remove the acceptance test from this PR and verify that it adds real coverage before submitting it again.
andrewnester
approved these changes
Jan 7, 2026
denik
reviewed
Jan 7, 2026
| # list them and when bundle deploy tries to delete them | ||
| trace $CLI secrets delete-acl test-scope [email protected] | ||
|
|
||
| trace $CLI bundle deploy |
Contributor
There was a problem hiding this comment.
suggestion: add readplan variant to this test, it's a few lines of bash to make it test that this still works with deploy --plan:
% git grep -i readplan acceptance/bundle/resources/jobs/delete_task/
acceptance/bundle/resources/jobs/delete_task/script:$CLI bundle deploy $(readplanarg out.plan_create.direct.json)
acceptance/bundle/resources/jobs/delete_task/script:$CLI bundle deploy $(readplanarg out.plan_update.direct.json)
acceptance/bundle/resources/jobs/delete_task/test.toml:EnvMatrix.READPLAN = ["", "1"]
Collaborator
|
Commit: 9cc0aa3
40 interesting tests: 24 KNOWN, 11 FAIL, 4 flaky, 1 SKIP
Top 32 slowest tests (at least 2 minutes):
|
When deleting multiple secret scope ACLs, if one ACL returns NotFound (due to race conditions or eventual consistency), the code would return nil and exit the loop early. This prevented remaining ACLs from being deleted. Changed to continue to skip NotFound errors and proceed with remaining deletions.
pietern
force-pushed
the
secret-scope-flakiness-fix
branch
from
9cc0aa3 to
ba3d55f
Compare
pietern
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
When deleting multiple secret scope ACLs, if one ACL returns NotFound (due to race conditions or eventual consistency), the code would
return niland exit the loop early. This prevented remaining ACLs from being deleted. Changed tocontinueto skip NotFound errors and proceed with remaining deletions.Tests
Only static analysis, no tests.