Merge branch 'master' into consumer_shutdown

Author: cognifloyd

OWNERS.md

@@ -17,6 +17,8 @@ Responsible for Project Strategy, External Relations, Organizational aspects, Pa
 ###### 2 vote points
 Senior [@StackStorm/maintainers](https://github.com/orgs/StackStorm/teams/maintainers) are part of Technical Steering Committee.
 Have deep platform knowledge & experience and demonstrate technical leadership as well as driving the project forward.
+* Amanda McGuinness ([@amanda11](https://github.com/amanda11)), _Ammeon Solutions_ <<[email protected]>>
+  - Ansible, Core, deb/rpm packages, CI/CD, Deployments, Release Engineering, Infrastructure, Documentation.
 * blag ([@blag](https://github.com/blag)) <<[email protected]>>
   - ChatOps, StackStorm Exchange, Community, Documentation, CI/CD.
 * Eugen Cusmaunsa ([@armab](https://github.com/armab)) <<[email protected]>>
@@ -31,13 +33,17 @@ Have deep platform knowledge & experience and demonstrate technical leadership a
 # Maintainers *
 ###### 1 vote points
 Being part of Technical Steering Committee (TSC) [@StackStorm/maintainers](https://github.com/orgs/StackStorm/teams/maintainers) provide significant and reliable value to the project helping it grow and improve through development and maintenance. See [Maintainer Responsibilities](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#maintainer-responsibilities) for more info.
-* Amanda McGuinness ([@amanda11](https://github.com/amanda11)) <<[email protected]>>
-  - Ansible, Core, deb/rpm packages, CI/CD, Deployments, StackStorm Exchange, Documentation.
+* AJ Jonen ([@guzzijones](https://github.com/guzzijones)), _Cypherint_ <<[email protected]>>
+  - Workflows, st2 Core Performance, Releases.
+* Carlos ([@nzlosh](https://github.com/nzlosh)) <<[email protected]>>
+  - Packaging, Systems, Chatops, Errbot, Community, Discussions, StackStorm Exchange.
+* Jacob Floyd ([@cognifloyd](https://github.com/cognifloyd/)), _Copart_ <<[email protected]>>
+  - StackStorm Exchange, Kubernetes, ChatOps, Core, Ansible, Discussions.
 * JP Bourget ([@punkrokk](https://github.com/punkrokk)) <<[email protected]>>
   - Systems, deb/rpm, Deployments, Community, StackStorm Exchange, SecOps, CircleCI.
 * Marcel Weinberg ([@winem](https://github.com/winem)), _CoreMedia_ <<[email protected]>>
   - Systems, Core, CI/CD, Docker, Community.
-* Mick McGrath ([@mickmcgrath13](https://github.com/mickmcgrath13)) <<[email protected]>>
+* Mick McGrath ([@mickmcgrath13](https://github.com/mickmcgrath13)), _Bitovi_ <<[email protected]>>
   - Systems, ST2 Exchange. [Case Study](https://stackstorm.com/case-study-bitovi/).
 
 --------
@@ -47,12 +53,8 @@ Contributors are using and occasionally contributing back to the project, might
 They're not part of the TSC voting process, but appreciated for their contribution, involvement and may become Maintainers in the future depending on their effort and involvement. See [How to become a Maintainer?](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#how-to-become-a-maintainer)
 [@StackStorm/contributors](https://github.com/orgs/StackStorm/teams/contributors) are invited to StackStorm Github organization and have permissions to help triage the Issues and review PRs.
 * Anand Patel ([@arms11](https://github.com/arms11)), _VMware_ - Docker, Kubernetes.
-* AJ Jonen ([@guzzijones](https://github.com/guzzijones)) - ST2 Web UI, Orquesta, Core.
-* Carlos ([@nzlosh](https://github.com/nzlosh)) - Chatops, Errbot, Community, Discussions, StackStorm Exchange.
 * Harsh Nanchahal ([@hnanchahal](https://github.com/hnanchahal)), _Starbucks_ - Core, Docker, Kubernetes.
 * Hiroyasu Ohyama ([@userlocalhost](https://github.com/userlocalhost)) - Orquesta, Workflows, st2 Japan Community. [Case Study](https://stackstorm.com/case-study-dmm/).
-* Jacob Floyd ([@cognifloyd](https://github.com/cognifloyd/)), _Copart_ - StackStorm Exchange, ChatOps, Core, Discussions.
-* Marcel Weinberg ([@winem](https://github.com/winem)) - Community, Docker, Core.
 * Sheshagiri Rao Mallipedhi ([@sheshagiri](https://github.com/sheshagiri)) - Docker, Core, StackStorm Exchange.
 * Shital Raut ([@shital-orchestral](https://github.com/shital-orchestral)), _Orchestral.ai_ - Web UI.
 * Tristan Struthers ([@trstruth](https://github.com/trstruth)) - Docker, K8s, Orquesta, Community.

st2client/st2client/commands/action.py

@@ -30,7 +30,7 @@
 
 from six.moves import range
 
-from st2client import models
+from st2client.models.action import Action, Execution
 from st2client.commands import resource
 from st2client.commands.resource import ResourceNotFoundError
 from st2client.commands.resource import ResourceViewCommand
@@ -198,7 +198,7 @@ def format_execution_status(instance):
 class ActionBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(ActionBranch, self).__init__(
-            models.Action,
+            Action,
             description,
             app,
             subparsers,
@@ -1082,7 +1082,7 @@ def _format_for_common_representation(self, task):
             task_name_key = "context.orquesta.task_name"
         # Use Execution as the object so that the formatter lookup does not change.
         # AKA HACK!
-        return models.action.Execution(
+        return Execution(
             **{
                 "id": task.id,
                 "status": task.status,
@@ -1240,7 +1240,7 @@ def run(self, args, **kwargs):
             action=action, runner=runner, args=args
         )
 
-        execution = models.Execution()
+        execution = Execution()
         execution.action = action_ref
         execution.parameters = action_parameters
         execution.user = args.user
@@ -1267,7 +1267,7 @@ def run(self, args, **kwargs):
 class ActionExecutionBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(ActionExecutionBranch, self).__init__(
-            models.Execution,
+            Execution,
             description,
             app,
             subparsers,

st2client/st2client/commands/auth.py

@@ -27,7 +27,7 @@
 
 from st2client.base import BaseCLIApp
 from st2client import config_parser
-from st2client import models
+from st2client.models.auth import ApiKey
 from st2client.commands import resource
 from st2client.commands.noop import NoopCommand
 from st2client.exceptions.operations import OperationFailureException
@@ -278,7 +278,7 @@ def run_and_print(self, args, **kwargs):
 class ApiKeyBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(ApiKeyBranch, self).__init__(
-            models.ApiKey,
+            ApiKey,
             description,
             app,
             subparsers,

st2client/st2client/commands/pack.py

@@ -21,9 +21,9 @@
 import editor
 import yaml
 
-from st2client.models import Config
-from st2client.models import Pack
-from st2client.models import Execution
+from st2client.models.config import Config
+from st2client.models.pack import Pack
+from st2client.models.action import Execution
 from st2client.commands import resource
 from st2client.commands.resource import add_auth_token_to_kwargs_from_cli
 from st2client.commands.action import ActionRunCommandMixin

st2client/st2client/commands/policy.py

@@ -17,7 +17,7 @@
 
 import logging
 
-from st2client import models
+from st2client.models.policy import Policy, PolicyType
 from st2client.commands import resource
 
 
@@ -27,7 +27,7 @@
 class PolicyTypeBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(PolicyTypeBranch, self).__init__(
-            models.PolicyType,
+            PolicyType,
             description,
             app,
             subparsers,
@@ -72,7 +72,7 @@ def get_resource(self, ref_or_id, **kwargs):
 class PolicyBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(PolicyBranch, self).__init__(
-            models.Policy,
+            Policy,
             description,
             app,
             subparsers,

st2client/st2client/commands/rule.py

@@ -15,15 +15,15 @@
 
 from __future__ import absolute_import
 
-from st2client import models
+from st2client.models.reactor import Rule
 from st2client.commands import resource
 from st2client.formatters import table
 
 
 class RuleBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(RuleBranch, self).__init__(
-            models.Rule,
+            Rule,
             description,
             app,
             subparsers,

st2client/st2client/commands/rule_enforcement.py

@@ -15,7 +15,7 @@
 
 from __future__ import absolute_import
 
-from st2client import models
+from st2client.models.reactor import RuleEnforcement
 from st2client.commands import resource
 from st2client.formatters import table
 from st2client.utils.date import format_isodate_for_user_timezone
@@ -24,7 +24,7 @@
 class RuleEnforcementBranch(resource.ResourceBranch):
     def __init__(self, description, app, subparsers, parent_parser=None):
         super(RuleEnforcementBranch, self).__init__(
-            models.RuleEnforcement,
+            RuleEnforcement,
             description,
             app,
             subparsers,

st2client/st2client/commands/sensor.py

@@ -15,7 +15,7 @@
 
 from __future__ import absolute_import
 
-from st2client.models import Sensor
+from st2client.models.reactor import Sensor
 from st2client.commands import resource
 
 

st2client/st2client/commands/timer.py

@@ -15,7 +15,7 @@
 
 from __future__ import absolute_import
 
-from st2client.models import Timer
+from st2client.models.timer import Timer
 from st2client.commands import resource
 
 

st2client/st2client/commands/trace.py

@@ -15,7 +15,10 @@
 
 from __future__ import absolute_import
 
-from st2client.models import Resource, Trace, TriggerInstance, Rule, Execution
+from st2client.models.core import Resource
+from st2client.models.trace import Trace
+from st2client.models.reactor import TriggerInstance, Rule
+from st2client.models.action import Execution
 from st2client.formatters import table
 from st2client.formatters import execution as execution_formatter
 from st2client.commands import resource