chore(provisioner/terraform): minimize testdata diff #16908
Merged
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
It was hard to deduce whether or not changes in our terraform testdata are relevant or not, so we now have a rudimentary filter for randomly generated values that aren't relevant for the testdata.
162fbc3 to
fea7f9e
Compare
johnstcn
approved these changes
Mar 13, 2025
Comment on lines
26
to
66
| minimize_diff() { | ||
| for f in *.tf*.json; do | ||
| declare -A deleted=() | ||
| declare -a sed_args=() | ||
| while read -r line; do | ||
| # Deleted line (previous value). | ||
| if [[ $line = -\ * ]]; then | ||
| key="${line#*\"}" | ||
| key="${key%%\"*}" | ||
| value="${line#*: }" | ||
| value="${value#*\"}" | ||
| value="${value%\"*}" | ||
| declare deleted["$key"]="$value" | ||
| # Added line (new value). | ||
| elif [[ $line = +\ * ]]; then | ||
| key="${line#*\"}" | ||
| key="${key%%\"*}" | ||
| value="${line#*: }" | ||
| value="${value#*\"}" | ||
| value="${value%\"*}" | ||
| # Matched key, restore the value. | ||
| if [[ -v deleted["$key"] ]]; then | ||
| sed_args+=(-e "s|${value}|${deleted["$key"]}|g") | ||
| unset deleted["$key"] | ||
| fi | ||
| fi | ||
| if [[ ${#sed_args[@]} -gt 0 ]]; then | ||
| # Handle macOS compat. | ||
| if sed -h 2>&1 | grep -q "\[-i extension\]"; then | ||
| sed -i '' "${sed_args[@]}" "$f" | ||
| else | ||
| sed -i'' "${sed_args[@]}" "$f" | ||
| fi | ||
| fi | ||
| done < <( | ||
| # Filter out known keys with autogenerated values. | ||
| git diff -- "$f" | | ||
| grep -E "\"(terraform_version|id|agent_id|resource_id|token|random|timestamp)\":" | ||
| ) | ||
| done | ||
| } |
There was a problem hiding this comment.
I think this can be performed by jq using walk or similar?
jq 'walk(if type == "object" then with_entries(select(.key | test("(terraform_version|id|agent_id|resource_id|token|random|timestamp)") | not)) else . end)'
There was a problem hiding this comment.
I think that would give you the current value, but not the previous (or whether or not it changed) 🤔.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
It was hard to deduce whether or not changes in our terraform testdata
are relevant or not, so we now have a rudimentary filter for randomly
generated values that aren't relevant for the testdata.
With this change we could technically run this in CI as well, I believe.