Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions IM/tosca/Tosca.py
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,16 @@ def _get_implementation_url(self, node, implementation):

return res

@staticmethod
def _serialize_interface_input(value):
if isinstance(value, str) and not value.startswith("|"):
# JSON strings are valid YAML scalars and correctly escape quotes,
# backslashes and control characters.
value = json.dumps(value)
else:
value = str(value)
return value.replace("\n", "\\n")

def _gen_configure_from_interfaces(self, node, compute, interfaces):
if not interfaces:
return None
Expand Down Expand Up @@ -968,11 +978,7 @@ def _gen_configure_from_interfaces(self, node, compute, interfaces):
if script_path.endswith(".yaml") or script_path.endswith(".yml"):
if env:
for var_name, var_value in env.items():
if isinstance(var_value, str) and not var_value.startswith("|"):
var_value = '"%s"' % var_value
else:
var_value = str(var_value)
var_value = var_value.replace("\n", "\\n")
var_value = self._serialize_interface_input(var_value)
variables += ' %s: %s ' % (var_name, var_value) + "\n"
variables += "\n"

Expand Down
9 changes: 9 additions & 0 deletions test/unit/Tosca.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,15 @@ def test_tosca_tls_get_att(self):
self.assertEqual(conf['vars']['tls_cert_1_2'],
"{{ hostvars[groups['server'][0]]['IM_NODE_TLS_CERTIFICATES']['cert1'] }}")

def test_interface_string_input_yaml_escaping(self):
value = 'password"with\\special\ncharacters'
serialized_value = Tosca._serialize_interface_input(value)
recipe = "---\n- vars:\n password: %s\n" % serialized_value

parsed_recipe = yaml.safe_load(recipe)

self.assertEqual(parsed_recipe[0]['vars']['password'], value)


if __name__ == "__main__":
unittest.main()
Loading