/st2

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.

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

Add "Note" in the CLI if API has default query "limit=50" and update rule endpoint help #3514

Merged
merged 14 commits into from Jul 3, 2017

Conversation

Reviewers

@Kami Kami

@armab armab

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.3.1
3 participants
@humblearner @Kami @armab
@humblearner
Contributor

humblearner commented Jun 23, 2017 •
edited

Changes:

$ st2 rule list
+---------------------------------+--------+---------------------------------+---------+
| ref                             | pack   | description                     | enabled |
+---------------------------------+--------+---------------------------------+---------+
| github.deploy_pack_on_deploymen | github | Trigger an ST2 pack.install     | False   |
| t_event                         |        | when receiving a deployment     |         |
                ~~~~~~~~~~~~~~~~~~~~~~~
                ~~~~~~~~~~~~~~~~~~~~~~~
| st2cd.st2_pkg_test_stable_u16_e | st2cd  | Test stable packages            | True    |
| nterprise                       |        |                                 |         |
+---------------------------------+--------+---------------------------------+---------+
+-----------------------------------------------------------------------------------------+
| Note: Only first 50 results are displayed. Use -n/--last flag for more results, if any. |
+-----------------------------------------------------------------------------------------+

$ st2 rule list -h
usage: st2 rule list [-h] [-t TOKEN] [--api-key API_KEY] [-j] [-y]
                     [-a ATTR [ATTR ...]] [-w WIDTH [WIDTH ...]] [-n LAST]
                     [--iftt] [-p PACK] [-c ACTION] [-g TRIGGER]
                     [--enabled | --disabled]

Get the list of the 50 most recent rules.

optional arguments:
                ~~~~~~~~~~~~~~~~~~~~~~~
                ~~~~~~~~~~~~~~~~~~~~~~~
  -n LAST, --last LAST  List N most recent rules. Default is 50.

CLI Updated:

  • rule
  • execution
  • triggerinstance
  • trace
  • rule_enforcement

Functionality:

  • Dynamically display note (in stderr) if # of entries are greater than limit (default or set by -n flag).
  • Only in (default) table format, not in json or yaml.

Addresses: #3488
@Kami

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 26, 2017

Member

LGTM, but we should also do the change @armab suggested aka printing out "there are more results" when using CLI in user-friendly (table) mode (we don't want to print that when using --json or --yaml flag).
Member

Kami commented Jun 26, 2017

LGTM, but we should also do the change @armab suggested aka printing out "there are more results" when using CLI in user-friendly (table) mode (we don't want to print that when using --json or --yaml flag).
@Kami

Kami approved these changes Jun 26, 2017
View changes

st2client/st2client/commands/rule.py
resource.get_plural_display_name().lower()))
self.parser.add_argument('--iftt', action='store_true',
help='Show trigger and action in display list.')
self.parser.add_argument('-p', '--pack', type=str,

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 26, 2017

Member

Perhaps we should add changelog entry for this change.
Copy URL
@Kami

Kami Jun 26, 2017

Member

Perhaps we should add changelog entry for this change.

This comment has been minimized.

Show comment
Hide comment
@humblearner

humblearner Jun 27, 2017

Contributor

Yes, once all the changes are ok, I'll update the changelog.
Copy URL
@humblearner

humblearner Jun 27, 2017

Contributor

Yes, once all the changes are ok, I'll update the changelog.
st2client/st2client/commands/rule.py
@@ -34,20 +34,26 @@ def __init__(self, description, app, subparsers, parent_parser=None):
self.commands['disable'] = RuleDisableCommand(self.resource, self.app, self.subparsers)
class RuleListCommand(resource.ContentPackResourceListCommand):
class RuleListCommand(resource.ResourceTableCommand):

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 26, 2017

Member

Just curious why the inherit class change was needed.
Copy URL
@Kami

Kami Jun 26, 2017

Member

Just curious why the inherit class change was needed.
@armab

This comment has been minimized.

Show comment
Hide comment
@armab

armab Jun 26, 2017

Member

True, without explicit note that only first 50 results are showed up, - it's not user friendly and doesn't solve the confusion.
As said in #3488 to be consistent we need to check if all CLI commands have this feature as well.
Member

armab commented Jun 26, 2017

True, without explicit note that only first 50 results are showed up, - it's not user friendly and doesn't solve the confusion.
As said in #3488 to be consistent we need to check if all CLI commands have this feature as well.

Anirudh Rekhi added some commits Jun 27, 2017

Anirudh Rekhi
Add note for more than 50(default) rules
Loading status checks…
64f6af4
Anirudh Rekhi
Hide note if flag for action or trigger is used
Loading status checks…
6981123
@humblearner

This comment has been minimized.

Show comment
Hide comment
@humblearner

humblearner Jun 27, 2017

Contributor

Besides rules, the default limit=50 is set for: rule_enforcement, execution, triggerinstance and trace. If above Note change is ok, then I'll add it to the above CLIs as well.
Contributor

humblearner commented Jun 27, 2017 •
edited

Besides rules, the default limit=50 is set for: rule_enforcement, execution, triggerinstance and trace. If above Note change is ok, then I'll add it to the above CLIs as well.
@Kami

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 27, 2017

Member

Yeah, that note works for me, but maybe we could also make it more dynamic and only display the note if there are in fact more results.

We could do that by utilizing X- headers returned by the API, bit it could also make it a bit more complex and require more refactoring, because headers and raw response objects are not available in those methods right now.
Member

Kami commented Jun 27, 2017

Yeah, that note works for me, but maybe we could also make it more dynamic and only display the note if there are in fact more results.

We could do that by utilizing X- headers returned by the API, bit it could also make it a bit more complex and require more refactoring, because headers and raw response objects are not available in those methods right now.

@Kami Kami added this to the 2.3.1 milestone Jun 27, 2017

@humblearner humblearner changed the title from Add default rule list limit to 50 message in help to Add default rule list limit to 50 messages in help Jun 28, 2017

st2client/st2client/commands/trace.py
attributes=args.attr, widths=args.width,
json=args.json, yaml=args.yaml,
attribute_transform_functions=self.attribute_transform_functions)
if args.json or args.yaml:

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 28, 2017

Member

It looks like this is repeated in quite some places so eventually it will need some refactor, but it should be fine for now.
Copy URL
@Kami

Kami Jun 28, 2017

Member

It looks like this is repeated in quite some places so eventually it will need some refactor, but it should be fine for now.
Show outdated Hide outdated st2client/st2client/models/core.py
Show outdated Hide outdated st2client/st2client/commands/action.py
Show outdated Hide outdated st2client/st2client/formatters/table.py

@humblearner humblearner changed the title from Add default rule list limit to 50 messages in help to Add "Note" in the CLI if API has default query "limit=50" and update rule endpoint help Jun 29, 2017

Show outdated Hide outdated st2client/st2client/formatters/table.py
st2client/st2client/commands/triggerinstance.py
self.print_output(reversed(instances), table.MultiColumnTable,
attributes=args.attr, widths=args.width,
attribute_transform_functions=self.attribute_transform_functions)
if args.last >= self.default_limit and count and int(count) > args.last:

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jun 29, 2017

Member

It looks like it doesn't correctly handle a scenario where you pass in -n 1 for example but there are more results.

So this logic needs to be changed to handle that scenario as well.
Copy URL
@Kami

Kami Jun 29, 2017

Member

It looks like it doesn't correctly handle a scenario where you pass in -n 1 for example but there are more results.

So this logic needs to be changed to handle that scenario as well.

This comment has been minimized.

Show comment
Hide comment
@humblearner

humblearner Jun 29, 2017

Contributor

Hmm, it is working for me. If n > default limit then show the note, otherwise, just show the result.

$ st2 rule-enforcement list -n 1
+--------------------------+----------------------+----------------------+----------------------+----------------------+
| id                       | rule.ref             | trigger_instance_id  | execution_id         | enforced_at          |
+--------------------------+----------------------+----------------------+----------------------+----------------------+
| 5952ab31909a5027b65c037b | st2ci.st2_pkg_test_a | 5952ab30909a5027b65c | 5952ab30909a5027b65c | 2017-06-27T19:00:00. |
|                          | nd_promote_unstable_ | 036e                 | 037a                 | 858196Z              |
|                          | u16                  |                      |                      |                      |
+--------------------------+----------------------+----------------------+----------------------+----------------------+

$ st2 execution list -n 1
+--------------------------+------------+--------------+------------------------+------------------+---------------+
| id                       | action.ref | context.user | status                 | start_timestamp  | end_timestamp |
+--------------------------+------------+--------------+------------------------+------------------+---------------+
| 595467b3909a5015dab1c8b9 | core.local | stanley      | succeeded (1s elapsed) | Thu, 29 Jun 2017 | Thu, 29 Jun   |
|                          |            |              |                        | 02:36:35 UTC     | 2017 02:36:36 |
|                          |            |              |                        |                  | UTC           |
+--------------------------+------------+--------------+------------------------+------------------+---------------+

$ st2 trigger-instance list -n 1
+--------------------------+---------------------------+---------------------------+-----------+
| id                       | trigger                   | occurrence_time           | status    |
+--------------------------+---------------------------+---------------------------+-----------+
| 59546ab5909a5045fc0d0882 | core.st2.key_value_pair.c | Thu, 29 Jun 2017 02:49:25 | processed |
|                          | reate                     | UTC                       |           |
+--------------------------+---------------------------+---------------------------+-----------+
Copy URL
@humblearner

humblearner Jun 29, 2017

Contributor

Hmm, it is working for me. If n > default limit then show the note, otherwise, just show the result.

$ st2 rule-enforcement list -n 1
+--------------------------+----------------------+----------------------+----------------------+----------------------+
| id                       | rule.ref             | trigger_instance_id  | execution_id         | enforced_at          |
+--------------------------+----------------------+----------------------+----------------------+----------------------+
| 5952ab31909a5027b65c037b | st2ci.st2_pkg_test_a | 5952ab30909a5027b65c | 5952ab30909a5027b65c | 2017-06-27T19:00:00. |
|                          | nd_promote_unstable_ | 036e                 | 037a                 | 858196Z              |
|                          | u16                  |                      |                      |                      |
+--------------------------+----------------------+----------------------+----------------------+----------------------+

$ st2 execution list -n 1
+--------------------------+------------+--------------+------------------------+------------------+---------------+
| id                       | action.ref | context.user | status                 | start_timestamp  | end_timestamp |
+--------------------------+------------+--------------+------------------------+------------------+---------------+
| 595467b3909a5015dab1c8b9 | core.local | stanley      | succeeded (1s elapsed) | Thu, 29 Jun 2017 | Thu, 29 Jun   |
|                          |            |              |                        | 02:36:35 UTC     | 2017 02:36:36 |
|                          |            |              |                        |                  | UTC           |
+--------------------------+------------+--------------+------------------------+------------------+---------------+

$ st2 trigger-instance list -n 1
+--------------------------+---------------------------+---------------------------+-----------+
| id                       | trigger                   | occurrence_time           | status    |
+--------------------------+---------------------------+---------------------------+-----------+
| 59546ab5909a5045fc0d0882 | core.st2.key_value_pair.c | Thu, 29 Jun 2017 02:49:25 | processed |
|                          | reate                     | UTC                       |           |
+--------------------------+---------------------------+---------------------------+-----------+
Show outdated Hide outdated CHANGELOG.rst
st2client/st2client/formatters/table.py
value = transform_function(value=value)
value = strutil.unescape(value)
values.append(value)
table.add_row(values)
# width for the note
global table_width

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jul 3, 2017

Member

I will test it and go ahead and merge it if everything look OK so it will end up in v2.3.1, but we really need to refactor and fix this global variable thing since it's not robust and could cause issues.
Copy URL
@Kami

Kami Jul 3, 2017

Member

I will test it and go ahead and merge it if everything look OK so it will end up in v2.3.1, but we really need to refactor and fix this global variable thing since it's not robust and could cause issues.
@Kami
Re-word changelog entry.
Loading status checks…
cd3bb60
@Kami

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jul 3, 2017

Member

I'll go ahead and merge this so we can start testing changes for v2.3.1 release, but please look into getting rid of the global variable as soon as you get a chance.
Member

Kami commented Jul 3, 2017

I'll go ahead and merge this so we can start testing changes for v2.3.1 release, but please look into getting rid of the global variable as soon as you get a chance.

@Kami Kami merged commit 62256ef into master Jul 3, 2017
2 of 4 checks passed

2 of 4 checks passed

codecov/patch 41.67% of diff hit (target 78.37%)
Details
st2/packages Packages are building
Details
ci/circleci Your tests passed on CircleCI!
Details
codecov/project 78.31% (-0.07%) compared to 6230973
Details

@armab armab deleted the rule_50_limit_st2client branch Jul 3, 2017

@armab armab referenced this pull request Jul 3, 2017

Closed

'st2 rule list' is limited to 50 results #3488

@Kami

This comment has been minimized.

Show comment
Hide comment
@Kami

Kami Jul 5, 2017

Member

@humblearner It would be great if you can also work on automated robot tests for this CLI functionality - so testing all the common scenarios + edge cases.

CLI is one of the places where we lack tests and regressions are easy to introduce so we should invest some time in more automated tests.
Member

Kami commented Jul 5, 2017

@humblearner It would be great if you can also work on automated robot tests for this CLI functionality - so testing all the common scenarios + edge cases.

CLI is one of the places where we lack tests and regressions are easy to introduce so we should invest some time in more automated tests.

Kami added a commit to StackStorm-Exchange/stackstorm-st2 that referenced this pull request Jul 25, 2017

@Kami
Fix all actions which use client.query() method to correctly handle the 
result.

In StackStorm v2.3.0, breaking client change has been introduced for
query method as part of StackStorm/st2#3514.
6c8b13f

@Kami Kami referenced this pull request Jul 25, 2017

Closed

Fix all actions which use client.query() method #4

@humblearner humblearner referenced this pull request Sep 1, 2017

Closed

v2.3 Running the "st2 key list" command returns 100 entries vs all #3708

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment