Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid a warning when yq reads a json file #3441

Merged
merged 6 commits into from
Apr 16, 2023
Merged

Avoid a warning when yq reads a json file #3441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dd994f
Fix yq output format when reading json file
tamirkamara Apr 16, 2023
ff48eba
changelog
tamirkamara Apr 16, 2023
eba99ac
changelog
tamirkamara Apr 16, 2023
322d188
changelog
tamirkamara Apr 16, 2023
504a591
Merge branch 'main' into tamirkamara/fix-yq-with-json
tamirkamara Apr 16, 2023
33f64c0
Merge branch 'main' into tamirkamara/fix-yq-with-json
tamirkamara Apr 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion devops/scripts/load_and_validate_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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//"- ="}

Expand Down