paasta-tools 1.23.1__tar.gz → 1.23.2__tar.gz

{paasta_tools-1.23.1/paasta_tools.egg-info → paasta_tools-1.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.23.1
+Version: 1.23.2
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.23.1"
+__version__ = "1.23.2"

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools/api/api_docs/swagger.json

@@ -930,7 +930,15 @@
                         }
                     },
                     "403": {
-                        "description": "Unauthorized to remote-run this service"
+                        "description": "Unauthorized to remote-run this service",
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "reason": {
+                                    "type": "string"
+                                }
+                            }
+                        }
                     },
                     "404": {
                         "description": "Deployment key not found"
@@ -981,7 +989,15 @@
                         }
                     },
                     "403": {
-                        "description": "Unauthorized to remote-run this service"
+                        "description": "Unauthorized to remote-run this service",
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "reason": {
+                                    "type": "string"
+                                }
+                            }
+                        }
                     },
                     "404": {
                         "description": "Service instance not found"

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools/cli/cmds/remote_run.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import argparse
+import json
 import shutil
 import subprocess
 import sys
@@ -24,6 +25,7 @@ from paasta_tools.cli.utils import get_paasta_oapi_client_with_auth
 from paasta_tools.cli.utils import lazy_choices_completer
 from paasta_tools.cli.utils import run_interactive_cli
 from paasta_tools.kubernetes.remote_run import TOOLBOX_MOCK_SERVICE
+from paasta_tools.paastaapi.exceptions import ApiException
 from paasta_tools.paastaapi.model.remote_run_start import RemoteRunStart
 from paasta_tools.paastaapi.model.remote_run_stop import RemoteRunStop
 from paasta_tools.utils import get_username
@@ -57,6 +59,18 @@ def _list_services_and_toolboxes() -> List[str]:
     )
 
 
+def parse_error(body: str) -> str:
+    try:
+        body_object = json.loads(body)
+    except json.decoder.JSONDecodeError:
+        return body
+    return (
+        body_object.get("reason")
+        or body_object.get("message")
+        or json.dumps(body_object, indent=4)
+    )
+
+
 def paasta_remote_run_start(
     args: argparse.Namespace,
     system_paasta_config: SystemPaastaConfig,
@@ -72,19 +86,21 @@ def paasta_remote_run_start(
         return 1
 
     user = get_username()
-    start_response = client.remote_run.remote_run_start(
-        args.service,
-        args.instance,
-        RemoteRunStart(
-            user=user,
-            interactive=args.interactive,
-            recreate=args.recreate,
-            max_duration=args.max_duration,
-            toolbox=args.toolbox,
-        ),
-    )
-    if start_response.status >= 300:
-        print(f"Error from PaaSTA APIs while starting job: {start_response.message}")
+    try:
+        start_response = client.remote_run.remote_run_start(
+            args.service,
+            args.instance,
+            RemoteRunStart(
+                user=user,
+                interactive=args.interactive,
+                recreate=args.recreate,
+                max_duration=args.max_duration,
+                toolbox=args.toolbox,
+            ),
+        )
+    except ApiException as e:
+        error_msg = parse_error(e.body)
+        print(f"Error from PaaSTA APIs while starting job: {error_msg}")
         return 1
 
     print(
@@ -172,13 +188,18 @@ def paasta_remote_run_stop(
     if not client:
         print("Cannot get a paasta-api client")
         return 1
-    response = client.remote_run.remote_run_stop(
-        args.service,
-        args.instance,
-        RemoteRunStop(user=get_username(), toolbox=args.toolbox),
-    )
+    try:
+        response = client.remote_run.remote_run_stop(
+            args.service,
+            args.instance,
+            RemoteRunStop(user=get_username(), toolbox=args.toolbox),
+        )
+    except ApiException as e:
+        error_msg = parse_error(e.body)
+        print(f"Error from PaaSTA APIs while stopping job: {error_msg}")
+        return 1
     print(response.message)
-    return 0 if response.status < 300 else 1
+    return 0
 
 
 def add_common_args_to_parser(parser: argparse.ArgumentParser):

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools/paastaapi/api/remote_run_api.py

@@ -23,6 +23,7 @@ from paasta_tools.paastaapi.model_utils import (  # noqa: F401
     none_type,
     validate_and_convert_types
 )
+from paasta_tools.paastaapi.model.inline_response403 import InlineResponse403
 from paasta_tools.paastaapi.model.remote_run_outcome import RemoteRunOutcome
 from paasta_tools.paastaapi.model.remote_run_start import RemoteRunStart
 from paasta_tools.paastaapi.model.remote_run_stop import RemoteRunStop

paasta_tools-1.23.2/paasta_tools/paastaapi/model/inline_response403.py

@@ -0,0 +1,170 @@
+# coding: utf-8
+
+"""
+    Paasta API
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
+
+    The version of the OpenAPI document: 1.2.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import re  # noqa: F401
+import sys  # noqa: F401
+
+import nulltype  # noqa: F401
+
+from paasta_tools.paastaapi.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    none_type,
+    validate_get_composed_info,
+)
+
+
+class InlineResponse403(ModelNormal):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      attribute_map (dict): The key is attribute name
+          and the value is json key in definition.
+      discriminator_value_class_map (dict): A dict to go from the discriminator
+          variable value to the discriminator class name.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    additional_properties_type = None
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a method because a model may have properties that are
+        of type self, this must run after the class is loaded
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+            'reason': (str,),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+
+    attribute_map = {
+        'reason': 'reason',  # noqa: E501
+    }
+
+    _composed_schemas = {}
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, *args, **kwargs):  # noqa: E501
+        """InlineResponse403 - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+            reason (str): [optional]  # noqa: E501
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            raise ApiTypeError(
+                "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in kwargs.items():
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools/paastaapi/models/__init__.py

@@ -30,6 +30,7 @@ from paasta_tools.paastaapi.model.inline_object import InlineObject
 from paasta_tools.paastaapi.model.inline_response200 import InlineResponse200
 from paasta_tools.paastaapi.model.inline_response2001 import InlineResponse2001
 from paasta_tools.paastaapi.model.inline_response202 import InlineResponse202
+from paasta_tools.paastaapi.model.inline_response403 import InlineResponse403
 from paasta_tools.paastaapi.model.instance_bounce_status import InstanceBounceStatus
 from paasta_tools.paastaapi.model.instance_mesh_status import InstanceMeshStatus
 from paasta_tools.paastaapi.model.instance_status import InstanceStatus

{paasta_tools-1.23.1 → paasta_tools-1.23.2/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.23.1
+Version: 1.23.2
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.23.1 → paasta_tools-1.23.2}/paasta_tools.egg-info/SOURCES.txt

@@ -263,6 +263,7 @@ paasta_tools/paastaapi/model/inline_object.py
 paasta_tools/paastaapi/model/inline_response200.py
 paasta_tools/paastaapi/model/inline_response2001.py
 paasta_tools/paastaapi/model/inline_response202.py
+paasta_tools/paastaapi/model/inline_response403.py
 paasta_tools/paastaapi/model/instance_bounce_status.py
 paasta_tools/paastaapi/model/instance_mesh_status.py
 paasta_tools/paastaapi/model/instance_status.py