We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent f25c63b commit 95d1816Copy full SHA for 95d1816
awscli/customizations/cloudformation/module_functions.py
@@ -70,17 +70,6 @@ def vf(v):
70
if len(mrg) != 2:
71
msg = f"Fn::Merge requires 2 args: {v.k}: {v.d}"
72
raise exceptions.InvalidModuleError(msg=msg)
73
- isd1 = isdict(mrg[0])
74
- isd2 = isdict(mrg[1])
75
- isl1 = isinstance(mrg[0], list)
76
- isl2 = isinstance(mrg[1], list)
77
- if not (isd1 and isd2):
78
- if not (isl1 and isl2):
79
- msg = (
80
- "Both args to Fn::Merge must be objects or lists"
81
- + f": {v.k}: {v.d}"
82
- )
83
- raise exceptions.InvalidModuleError(msg=msg)
84
v.p[v.k] = merge_props(mrg[0], mrg[1])
85
86
Visitor(d).visit(vf)
0 commit comments