Merge pull request aws#3883 from groundbreaker/develop

support AWS::Type::AppSync::FunctionConfiguration in artifact_exporter
tangaowei · Feb 21, 2019 · d645479 · d645479
2 parents d4ae7a1 + 591f683
commit d645479
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/awscli/customizations/cloudformation/artifact_exporter.py b/awscli/customizations/cloudformation/artifact_exporter.py
@@ -344,6 +344,22 @@ class AppSyncResolverResponseTemplateResource(Resource):
     PACKAGE_NULL_PROPERTY = False
 
 
+class AppSyncFunctionConfigurationRequestTemplateResource(Resource):
+    RESOURCE_TYPE = "AWS::AppSync::FunctionConfiguration"
+    PROPERTY_NAME = "RequestMappingTemplateS3Location"
+    # Don't package the directory if RequestMappingTemplateS3Location is omitted.
+    # Necessary to support RequestMappingTemplate
+    PACKAGE_NULL_PROPERTY = False
+
+
+class AppSyncFunctionConfigurationResponseTemplateResource(Resource):
+    RESOURCE_TYPE = "AWS::AppSync::FunctionConfiguration"
+    PROPERTY_NAME = "ResponseMappingTemplateS3Location"
+    # Don't package the directory if ResponseMappingTemplateS3Location is omitted.
+    # Necessary to support ResponseMappingTemplate
+    PACKAGE_NULL_PROPERTY = False
+
+
 class LambdaFunctionResource(ResourceWithS3UrlDict):
     RESOURCE_TYPE = "AWS::Lambda::Function"
     PROPERTY_NAME = "Code"
@@ -462,6 +478,8 @@ class ServerlessApplicationResource(CloudFormationStackResource):
     GraphQLSchemaResource,
     AppSyncResolverRequestTemplateResource,
     AppSyncResolverResponseTemplateResource,
+    AppSyncFunctionConfigurationRequestTemplateResource,
+    AppSyncFunctionConfigurationResponseTemplateResource,
     ApiGatewayRestApiResource,
     LambdaFunctionResource,
     ElasticBeanstalkApplicationVersion,

diff --git a/tests/unit/customizations/cloudformation/test_artifact_exporter.py b/tests/unit/customizations/cloudformation/test_artifact_exporter.py
@@ -22,7 +22,11 @@
     ServerlessApplicationResource, LambdaLayerVersionResource, \
     copy_to_temp_dir, include_transform_export_handler, GLOBAL_EXPORT_DICT, \
     ServerlessLayerVersionResource, ServerlessRepoApplicationLicense, \
-    ServerlessRepoApplicationReadme
+    ServerlessRepoApplicationReadme, \
+    AppSyncResolverRequestTemplateResource, \
+    AppSyncResolverResponseTemplateResource, \
+    AppSyncFunctionConfigurationRequestTemplateResource, \
+    AppSyncFunctionConfigurationResponseTemplateResource
 
 
 def test_is_s3_url():
@@ -78,6 +82,26 @@ def test_all_resources_export():
             "expected_result": uploaded_s3_url
         },
 
+        {
+            "class": AppSyncResolverRequestTemplateResource,
+            "expected_result": uploaded_s3_url
+        },
+
+        {
+            "class": AppSyncResolverResponseTemplateResource,
+            "expected_result": uploaded_s3_url
+        },
+
+        {
+            "class": AppSyncFunctionConfigurationRequestTemplateResource,
+            "expected_result": uploaded_s3_url
+        },
+
+        {
+            "class": AppSyncFunctionConfigurationResponseTemplateResource,
+            "expected_result": uploaded_s3_url
+        },
+
         {
             "class": ApiGatewayRestApiResource,
             "expected_result": {
@@ -112,6 +136,10 @@ def test_all_resources_export():
             "class": ServerlessRepoApplicationReadme,
             "expected_result": uploaded_s3_url
         },
+        {
+            "class": ServerlessRepoApplicationLicense,
+            "expected_result": uploaded_s3_url
+        },
         {
             "class": ServerlessRepoApplicationLicense,
             "expected_result": uploaded_s3_url