Merge pull request #1059 from laverya/gcr-json-key-creds

improve handling of docker url dests and add UrlPathEscape template function
replicatedhq · Aug 29, 2019 · 3f0faf0 · 3f0faf0
2 parents 6f1955f + 11c8b99
commit 3f0faf0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -239,7 +239,7 @@ mockgen: _mockgen fmt
 deps:
 	dep ensure -v
 
-
+.state/fmt: GO111MODULE=off
 .state/fmt: $(SRC)
 	goimports -w pkg
 	goimports -w cmd

diff --git a/go.mod b/go.mod
@@ -117,7 +117,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20181120190819-8f65e3013eba
 	golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 // indirect
 	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a // indirect
+	golang.org/x/tools v0.0.0-20190828211409-a0cf054a4555 // indirect
 	google.golang.org/appengine v1.3.0 // indirect
 	google.golang.org/grpc v1.21.0
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect

diff --git a/go.sum b/go.sum
@@ -727,6 +727,8 @@ golang.org/x/tools v0.0.0-20190827152308-062dbaebb618 h1:WtF22n/HcPWMhvZm4KWiQ0F
 golang.org/x/tools v0.0.0-20190827152308-062dbaebb618/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a h1:0JEq5ZQ3TgsRlFmz4BcD+E6U6cOk4pOImCQSyIG59ZM=
 golang.org/x/tools v0.0.0-20190827205025-b29f5f60c37a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190828211409-a0cf054a4555 h1:WHKnEyRwPYpu/vTaU8HRdvnIceBN9IW7x2EIycXa6YQ=
+golang.org/x/tools v0.0.0-20190828211409-a0cf054a4555/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20171005000305-7a7376eff6a5/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/appengine v0.0.0-20150527042145-b667a5000b08/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

diff --git a/pkg/lifecycle/render/planner/build.go b/pkg/lifecycle/render/planner/build.go
@@ -2,6 +2,7 @@ package planner
 
 import (
 	"fmt"
+	"net/url"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -372,6 +373,14 @@ func planToDests(plan Plan, builder *templates.Builder) ([]string, error) {
 		if err != nil {
 			return nil, errors.Wrapf(err, "building dest %q", step.Dest)
 		}
+
+		// special case for docker URL dests - don't attempt to remove url paths
+		destinationURL, err := url.Parse(dest)
+		// if there was an error parsing the dest as a url, or the scheme was not 'docker', add to the dests list as normal
+		if err == nil && destinationURL.Scheme == "docker" {
+			continue
+		}
+
 		dests = append(dests, dest)
 	}
 

diff --git a/pkg/templates/static_context.go b/pkg/templates/static_context.go
@@ -62,6 +62,7 @@ func (ctx StaticCtx) FuncMap() template.FuncMap {
 	sprigMap["TrimSpace"] = strings.TrimSpace
 	sprigMap["Trim"] = ctx.trim
 	sprigMap["UrlEncode"] = url.QueryEscape
+	sprigMap["UrlPathEscape"] = url.PathEscape
 	sprigMap["Base64Encode"] = ctx.base64Encode
 	sprigMap["Base64Decode"] = ctx.base64Decode
 	sprigMap["Split"] = strings.Split