From 32e9c45df5a6c2b92633294112b5f3ae9b98228c Mon Sep 17 00:00:00 2001
From: C Cirello <ccirello@users.noreply.github.com>
Date: Sat, 12 Nov 2016 03:34:29 +0100
Subject: [PATCH] fnctl: Image -> Name (#271)

Fixes #268
---
 fnctl/README.md   |  2 +-
 fnctl/bump.go     |  8 ++++----
 fnctl/common.go   |  2 +-
 fnctl/funcfile.go | 10 +++++-----
 fnctl/lambda.go   |  2 +-
 fnctl/publish.go  |  6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fnctl/README.md b/fnctl/README.md
index deb55365e..d62254df0 100644
--- a/fnctl/README.md
+++ b/fnctl/README.md
@@ -128,7 +128,7 @@ functions. The files can be named as:
 An example of a function file:
 ```yaml
 app: myapp
-image: iron/hello
+name: iron/hello
 route: "/custom/route"
 version: 0.0.1
 type: sync
diff --git a/fnctl/bump.go b/fnctl/bump.go
index a75e1a15c..b04c37da9 100644
--- a/fnctl/bump.go
+++ b/fnctl/bump.go
@@ -50,14 +50,14 @@ func (b *bumpcmd) bump(path string) error {
 	}
 
 	if funcfile.Version == "" {
-		img, ver := imageversion(funcfile.Image)
+		img, ver := imageversion(funcfile.Name)
 		if ver == "" {
 			return nil
 		}
-		funcfile.Image = img
+		funcfile.Name = img
 		funcfile.Version = ver
-	} else if funcfile.Version != "" && strings.Contains(funcfile.Image, ":") {
-		return fmt.Errorf("cannot do version bump: this function has tag in its image name and version at same time. image: %s. version: %s", funcfile.Image, funcfile.Version)
+	} else if funcfile.Version != "" && strings.Contains(funcfile.Name, ":") {
+		return fmt.Errorf("cannot do version bump: this function has tag in its image name and version at same time. name: %s. version: %s", funcfile.Name, funcfile.Version)
 	}
 
 	s, err := storage.NewVersionStorage("local", funcfile.Version)
diff --git a/fnctl/common.go b/fnctl/common.go
index dd510bd9f..0747bc494 100644
--- a/fnctl/common.go
+++ b/fnctl/common.go
@@ -193,7 +193,7 @@ func (c commoncmd) dockerbuild(path string, ff *funcfile) error {
 		}
 	}
 
-	cmd := exec.Command("docker", "build", "-t", ff.FullImage(), ".")
+	cmd := exec.Command("docker", "build", "-t", ff.FullName(), ".")
 	cmd.Dir = dir
 	cmd.Stderr = c.verbwriter
 	cmd.Stdout = c.verbwriter
diff --git a/fnctl/funcfile.go b/fnctl/funcfile.go
index e170aa721..0f9e36bb5 100644
--- a/fnctl/funcfile.go
+++ b/fnctl/funcfile.go
@@ -30,7 +30,7 @@ var (
 
 type funcfile struct {
 	App        *string           `yaml:"app,omitempty",json:"app,omitempty"`
-	Image      string            `yaml:"image,omitempty",json:"image,omitempty"`
+	Name       string            `yaml:"name,omitempty",json:"name,omitempty"`
 	Version    string            `yaml:"version,omitempty",json:"version,omitempty"`
 	Runtime    *string           `yaml:"runtime,omitempty",json:"runtime,omitempty"`
 	Entrypoint *string           `yaml:"entrypoint,omitempty",json:"entrypoint,omitempty"`
@@ -41,12 +41,12 @@ type funcfile struct {
 	Build      []string          `yaml:"build,omitempty",json:"build,omitempty"`
 }
 
-func (ff *funcfile) FullImage() string {
-	image := ff.Image
+func (ff *funcfile) FullName() string {
+	fname := ff.Name
 	if ff.Version != "" {
-		image = fmt.Sprintf("%s:%s", image, ff.Version)
+		fname = fmt.Sprintf("%s:%s", fname, ff.Version)
 	}
-	return image
+	return fname
 }
 
 func (ff *funcfile) RuntimeTag() (runtime, tag string) {
diff --git a/fnctl/lambda.go b/fnctl/lambda.go
index 1b1f0c5b9..5a3470c20 100644
--- a/fnctl/lambda.go
+++ b/fnctl/lambda.go
@@ -280,7 +280,7 @@ func createFunctionYaml(opts createImageOptions) error {
 	route := fmt.Sprintf("/%s", strs[1])
 	funcDesc := &funcfile{
 		App:    &strs[0],
-		Image:  opts.Name,
+		Name:   opts.Name,
 		Route:  &route,
 		Config: opts.Config,
 	}
diff --git a/fnctl/publish.go b/fnctl/publish.go
index b0a4da27e..af0a325cc 100644
--- a/fnctl/publish.go
+++ b/fnctl/publish.go
@@ -83,7 +83,7 @@ func (p *publishcmd) publish(path string) error {
 }
 
 func (p publishcmd) dockerpush(ff *funcfile) error {
-	cmd := exec.Command("docker", "push", ff.FullImage())
+	cmd := exec.Command("docker", "push", ff.FullName())
 	cmd.Stderr = p.verbwriter
 	cmd.Stdout = p.verbwriter
 	if err := cmd.Run(); err != nil {
@@ -114,14 +114,14 @@ func (p *publishcmd) route(path string, ff *funcfile) error {
 	body := functions.RouteWrapper{
 		Route: functions.Route{
 			Path:   *ff.Route,
-			Image:  ff.FullImage(),
+			Image:  ff.FullName(),
 			Memory: *ff.Memory,
 			Type_:  *ff.Type,
 			Config: expandEnvConfig(ff.Config),
 		},
 	}
 
-	fmt.Fprintf(p.verbwriter, "updating API with appName: %s route: %s image: %s \n", *ff.App, *ff.Route, ff.Image)
+	fmt.Fprintf(p.verbwriter, "updating API with app: %s route: %s name: %s \n", *ff.App, *ff.Route, ff.Name)
 
 	wrapper, resp, err := p.AppsAppRoutesPost(*ff.App, body)
 	if err != nil {