Merge from aws/aws-sam-cli/develop

.pylintrc

@@ -7,7 +7,7 @@
 # pygtk.require().
 #init-hook=
 
-# Add files or directories to the blacklist. They should be base names, not
+# Add files or directories to the ignore list. They should be base names, not
 # paths.
 ignore=compat.py, __main__.py
 

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.13.1"
+__version__ = "1.13.2"

samcli/lib/package/artifact_exporter.py

@@ -151,7 +151,9 @@ def export_global_artifacts(self, template_dict):
         """
         for key, val in template_dict.items():
             if key in GLOBAL_EXPORT_DICT:
-                template_dict[key] = GLOBAL_EXPORT_DICT[key](val, self.uploader, self.template_dir)
+                template_dict[key] = GLOBAL_EXPORT_DICT[key](
+                    val, self.uploader.get(ResourceZip.EXPORT_DESTINATION), self.template_dir
+                )
             elif isinstance(val, dict):
                 self.export_global_artifacts(val)
             elif isinstance(val, list):

tests/integration/package/test_package_command_zip.py

@@ -56,6 +56,7 @@ def test_package_template_flag(self, template_file):
             "aws-serverlessrepo-application.yaml",
             "aws-serverless-statemachine.yaml",
             "aws-stepfunctions-statemachine.yaml",
+            "aws-include-transform.yaml",
         ]
     )
     def test_package_barebones(self, template_file):

tests/integration/testdata/package/aws-include-transform.yaml

@@ -0,0 +1,9 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Transform only app
+
+Resources:
+  'Fn::Transform':
+    Name: 'AWS::Include'
+    Parameters:
+      Location : ./main.py