diff --git a/CHANGELOG.md b/CHANGELOG.md index fc1930df18..b4dfffb300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,9 @@ ENHANCEMENTS: * Added 'availableUpgrades' field to Resources in GET/GET all Resources endpoints. The field indicates whether there are template versions that a resource can be upgraded to [#3234](https://github.com/microsoft/AzureTRE/pull/3234) * Update Porter (1.0.11), Docker (23.0.3), Terraform (1.4.5) ([#3430](https://github.com/microsoft/AzureTRE/issues/3430)) - BUG FIXES: * Fix ENABLE_SWAGGER configuration being ignored in CI ([#3355](https://github.com/microsoft/AzureTRE/pull/3355)) +* Set yq output format when reading a json file ([#3441](https://github.com/microsoft/AzureTRE/pull/3441)) COMPONENTS: @@ -71,7 +71,6 @@ BUG FIXES: * Remove auth private endpoint from databricks workspace service ([3199](https://github.com/microsoft/AzureTRE/pull/3199)) * Fix DNS conflict in airlock-review workspace that could make the entire airlock module inoperable ([#3215](https://github.com/microsoft/AzureTRE/pull/3215)) - COMPONENTS: | name | version | diff --git a/devops/scripts/load_and_validate_env.sh b/devops/scripts/load_and_validate_env.sh index 6fedde377b..32c4df3763 100755 --- a/devops/scripts/load_and_validate_env.sh +++ b/devops/scripts/load_and_validate_env.sh @@ -33,7 +33,7 @@ else fi # Get any default entries from config schema and export. Any values in config.yaml will override these defaults - DEFAULT_VALUES=$(yq '[... |select(has("default"))| {"":path | .[-1] | upcase , " ": .default }| to_entries| map("=" + .value)|join("") ]' config_schema.json) + DEFAULT_VALUES=$(yq '[... |select(has("default"))| {"":path | .[-1] | upcase , " ": .default }| to_entries| map("=" + .value)|join("") ]' --output-format=yaml config_schema.json) # Format env string DEFAULT_VALUES=${DEFAULT_VALUES//"- ="}