fix: Look Up Application ID Instead of Parsing It

.pylintrc

@@ -62,7 +62,8 @@ confidence=
 # --disable=W".
 disable=useless-object-inheritance,
         unused-argument,
-        too-many-instance-attributes
+        too-many-instance-attributes,
+        bad-continuation
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

serverlessrepo/__version__.py

@@ -1,12 +1,12 @@
 """Serverlessrepo version and package meta-data."""
 
-__title__ = 'serverlessrepo'
-__version__ = '0.1.10'
-__license__ = 'Apache 2.0'
+__title__ = "serverlessrepo"
+__version__ = "0.1.10"
+__license__ = "Apache 2.0"
 __description__ = (
-    'A Python library with convenience helpers for working '
-    'with the AWS Serverless Application Repository.'
+    "A Python library with convenience helpers for working "
+    "with the AWS Serverless Application Repository."
 )
-__url__ = 'https://github.com/awslabs/aws-serverlessrepo-python'
-__author__ = 'Amazon Web Services'
-__author_email__ = '[email protected]'
+__url__ = "https://github.com/awslabs/aws-serverlessrepo-python"
+__author__ = "Amazon Web Services"
+__author_email__ = "[email protected]"

serverlessrepo/exceptions.py

@@ -4,7 +4,7 @@
 class ServerlessRepoError(Exception):
     """Base exception raised by serverlessrepo library."""
 
-    MESSAGE = ''
+    MESSAGE = ""
 
     def __init__(self, **kwargs):
         """Init the exception object."""
@@ -32,11 +32,13 @@ class InvalidApplicationPolicyError(ServerlessRepoError):
 class S3PermissionsRequired(ServerlessRepoError):
     """Raised when S3 bucket access is denied."""
 
-    MESSAGE = "The AWS Serverless Application Repository does not have read access to bucket '{bucket}', " \
-              "key '{key}'. Please update your Amazon S3 bucket policy to grant the service read " \
-              "permissions to the application artifacts you have uploaded to your S3 bucket. See " \
-              "https://docs.aws.amazon.com/serverlessrepo/latest/devguide/serverless-app-publishing-applications.html" \
-              " for more details."
+    MESSAGE = (
+        "The AWS Serverless Application Repository does not have read access to bucket '{bucket}', "
+        "key '{key}'. Please update your Amazon S3 bucket policy to grant the service read "
+        "permissions to the application artifacts you have uploaded to your S3 bucket. See "
+        "https://docs.aws.amazon.com/serverlessrepo/latest/devguide/serverless-app-publishing-applications.html"
+        " for more details."
+    )
 
 
 class InvalidS3UriError(ServerlessRepoError):
@@ -49,3 +51,9 @@ class ServerlessRepoClientError(ServerlessRepoError):
     """Wrapper for botocore ClientError."""
 
     MESSAGE = "{message}"
+
+
+class MultipleMatchingApplicationsError(ServerlessRepoError):
+    """Raised when multiple matching applications are found."""
+
+    MESSAGE = "{message}"

serverlessrepo/parser.py

@@ -1,6 +1,5 @@
 """Helper to parse JSON/YAML SAM template and dump YAML files."""
 
-import re
 import copy
 import json
 from collections import OrderedDict
@@ -12,9 +11,8 @@
 from .application_metadata import ApplicationMetadata
 from .exceptions import ApplicationMetadataNotFoundError
 
-METADATA = 'Metadata'
-SERVERLESS_REPO_APPLICATION = 'AWS::ServerlessRepo::Application'
-APPLICATION_ID_PATTERN = r'arn:[\w\-]+:serverlessrepo:[\w\-]+:[0-9]+:applications\/[\S]+'
+METADATA = "Metadata"
+SERVERLESS_REPO_APPLICATION = "AWS::ServerlessRepo::Application"
 
 
 def intrinsics_multi_constructor(loader, tag_prefix, node):
@@ -27,17 +25,17 @@ def intrinsics_multi_constructor(loader, tag_prefix, node):
     tag = node.tag[1:]
 
     # Some intrinsic functions doesn't support prefix "Fn::"
-    prefix = 'Fn::'
-    if tag in ['Ref', 'Condition']:
-        prefix = ''
+    prefix = "Fn::"
+    if tag in ["Ref", "Condition"]:
+        prefix = ""
 
     cfntag = prefix + tag
 
-    if tag == 'GetAtt' and isinstance(node.value, six.string_types):
+    if tag == "GetAtt" and isinstance(node.value, six.string_types):
         # ShortHand notation for !GetAtt accepts Resource.Attribute format
         # while the standard notation is to use an array
         # [Resource, Attribute]. Convert shorthand to standard format
-        value = node.value.split('.', 1)
+        value = node.value.split(".", 1)
 
     elif isinstance(node, ScalarNode):
         # Value of this node is scalar
@@ -90,8 +88,10 @@ def parse_template(template_str):
         # json parser.
         return json.loads(template_str, object_pairs_hook=OrderedDict)
     except ValueError:
-        yaml.SafeLoader.add_constructor(yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG, _dict_constructor)
-        yaml.SafeLoader.add_multi_constructor('!', intrinsics_multi_constructor)
+        yaml.SafeLoader.add_constructor(
+            yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG, _dict_constructor
+        )
+        yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor)
         return yaml.safe_load(template_str)
 
 
@@ -110,20 +110,10 @@ def get_app_metadata(template_dict):
         return ApplicationMetadata(app_metadata_dict)
 
     raise ApplicationMetadataNotFoundError(
-        error_message='missing {} section in template Metadata'.format(SERVERLESS_REPO_APPLICATION))
-
-
-def parse_application_id(text):
-    """
-    Extract the application id from input text.
-
-    :param text: text to parse
-    :type text: str
-    :return: application id if found in the input
-    :rtype: str
-    """
-    result = re.search(APPLICATION_ID_PATTERN, text)
-    return result.group(0) if result else None
+        error_message="missing {} section in template Metadata".format(
+            SERVERLESS_REPO_APPLICATION
+        )
+    )
 
 
 def strip_app_metadata(template_dict):
@@ -141,7 +131,8 @@ def strip_app_metadata(template_dict):
     template_dict_copy = copy.deepcopy(template_dict)
 
     # strip the whole metadata section if SERVERLESS_REPO_APPLICATION is the only key in it
-    if not [k for k in template_dict_copy.get(METADATA) if k != SERVERLESS_REPO_APPLICATION]:
+    metadata = template_dict_copy.get(METADATA)
+    if not any(k for k in metadata if k != SERVERLESS_REPO_APPLICATION):
         template_dict_copy.pop(METADATA, None)
     else:
         template_dict_copy.get(METADATA).pop(SERVERLESS_REPO_APPLICATION, None)