From 92569049232d396aa8753868ac96b92a8dc1adb7 Mon Sep 17 00:00:00 2001
From: Anton Mokhovikov <ammokhov@amazon.com>
Date: Mon, 9 Nov 2020 20:40:27 -0800
Subject: [PATCH 1/2] codegen multi-type support

---
 python/rpdk/python/resolver.py | 3 +++
 tests/plugin/codegen_test.py   | 8 ++++----
 tests/plugin/resolver_test.py  | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/python/rpdk/python/resolver.py b/python/rpdk/python/resolver.py
index 60be8909..b94a8a3e 100644
--- a/python/rpdk/python/resolver.py
+++ b/python/rpdk/python/resolver.py
@@ -22,6 +22,9 @@ def translate_type(resolved_type):
     if resolved_type.container == ContainerType.PRIMITIVE:
         return PRIMITIVE_TYPES[resolved_type.type]
 
+    if resolved_type.container == ContainerType.MULTIPLE:
+        return "Any"
+
     item_type = translate_type(resolved_type.type)
 
     if resolved_type.container == ContainerType.DICT:
diff --git a/tests/plugin/codegen_test.py b/tests/plugin/codegen_test.py
index 11295f3c..57bab044 100644
--- a/tests/plugin/codegen_test.py
+++ b/tests/plugin/codegen_test.py
@@ -94,10 +94,10 @@ def test_initialize(project):
         "README.md",
         "foo-bar-baz.json",
         "requirements.txt",
-        "inputs/inputs_1_invalid.json",
-        "inputs/inputs_1_update.json",
-        "inputs/inputs_1_create.json",
-        "inputs",
+        "example_inputs/inputs_1_invalid.json",
+        "example_inputs/inputs_1_update.json",
+        "example_inputs/inputs_1_create.json",
+        "example_inputs",
         "src",
         "src/foo_bar_baz",
         "src/foo_bar_baz/__init__.py",
diff --git a/tests/plugin/resolver_test.py b/tests/plugin/resolver_test.py
index 9cca0ded..f30c76ff 100644
--- a/tests/plugin/resolver_test.py
+++ b/tests/plugin/resolver_test.py
@@ -59,3 +59,8 @@ def test_contains_model_list_containing_model():
         ResolvedType(ContainerType.LIST, ResolvedType(ContainerType.MODEL, "Foo")),
     )
     assert contains_model(resolved_type) is True
+
+
+def test_translate_type_multiple():
+    traslated = translate_type(ResolvedType(ContainerType.MULTIPLE, "multiple"))
+    assert traslated == "Any"

From b1befe5106fdb350f057073f9a060860e2fff277 Mon Sep 17 00:00:00 2001
From: Anton Mokhovikov <ammokhov@amazon.com>
Date: Thu, 12 Nov 2020 15:17:07 -0800
Subject: [PATCH 2/2] restart ci