Do value replacement for both ${...} and $... in strings

Author: V1NAY8

test_elasticsearch/test_server/test_rest_api_spec.py

@@ -407,6 +407,16 @@ def _resolve(self, value):
                     ):
                         value = value.replace(key_replace, str(v))
                         break
+                    # We only do the in-string replacement if value is JSON string
+                    # E.g. '{\n  "password_hash" : "$hash"\n}\n'
+                    elif (
+                        key_replace.startswith("$")
+                        and isinstance(value, string_types)
+                        and key_replace in value
+                        and not value.startswith("$")
+                    ):
+                        value = value.replace(key_replace, str(v))
+                        break
 
         if isinstance(value, string_types):
             value = value.strip()