Do specific replacement instead of a general replace for escaped dollar signs

envyaml/envyaml.py

@@ -217,6 +217,8 @@ def __read_yaml_file(file_path, cfg, strict, separator="|"):
         # changes dictionary
         replaces = dict()
 
+        shifting = 0
+
         # iterate over findings
         for entry in RE_PATTERN.finditer(content):
             groups = entry.groupdict()  # type: dict
@@ -235,7 +237,11 @@ def __read_yaml_file(file_path, cfg, strict, separator="|"):
                 default = groups["braced_default"]
 
             elif groups["escaped"] and "$" in groups["escaped"]:
-                content = content.replace("$" + groups["escaped"], groups["escaped"])
+                span = entry.span()
+                content = content[:span[0] + shifting] + groups["escaped"] + content[span[1] + shifting:]
+                # Added shifting since every time we update content we are
+                # changing the original groups spans
+                shifting += len(groups["escaped"]) - (span[1] - span[0])
 
             if variable is not None:
                 if variable in cfg:

tests/env.default.yaml

@@ -26,6 +26,11 @@ test_escape:
   one: $$.foo
   two: $$meet
   three: $${bracket}
+  four: SomePa$$$$$$word
+  five: SomePa$$$$$${word}
+  six: $$$PASSWORD
+  seven: $$${PASSWORD}
+  eight: $$${NON_EXISTING|DEFAULT}
 
 key_with_slash: $ENV_WITH_SLASH
 my_source_directory: "${MY_SOURCE_DIRECTORY}"

tests/test_envyaml.py

@@ -349,6 +349,11 @@ def test_it_should_pass_escaped_variable():
     assert env["test_escape.one"] == "$.foo"
     assert env["test_escape.two"] == "$meet"
     assert env["test_escape.three"] == "${bracket}"
+    assert env["test_escape.four"] == "SomePa$$$word"
+    assert env["test_escape.five"] == "SomePa$$${word}"
+    assert env["test_escape.six"] == "$env-password-with-escape"
+    assert env["test_escape.seven"] == "$env-password-with-escape"
+    assert env["test_escape.eight"] == "$DEFAULT"
 
 
 def test_it_should_properly_resolve_extra_fields():