Fix changed variable name + add quotes to avoid warning in case of no diff

This commit is contained in:
RLRabinowitz 2023-08-28 14:12:07 +03:00
parent c67cf3a522
commit a3a9f95bb2
2 changed files with 3 additions and 3 deletions

View File

@ -46,7 +46,7 @@ jobs:
shell: bash shell: bash
run: | run: |
changed_execution_time=$(git diff --quiet -S "complete after 0s" -- testing/equivalence-tests/outputs || echo true) changed_execution_time=$(git diff --quiet -S "complete after 0s" -- testing/equivalence-tests/outputs || echo true)
if [[ $changed == "true" ]]; then if [[ "$changed_execution_time" == "true" ]]; then
echo "Found changes in the execution times in the result outputs. Defaulting the execution times to 0" echo "Found changes in the execution times in the result outputs. Defaulting the execution times to 0"
find testing/equivalence-tests/outputs -type f -name "apply.json" -exec sed -E -i 's/complete after [0-9]+s/complete after 0s/g' {} + find testing/equivalence-tests/outputs -type f -name "apply.json" -exec sed -E -i 's/complete after [0-9]+s/complete after 0s/g' {} +
find testing/equivalence-tests/outputs -type f -name "apply.json" -exec sed -E -i 's/\"elapsed_seconds\"\: [0-9]+/\"elapsed_seconds\"\: 0/g' {} + find testing/equivalence-tests/outputs -type f -name "apply.json" -exec sed -E -i 's/\"elapsed_seconds\"\: [0-9]+/\"elapsed_seconds\"\: 0/g' {} +
@ -58,7 +58,7 @@ jobs:
shell: bash shell: bash
run: | run: |
changed=$(git diff --quiet -- testing/equivalence-tests/outputs || echo true) changed=$(git diff --quiet -- testing/equivalence-tests/outputs || echo true)
if [[ $changed == "true" ]]; then if [[ "$changed" == "true" ]]; then
echo "Found changes, please commit the new golden files." echo "Found changes, please commit the new golden files."
git diff -- testing/equivalence-tests/outputs git diff -- testing/equivalence-tests/outputs
exit 1 exit 1

View File

@ -48,7 +48,7 @@
"addr": "tfcoremock_list.list", "addr": "tfcoremock_list.list",
"implied_provider": "tfcoremock", "implied_provider": "tfcoremock",
"module": "", "module": "",
"resource": "tfcoremock_list.list", "resource": "tdfcoremock_list.list",
"resource_key": null, "resource_key": null,
"resource_name": "list", "resource_name": "list",
"resource_type": "tfcoremock_list" "resource_type": "tfcoremock_list"