Switching to new dep tool (#616)

treeder · web-flow · commit 10f3178ae95f · 2017-04-07T11:22:08.000-07:00
* making things work * #506 - Add ability to login to a private docker registry * Rolling back "make things work" to test them out more. * Rolling back "make things work" to test them out more. * credentials from docker/config.json if ENV is missing * should get docker auth info just in the init * update glide lock * update glide * Switched to new go dep tool, glide is too frikin annoying. * Updated circle builds to use dep * Added GOPATH/bin to path. * Added GOPATH/bin to path. * Using regular make test, instead of docker one (not sure why it was using the docker one?).
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 .PHONY: all test dep build
 
 dep:
-	glide install --strip-vendor
+	dep ensure --update
 
 build:
 	go build -o functions
@@ -24,6 +24,7 @@ run:
 	./functions
 
 docker-dep:
+# todo: need to create a dep tool image for this (or just ditch this)
 	docker run --rm -it -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions treeder/glide install -v
 
 docker-build:
diff --git a/api/runner/docker-registry.go b/api/runner/docker-registry.go
@@ -0,0 +1,22 @@
+package runner
+
+import (
+	"strings"
+)
+
+type dockerRegistry struct {
+	Name     string `json:"name"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+type dockerRegistries []dockerRegistry
+
+func (t dockerRegistries) Find(name string) *dockerRegistry {
+	for _, v := range t {
+		if strings.HasSuffix(v.Name, name) {
+			return &v
+		}
+	}
+	return nil
+}
diff --git a/api/runner/runner.go b/api/runner/runner.go
@@ -228,7 +228,12 @@ func (r Runner) EnsureImageExists(ctx context.Context, cfg *task.Config) error {
 		cfg: cfg,
 	}
 
-	_, err := docker.CheckRegistry(ctask.Image(), ctask.DockerAuth())
+	auth, err := ctask.DockerAuth()
+	if err != nil {
+		return err
+	}
+
+	_, err = docker.CheckRegistry(ctask.Image(), auth)
 	return err
 }
 
diff --git a/api/runner/task.go b/api/runner/task.go
@@ -2,14 +2,57 @@ package runner
 
 import (
 	"context"
+	"encoding/json"
 	"io"
+	"os"
+	"os/user"
+	"path/filepath"
 	"time"
 
-	"github.com/fsouza/go-dockerclient"
+	"github.com/docker/docker/cli/config/configfile"
+	docker "github.com/fsouza/go-dockerclient"
 	"github.com/iron-io/functions/api/runner/task"
 	"github.com/iron-io/runner/drivers"
 )
 
+var registries dockerRegistries
+
+func init() {
+
+	// Attempt to fetch it from an environment variable
+	regsettings := os.Getenv("DOCKER_AUTH")
+
+	if regsettings == "" {
+		u, err := user.Current()
+		if err == nil {
+			var config configfile.ConfigFile
+			cfile, err := os.Open(filepath.Join(u.HomeDir, ".docker", "config.json"))
+			if err != nil {
+				return
+			}
+			err = config.LoadFromReader(cfile)
+			if err != nil {
+				return
+			}
+
+			var regs []dockerRegistry
+			for _, auth := range config.AuthConfigs {
+				regs = append(regs, dockerRegistry{
+					Username: auth.Username,
+					Password: auth.Password,
+					Name:     auth.ServerAddress,
+				})
+			}
+
+			registries = dockerRegistries(regs)
+		}
+	} else {
+		// If we have settings, unmarshal them
+		json.Unmarshal([]byte(regsettings), &registries)
+	}
+
+}
+
 type containerTask struct {
 	ctx    context.Context
 	cfg    *task.Config
@@ -31,17 +74,31 @@ func (t *containerTask) Labels() map[string]string {
 	}
 }
 
-func (t *containerTask) Id() string                         { return t.cfg.ID }
-func (t *containerTask) Route() string                      { return "" }
-func (t *containerTask) Image() string                      { return t.cfg.Image }
-func (t *containerTask) Timeout() time.Duration             { return t.cfg.Timeout }
-func (t *containerTask) IdleTimeout() time.Duration   { return t.cfg.IdleTimeout }
-func (t *containerTask) Logger() (io.Writer, io.Writer)     { return t.cfg.Stdout, t.cfg.Stderr }
-func (t *containerTask) Volumes() [][2]string               { return [][2]string{} }
-func (t *containerTask) WorkDir() string                    { return "" }
+func (t *containerTask) Id() string                     { return t.cfg.ID }
+func (t *containerTask) Route() string                  { return "" }
+func (t *containerTask) Image() string                  { return t.cfg.Image }
+func (t *containerTask) Timeout() time.Duration         { return t.cfg.Timeout }
+func (t *containerTask) IdleTimeout() time.Duration     { return t.cfg.IdleTimeout }
+func (t *containerTask) Logger() (io.Writer, io.Writer) { return t.cfg.Stdout, t.cfg.Stderr }
+func (t *containerTask) Volumes() [][2]string           { return [][2]string{} }
+func (t *containerTask) WorkDir() string                { return "" }
 
 func (t *containerTask) Close()                 {}
 func (t *containerTask) WriteStat(drivers.Stat) {}
 
-// FIXME: for now just use empty creds => public docker hub image
-func (t *containerTask) DockerAuth() docker.AuthConfiguration { return docker.AuthConfiguration{} }
+// Implementing the docker.AuthConfiguration interface.  Pulling in
+// the docker repo password from environment variables
+func (t *containerTask) DockerAuth() (docker.AuthConfiguration, error) {
+	reg, _, _ := drivers.ParseImage(t.Image())
+	authconfig := docker.AuthConfiguration{}
+
+	if customAuth := registries.Find(reg); customAuth != nil {
+		authconfig = docker.AuthConfiguration{
+			Password:      customAuth.Password,
+			ServerAddress: customAuth.Name,
+			Username:      customAuth.Username,
+		}
+	}
+
+	return authconfig, nil
+}
diff --git a/circle.yml b/circle.yml
@@ -3,7 +3,7 @@ machine:
     CHECKOUT_DIR: $HOME/$CIRCLE_PROJECT_REPONAME
     GOPATH: $HOME/go
     GOROOT: $HOME/golang/go
-    PATH: $GOROOT/bin:$PATH
+    PATH: $GOROOT/bin:$GOPATH/bin:/$PATH
     GH_IRON: $GOPATH/src/github.com/iron-io
     GO_PROJECT: ../go/src/github.com/iron-io/$CIRCLE_PROJECT_REPONAME
   services:
@@ -19,19 +19,15 @@ dependencies:
     - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
     - mkdir -p $HOME/golang
     - tar -C $HOME/golang -xvzf go1.8.linux-amd64.tar.gz
-    - wget https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz
-    - tar -C $HOME/bin -xvzf glide-v0.12.3-linux-amd64.tar.gz --strip=1
+    - go get -u github.com/golang/dep/...
   override:
     - which go && go version
-    - glide --version
     - make dep:
         pwd: $GO_PROJECT
 
 test:
   override:
-    - make docker-test:
-        pwd: $GO_PROJECT
-    - make test-datastore:
+    - make test:
         pwd: $GO_PROJECT
     - make test-build-arm:
         pwd: $GO_PROJECT
diff --git a/clients/build.rb b/clients/build.rb
@@ -88,7 +88,7 @@ def clone(lang)
     puts "SKIPPING GO, it's manual for now."
     # This is using https://goswagger.io/ instead
     # TODO: run this build command instead: this works if run manually
-    # glide install -v && docker run --rm -it  -v $HOME/dev/go:/go -w /go/src/github.com/iron-io/functions_go quay.io/goswagger/swagger generate client -f https://raw.githubusercontent.com/iron-io/functions/master/docs/swagger.yml -A functions
+    # dep ensure --update && docker run --rm -it  -v $HOME/dev/go:/go -w /go/src/github.com/iron-io/functions_go quay.io/goswagger/swagger generate client -f https://raw.githubusercontent.com/iron-io/functions/master/docs/swagger.yml -A functions
   else
     gen = JSON.parse(HTTP.post("https://generator.swagger.io/api/gen/clients/#{l}",
     json: {
diff --git a/docs/operating/kubernetes/kubernetes-production/functions-config.yaml b/docs/operating/kubernetes/kubernetes-production/functions-config.yaml
@@ -4,4 +4,4 @@ metadata:
   name: functions-config
 data:
   MQ_URL: redis://redis-master.default
-  DB_URL: postgres://postgres:mysecretpassword@postgresql-master.default/?sslmode=disable
+  DB_URL: postgres://postgres:mysecretpassword@postgresql-master.default/?sslmode=disable
diff --git a/docs/operating/kubernetes/kubernetes-production/functions-deployment.yaml b/docs/operating/kubernetes/kubernetes-production/functions-deployment.yaml
@@ -31,9 +31,9 @@ spec:
               name: functions-config
               key: DB_URL
         volumeMounts:
-        - mountPath: "/var/run/docker.sock"
-          name: docker-socket
-          readOnly: false
+          - mountPath: "/var/run/docker.sock"
+            name: docker-socket
+            readOnly: false
         ports:
         - name: http-server
           containerPort: 8080
diff --git a/fn/Makefile b/fn/Makefile
@@ -10,10 +10,10 @@ docker: vendor
 	docker push iron/fn
 
 vendor:
-	glide install -v
+	dep ensure --update
 
 test:
-	go test -v $(shell glide nv)
+	go test $(go list ./... | grep -v /vendor/)
 
 release:
 	GOOS=linux go build -o fn_linux
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
diff --git a/lock.json b/lock.json
diff --git a/manifest.json b/manifest.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Place your settings in this file to overwrite default and user settings.`
	`2`	`+{`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,12 @@ func (r Runner) EnsureImageExists(ctx context.Context, cfg *task.Config) error {`
`228`	`228`	`cfg: cfg,`
`229`	`229`	`}`
`230`	`230`
`231`		`- _, err := docker.CheckRegistry(ctask.Image(), ctask.DockerAuth())`
	`231`	`+ auth, err := ctask.DockerAuth()`
	`232`	`+ if err != nil {`
	`233`	`+ return err`
	`234`	`+ }`
	`235`	`+`
	`236`	`+ _, err = docker.CheckRegistry(ctask.Image(), auth)`
`232`	`237`	`return err`
`233`	`238`	`}`
`234`	`239`