Skip to content

Remove unused function secrets merge behavior - #12026

Open
sarah (satvu) wants to merge 2 commits into
devfrom
satvu-remove-unused-merge
Open

sarah (satvu) wants to merge 2 commits into
devfrom
satvu-remove-unused-merge

Conversation

@satvu

@satvu sarah (satvu) commented Sep 16, 2026 •

Copy link
Copy Markdown
Member

Issue describing the changes in this PR

Resolves #11996

Summary

Removes the unused merged parameter from ISecretManager.GetFunctionSecretsAsync and deletes the associated host/function key merge behavior.

The merged: true path had no production callers and could throw an ArgumentException when function-scoped and host-scoped keys differed only by casing. Tests, mocks, and test implementations have been updated to use the simplified method signature, and the merge-specific test has been removed.

This is not a customer-facing breaking change. ISecretManager is an internal product library that is not consumed directly by customers, and the only caller of the merge behavior was removed previously.

Validation

  • Affected unit tests: 145 passed
  • Focused integration tests: 3 passed

Pull request checklist

IMPORTANT: Currently, changes must be backported to the in-proc branch to be included in Core Tools and non-Flex deployments.

  • Backporting to the in-proc branch is not required
    • Otherwise: Link to backporting PR
  • My changes do not require documentation changes
    • Otherwise: Documentation issue linked to PR
  • My changes should not be added to the release notes for the next release
    • Otherwise: I've added my notes to release_notes.md
  • My changes do not need to be backported to a previous version
    • Otherwise: Backport tracked by issue/PR #issue_or_pr
  • My changes do not require diagnostic events changes
    • Otherwise: I have added/updated all related diagnostic events and their documentation
  • I have added or updated all required tests

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@satvu
sarah (satvu) requested review from Mathew Charles (mathewc) and a lite review from Copilot September 16, 2026 21:49
@satvu
sarah (satvu) marked this pull request as ready for review September 16, 2026 21:50
@satvu
sarah (satvu) requested a review from a team as a code owner September 16, 2026 21:50

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

Update the stale coldstart.jittrace reference to the removed overload.

Get a fresh assessment by requesting another Copilot review.

Pull request overview

Removes the unused merged parameter and host/function secret merge behavior, updating implementations and tests.

Changes:

  • Simplifies GetFunctionSecretsAsync.
  • Updates mocks, callers, and test implementations.
  • Removes merge-specific test coverage.
File summaries
File Summary
test/WebJobs.Script.Tests/Security/SecretManagerTests.cs Updates secret manager tests.
test/WebJobs.Script.Tests/Managment/WebFunctionsManagerTests.cs Updates test callers.
test/WebJobs.Script.Tests/Controllers/Admin/KeysControllerTests.cs Updates key controller tests.
test/WebJobs.Script.Tests.Shared/TestSecretManager.cs Updates the test secret manager.
test/WebJobs.Script.Tests.Integration/Management/FunctionsSyncManagerTests.cs Updates integration tests.
test/WebJobs.Script.Tests.Integration/Controllers/Keys/KeyManagementFixture.cs Updates key management fixtures.
test/WebJobs.Script.Tests.Integration/Controllers/Keys/GetFunctionKeysScenario.cs Updates function key scenarios.
src/WebJobs.Script.WebHost/Security/KeyManagement/SecretManager.cs Removes merge behavior and parameter.
src/WebJobs.Script.WebHost/Security/KeyManagement/ISecretManager.cs Simplifies the interface contract.
Review details
  • Files reviewed: 9/9 changed files
  • Comments generated: 1
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/WebJobs.Script.WebHost/Security/KeyManagement/SecretManager.cs
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No unresolved review issues were identified.

Review details
  • Files reviewed: 10/10 changed files
  • Comments generated: 0 new
  • Review effort level: Lite

@satvu

Copy link
Copy Markdown
Member Author

Waiting for #11722 to go in first

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

GetFunctionSecretsAsync(merged: true) can throw a duplicate-key ArgumentException

3 participants