fix: Better BadRequestException for Non Support Resources

serverlessrepo/exceptions.py

@@ -45,6 +45,14 @@ class InvalidS3UriError(ServerlessRepoError):
     MESSAGE = "{message}"
 
 
+class UnsupportedResourceTypesError(ServerlessRepoError):
+    """Raised when the template contains unsupported resource types."""
+
+    MESSAGE = "Template contains unsupported resource types: '{resource_types}'. See " \
+              "https://docs.aws.amazon.com/serverlessrepo/latest/devguide/list-supported-resources.html " \
+              "for a full list of supported resources."
+
+
 class ServerlessRepoClientError(ServerlessRepoError):
     """Wrapper for botocore ClientError."""
 

serverlessrepo/publish.py

@@ -11,7 +11,12 @@
     yaml_dump, parse_template, get_app_metadata,
     parse_application_id, strip_app_metadata
 )
-from .exceptions import ServerlessRepoClientError, S3PermissionsRequired, InvalidS3UriError
+from .exceptions import (
+    ServerlessRepoClientError,
+    S3PermissionsRequired,
+    InvalidS3UriError,
+    UnsupportedResourceTypesError
+)
 
 CREATE_APPLICATION = 'CREATE_APPLICATION'
 UPDATE_APPLICATION = 'UPDATE_APPLICATION'
@@ -220,12 +225,16 @@ def _wrap_client_error(e):
     message = e.response['Error']['Message']
 
     if error_code == 'BadRequestException':
-        if "Failed to copy S3 object. Access denied:" in message:
+        if 'Failed to copy S3 object. Access denied:' in message:
             match = re.search('bucket=(.+?), key=(.+?)$', message)
             if match:
                 return S3PermissionsRequired(bucket=match.group(1), key=match.group(2))
-        if "Invalid S3 URI" in message:
+        if 'Invalid S3 URI' in message:
             return InvalidS3UriError(message=message)
+        if 'The template contains unsupported resource types.' in message:
+            match = re.search(r'\[(.+?)\]$', message)
+            if match:
+                return UnsupportedResourceTypesError(resource_types=match.group(1))
 
     return ServerlessRepoClientError(message=message)
 

tests/unit/test_publish.py

@@ -9,8 +9,8 @@
     InvalidApplicationMetadataError,
     S3PermissionsRequired,
     InvalidS3UriError,
-    ServerlessRepoClientError
-)
+    ServerlessRepoClientError,
+    UnsupportedResourceTypesError)
 from serverlessrepo.parser import get_app_metadata, strip_app_metadata, yaml_dump
 from serverlessrepo.publish import (
     CREATE_APPLICATION,
@@ -84,6 +84,15 @@ def setUp(self):
             },
             'create_application'
         )
+        self.unsupported_resource_types_exception = ClientError(
+            {
+                'Error': {
+                    'Code': 'BadRequestException',
+                    'Message': 'The template contains unsupported resource types. [AWS::XXX::XXX]'
+                }
+            },
+            'create_application'
+        )
 
     def test_publish_raise_value_error_for_empty_template(self):
         with self.assertRaises(ValueError) as context:
@@ -179,6 +188,14 @@ def test_publish_raise_invalid_s3_uri_when_create_application(self):
         message = str(context.exception)
         self.assertIn("Invalid S3 URI", message)
 
+    def test_publish_raise_unsupported_resource_types_when_create_application(self):
+        self.serverlessrepo_mock.create_application.side_effect = self.unsupported_resource_types_exception
+        with self.assertRaises(UnsupportedResourceTypesError) as context:
+            publish_application(self.template)
+
+        message = str(context.exception)
+        self.assertIn("Template contains unsupported resource types: 'AWS::XXX::XXX'.", message)
+
     def test_publish_existing_application_should_update_application_if_version_not_specified(self):
         self.serverlessrepo_mock.create_application.side_effect = self.application_exists_error
         template_without_version = self.template.replace('"SemanticVersion": "1.0.0"', '')