refactor: simplify components.json code #7742
Draft
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
There are no more instances of this. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
There are no more instances of this. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
jq is very powerful, you know. :) Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
github-actions
bot
added
the
components
chewi
force-pushed
the
chewi/simplify-components
branch
from
b43d562 to
33c1e10
Compare
testPackagesInstalled() was not testing OS Guard properly because OS and OS_VERSION were being set to Ubuntu and 3.0, matching nothing from components.json. Several components are not installed for OS Guard, but rather than add yet more shell code to handle this, simplify things by making it possible to use the OS variant in components.json. OS Guard's VARIANT_ID is osguard, but this is upper-cased by our scripts. Use DEFAULT to match an OS without VARIANT_ID. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
chewi
force-pushed
the
chewi/simplify-components
branch
from
33c1e10 to
2422aa9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
Firstly, this drops compatibility fallbacks for
versionsandmultiArchVersionsin components.json. There are no more instances of these.Secondly, this massively simplifies the associated code involving
jq. It's a powerful tool. 🙂Lastly, this allow the OS variant to be used in components.json for OS Guard.
testPackagesInstalled()was not testing OS Guard properly becauseOSandOS_VERSIONwere being set toUbuntuand3.0, matching nothing from components.json.Several components are not installed for OS Guard, but rather than add yet more shell code to handle this, simplify things by making it possible to use the OS variant in components.json. OS Guard's
VARIANT_IDisosguard, but this is upper-cased by our scripts. UseDEFAULTto match an OS withoutVARIANT_ID.