fix: enables double quotes in env (#77)

screwdriver-cd · Jan 24, 2022 · 1bfab7e · 1bfab7e
1 parent e7200ff
commit 1bfab7e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/screwdriver/screwdriver.go b/screwdriver/screwdriver.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 )
 
-var regexpForUnmarshal = regexp.MustCompile(`"(.*?)" *: *"(.*?)"`)
+var regexpForUnmarshal = regexp.MustCompile(`"(.*?)" *: *"((.*?(\\\")?)+)"`)
 
 const (
 	apiVersion        = "v4"

diff --git a/screwdriver/screwdriver_test.go b/screwdriver/screwdriver_test.go
@@ -79,6 +79,10 @@ func TestJob(t *testing.T) {
 					"TEST_ENV",
 					"hoge",
 				},
+				{
+					"ESCAPED_COMMAND",
+					"-c \\\"echo FOO\\\"",
+				},
 			},
 			Image: "alpine",
 		}

diff --git a/screwdriver/testdata/validatedSuccess.json b/screwdriver/testdata/validatedSuccess.json
@@ -13,7 +13,8 @@
           }
         ],
         "environment": {
-          "TEST_ENV": "hoge"
+          "TEST_ENV": "hoge",
+          "ESCAPED_COMMAND": "-c \"echo FOO\""
         },
         "image": "alpine"
       }