Skip to content

apply: include sensitive metadata when comparing changed input values#37582

Merged
liamcervante merged 2 commits intomainfrom
liamcervante/37563
Sep 10, 2025
Merged

apply: include sensitive metadata when comparing changed input values#37582
liamcervante merged 2 commits intomainfrom
liamcervante/37563

Conversation

@liamcervante
Copy link
Copy Markdown
Contributor

This PR updates the output for when input values have erroneously changed between plan and apply so that sensitive input values are hidden in the error message.

This approach just rechecks the actual configuration for sensitive values, and applies those marks to the rendered outputs. Interestingly, the plan itself does not contain the information from the configuration, even those it does have room for the marks to be added. This comment suggests that this is deliberate, so I didn't change that behaviour.

Another approach would be to change that behaviour and add the marks from the config during the plan stage, and then just apply the marks from the plan instead of rechecking the config. I was worried about unintended side effects etc, so I went with just rechecking the config but am happy to go and make the more complete change if anyone feels strongly about it.

Fixes #37563

Target Release

1.13.2

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

@liamcervante liamcervante added the 1.13-backport If you add this label to a PR before merging, backport-assistant will open a new PR once merged label Sep 10, 2025
@liamcervante liamcervante requested a review from a team as a code owner September 10, 2025 07:59
@liamcervante liamcervante merged commit 00d680d into main Sep 10, 2025
7 checks passed
@liamcervante liamcervante deleted the liamcervante/37563 branch September 10, 2025 09:11
@github-actions
Copy link
Copy Markdown
Contributor

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Oct 11, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

1.13-backport If you add this label to a PR before merging, backport-assistant will open a new PR once merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Sensitive values exposed in logs when 'Ignoring variable when applying a saved plan'

2 participants