[1.28] Backport the unified syspurpose command #2745
Merged
Conversation
This file contains 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
ptoscano
force-pushed
the
ptoscano/unified-syspurpose-1.28
branch
4 times, most recently
from
97ffeb6
to
7cfa22c
Compare
|
@ptoscano BTW: can you please write some summary about missing parts in this PR? |
ptoscano
force-pushed
the
ptoscano/unified-syspurpose-1.28
branch
from
7cfa22c
to
65a713b
Compare
* Added new syspurpose command * It has only --show option at this moment * When system is registered, then the sub-man tries to get consumer's syspurpose valyes and then do three-way merge * When system is not registered, then it is possible only display values stored in /etc/rhsm/syspurpose/syspurpose.json * When no options is provided, then current syspurpose values are displayed too * Added unit tests for new command * Modified a little bit behavior of other syspurpose commands (role, usage, addons, service-level). When the system is not registered, then --show option print current syspurpose value stored in /etc/rhsm/syspurpose/syspurpose.json (cherry picked from commit c677cee)
(cherry picked from commit 3476755)
(cherry picked from commit eef1bb1) PT: the changes to the all the Command classes were done in managercli.
Adapt the sed regexp scraping the help text of config after the switch from optparse to argparse. In particular, the help text for options with arguments changed from "--foo=VALUE" to "--foo VALUE". (cherry picked from commit 45526cd)
With the old optparse implementation, there was a single callback to fill 'repo_actions' with the various values of the --enable & --disable options, in the same order they were specified on the command line. Commit eef1bb1 switched to argparse, and switched to different destination lists for --enable & --disable, mixing them back to a single list with first all the repos to enabled and then all the repos to disable. As result, the order of intermixed --enable & --disable was lost. To revert back to the wanted behaviour, implement a custom argparse.Action for --enable & --disable that appends all the actions to the same list in the same order they were specified. This removes the need for post-processing later on. Card-ID: ENT-4146 (cherry picked from commit 8ac4b0f)
They have always been processed in the same order they were specified, however this behaviour has never been explicitly noted. Since this behaviour is wanted, mention it explicitly for good. (cherry picked from commit ef10c18)
ptoscano
force-pushed
the
ptoscano/unified-syspurpose-1.28
branch
from
65a713b
to
75528bb
Compare
* BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1983144 * Card ID: ENT-4233 When unknown subcommand or argument is supplied, an error message is printed and sub-man exits. This commit changes the error message to be the same as it was before we switched from optparse to argparse. (cherry picked from commit 8075c66)
According to the documentation, ArgumentParser.parse_known_args() seems to work without the command name as first argument. Since CliCommand is parsing the parameters of a specific command, we can drop the command itself in addition to the application name before calling ArgumentParser.parse_known_args(); this avoids the need to drop it after parsing. In addition, tweak the check for missing test arguments: 'if not foo' is also matched by an empty list, which now is a valid list of arguments to pass for tests. Hence, change it to check for None explicitly. Adapt the tests accordingly. (cherry picked from commit d765110)
By default, a '--show' option in ArgumentParser is saved as a namespace variable 'show'. While it is currently not a problem for the '--show' option of the 'syspurpose' command, it will be a problem when adding the options of the other syspurpose subcommands as subparsers of the 'syspurpose' command. Hence, bind the ArgumentParser option result to a less generic variable name to avoid clashes. (cherry picked from commit 2fe0df6)
As an effort to consolidate the handling of all the syspurpose attributes in a single place, make sure that all the syspurpose attributes are handled as subcommands of the 'syspurpose' command (leaving the old commands as deprecated). Make AbstractSyspurposeCommand able to override the ArgumentParser created by AbstractCLICommand (its grandparent class), so it is possible to create a subparser instead of a standalone parser. Then, make SyspurposeCommand create all the syspurpose subcommands, with their parsers created as subparsers of it; properly dispatch the parsed command line options to the right subcommand when SyspurposeCommand is executed. Finally, change the short description of each subcommand to say that is deprecated when shown in the list of the subscription-command commands. (cherry picked from commit 5406865)
Create a custom 'prog' placeholder for subparsers of the 'syspurpose' command: this way, they will not have the usage string of the 'syspurpose' command (which includes a '[OPTIONS]' help marker). (cherry picked from commit d94fd30)
Use a custom usage string for the 'syspurpose' command, so we can mention that this command may take a submodule to use. (cherry picked from commit 40f2e9f)
* Card ID: ENT-4013 * BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1974641 After the syspurpose was added as subcommand in 5406865 the 'prev' variable was not always set correctly. For the first argument the completion worked fine, but for the second (and further) the last argument was picked up instead of the last subcommand. This change iterates over the CLI arguments and uses the last word that does not start with a dash, skipping all arguments and finding the last subcommand. (cherry picked from commit 192e98b)
ptoscano
force-pushed
the
ptoscano/unified-syspurpose-1.28
branch
from
75528bb
to
de94e92
Compare
jirihnidek
approved these changes
Sep 3, 2021
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.
This is a backport of various commits from
mainto bring the unifiedsyspurposesubcommand to subscription-manager 1.28.x.This includes a number of work to:
syspurposecommandoptparsetoargparse, needed for using subparserssyspurpose, leaving their top-level versions as deprecatedincluding all the followup fixes needed for each.
The PRs are, in order of their cherry-pick:
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2000883
Card ID: ENT-4303