add AfterCaptureHook to fix Test_Deploy

Author: Mia-Cross

core/testing_recorder.go

@@ -50,8 +50,9 @@ func cassetteResponseFilter(i *cassette.Interaction) error {
 }
 
 const (
-	windowDockerEngine = "//./pipe/docker_engine"
-	unixDockerEngine   = "/var/run/docker.sock"
+	windowDockerEngine      = "//./pipe/docker_engine"
+	unixDockerEngine        = "/var/run/docker.sock"
+	escapedUnixDockerEngine = "%2Fvar%2Frun%2Fdocker.sock"
 )
 
 func cassetteMatcher(r *http.Request, i cassette.Request) bool {
@@ -124,6 +125,16 @@ func customS3Matcher(r *http.Request, i cassette.Request) bool {
 		actualURL.RawQuery == expectedURL.RawQuery
 }
 
+func unescapeDockerURL(i *cassette.Interaction) error {
+	if strings.HasPrefix(i.Request.URL, "http://"+escapedUnixDockerEngine) {
+		i.Request.URL = regexp.MustCompile(`http://`+escapedUnixDockerEngine+`(.+)?`).ReplaceAllString(
+			i.Request.URL,
+			"http://"+unixDockerEngine+"${1}")
+	}
+
+	return nil
+}
+
 // getHTTPRecoder creates a new httpClient that records all HTTP requests in a cassette.
 // This cassette is then replayed whenever tests are executed again. This means that once the
 // requests are recorded in the cassette, no more real HTTP request must be made to run the tests.
@@ -148,6 +159,10 @@ func getHTTPRecoder(t *testing.T, update bool) (client *http.Client, cleanup fun
 		return nil, nil, err
 	}
 
+	// Starting with v3, go-vcr now calls net/url.Parse to build the interaction which results in an error for escaped
+	// Docker URLs on Test_Deploy (container), so we need to unescape these paths on this step.
+	r.AddHook(unescapeDockerURL, recorder.AfterCaptureHook)
+
 	// Add a filter which removes Authorization headers from all requests:
 	r.AddHook(cassetteRequestFilter, recorder.BeforeSaveHook)
 

internal/namespaces/container/v1beta1/testdata/test-deploy-app-name-deduced-from-path.cassette.yaml

@@ -1,7 +1,6 @@
-🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
-🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Task 4 "Building image" failed: could not build image: error during connect: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=null&cachefrom=null&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=null&memory=0&memswap=0&networkmode=&rm=0&shmsize=0&t=rg.fr-par.scw.cloud%2Ffuncscwappclitctnrdeployfpdmrsxdcp%2Fapp-cli-t-ctnr-deploy-fp%3Alatest&target=&ulimits=null&version=": parse "http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=null&cachefrom=null&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=null&memory=0&memswap=0&networkmode=&rm=0&shmsize=0&t=rg.fr-par.scw.cloud%2Ffuncscwappclitctnrdeployfpdmrsxdcp%2Fapp-cli-t-ctnr-deploy-fp%3Alatest&target=&ulimits=null&version=": invalid URL escape "%2F"
-🟥🟥🟥 JSON STDERR 🟥🟥🟥
-{
-  "error": "task 4 \"Building image\" failed: could not build image: error during connect: Post \"http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=null\u0026cachefrom=null\u0026cgroupparent=\u0026cpuperiod=0\u0026cpuquota=0\u0026cpusetcpus=\u0026cpusetmems=\u0026cpushares=0\u0026dockerfile=Dockerfile\u0026labels=null\u0026memory=0\u0026memswap=0\u0026networkmode=\u0026rm=0\u0026shmsize=0\u0026t=rg.fr-par.scw.cloud%2Ffuncscwappclitctnrdeployfpdmrsxdcp%2Fapp-cli-t-ctnr-deploy-fp%3Alatest\u0026target=\u0026ulimits=null\u0026version=\": parse \"http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=null\u0026cachefrom=null\u0026cgroupparent=\u0026cpuperiod=0\u0026cpuquota=0\u0026cpusetcpus=\u0026cpusetmems=\u0026cpushares=0\u0026dockerfile=Dockerfile\u0026labels=null\u0026memory=0\u0026memswap=0\u0026networkmode=\u0026rm=0\u0026shmsize=0\u0026t=rg.fr-par.scw.cloud%2Ffuncscwappclitctnrdeployfpdmrsxdcp%2Fapp-cli-t-ctnr-deploy-fp%3Alatest\u0026target=\u0026ulimits=null\u0026version=\": invalid URL escape \"%2F\""
-}
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟩🟩🟩 STDOUT️ 🟩🟩🟩️
+Your application is now available at https://appclitctnrdeployfp95ivlueu-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud
+
+🟩🟩🟩 JSON STDOUT 🟩🟩🟩
+"Your application is now available at https://appclitctnrdeployfp95ivlueu-app-cli-t-ctnr-deploy-fp.functions.fnc.fr-par.scw.cloud\n"

internal/namespaces/container/v1beta1/testdata/test-deploy-app-name-deduced-from-path.golden

@@ -1,7 +1,6 @@
-🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
-🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Task 4 "Building image" failed: could not build image: error during connect: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=%7B%22TEST%22%3A%22thisisatest%22%7D&cachefrom=null&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=null&memory=0&memswap=0&networkmode=&rm=0&shmsize=0&t=rg.fr-par.scw.cloud%2Ffuncscwclitctnrdeploybat2mhdji3%2Fcli-t-ctnr-deploy-ba%3Alatest&target=&ulimits=null&version=": parse "http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=%7B%22TEST%22%3A%22thisisatest%22%7D&cachefrom=null&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=null&memory=0&memswap=0&networkmode=&rm=0&shmsize=0&t=rg.fr-par.scw.cloud%2Ffuncscwclitctnrdeploybat2mhdji3%2Fcli-t-ctnr-deploy-ba%3Alatest&target=&ulimits=null&version=": invalid URL escape "%2F"
-🟥🟥🟥 JSON STDERR 🟥🟥🟥
-{
-  "error": "task 4 \"Building image\" failed: could not build image: error during connect: Post \"http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=%7B%22TEST%22%3A%22thisisatest%22%7D\u0026cachefrom=null\u0026cgroupparent=\u0026cpuperiod=0\u0026cpuquota=0\u0026cpusetcpus=\u0026cpusetmems=\u0026cpushares=0\u0026dockerfile=Dockerfile\u0026labels=null\u0026memory=0\u0026memswap=0\u0026networkmode=\u0026rm=0\u0026shmsize=0\u0026t=rg.fr-par.scw.cloud%2Ffuncscwclitctnrdeploybat2mhdji3%2Fcli-t-ctnr-deploy-ba%3Alatest\u0026target=\u0026ulimits=null\u0026version=\": parse \"http://%2Fvar%2Frun%2Fdocker.sock/v1.47/build?buildargs=%7B%22TEST%22%3A%22thisisatest%22%7D\u0026cachefrom=null\u0026cgroupparent=\u0026cpuperiod=0\u0026cpuquota=0\u0026cpusetcpus=\u0026cpusetmems=\u0026cpushares=0\u0026dockerfile=Dockerfile\u0026labels=null\u0026memory=0\u0026memswap=0\u0026networkmode=\u0026rm=0\u0026shmsize=0\u0026t=rg.fr-par.scw.cloud%2Ffuncscwclitctnrdeploybat2mhdji3%2Fcli-t-ctnr-deploy-ba%3Alatest\u0026target=\u0026ulimits=null\u0026version=\": invalid URL escape \"%2F\""
-}
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟩🟩🟩 STDOUT️ 🟩🟩🟩️
+Your application is now available at https://clitctnrdeploybajqohkyqb-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud
+
+🟩🟩🟩 JSON STDOUT 🟩🟩🟩
+"Your application is now available at https://clitctnrdeploybajqohkyqb-cli-t-ctnr-deploy-ba.functions.fnc.fr-par.scw.cloud\n"