fix: func deploy uses Docker API, not binary

Signed-off-by: Matej Vasek <mvasek@redhat.com>

Author: matejvasek

client.go

@@ -47,7 +47,7 @@ type Builder interface {
 type Pusher interface {
 	// Push the image of the Function.
 	// Returns Image Digest - SHA256 hash of the produced image
-	Push(Function) (string, error)
+	Push(ctx context.Context, f Function) (string, error)
 }
 
 // Deployer of Function source to running status.
@@ -270,7 +270,7 @@ func (c *Client) New(cfg Function) (err error) {
 	// Deploy the initialized Function, returning its publicly
 	// addressible name for possible registration.
 	c.progressListener.Increment("Deploying Function to cluster")
-	if err = c.Deploy(f.Root); err != nil {
+	if err = c.Deploy(context.TODO(), f.Root); err != nil {
 		return
 	}
 
@@ -404,7 +404,7 @@ func (c *Client) Build(path string) (err error) {
 
 // Deploy the Function at path.  Errors if the Function has not been
 // initialized with an image tag.
-func (c *Client) Deploy(path string) (err error) {
+func (c *Client) Deploy(ctx context.Context, path string) (err error) {
 	f, err := NewFunction(path)
 	if err != nil {
 		return
@@ -418,7 +418,7 @@ func (c *Client) Deploy(path string) (err error) {
 
 	// Push the image for the named service to the configured registry
 	fmt.Println("Pushing function image to the registry")
-	imageDigest, err := c.pusher.Push(f)
+	imageDigest, err := c.pusher.Push(ctx, f)
 	if err != nil {
 		return
 	}
@@ -525,7 +525,7 @@ func (n *noopBuilder) Build(_ Function) error { return nil }
 
 type noopPusher struct{ output io.Writer }
 
-func (n *noopPusher) Push(_ Function) (string, error) { return "", nil }
+func (n *noopPusher) Push(ctx context.Context, f Function) (string, error) { return "", nil }
 
 type noopDeployer struct{ output io.Writer }
 

client_int_test.go

@@ -3,6 +3,7 @@
 package function_test
 
 import (
+	"context"
 	"os"
 	"reflect"
 	"testing"
@@ -115,7 +116,7 @@ func TestDeploy(t *testing.T) {
 	}
 	defer del(t, client, "deploy")
 
-	if err := client.Deploy("."); err != nil {
+	if err := client.Deploy(context.TODO(), "."); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -155,7 +156,10 @@ func newClient(verbose bool) *boson.Client {
 	builder := buildpacks.NewBuilder()
 	builder.Verbose = verbose
 
-	pusher := docker.NewPusher()
+	pusher, err := docker.NewPusher()
+	if err != nil {
+		panic(err)
+	}
 	pusher.Verbose = verbose
 
 	deployer, err := knative.NewDeployer(DefaultNamespace)

client_test.go

@@ -512,7 +512,7 @@ func TestUpdate(t *testing.T) {
 
 	// Invoke the creation, triggering the Function delegates, and
 	// perform follow-up assertions that the Functions were indeed invoked.
-	if err := client.Deploy(root); err != nil {
+	if err := client.Deploy(context.TODO(), root); err != nil {
 		t.Fatal(err)
 	}
 
@@ -694,15 +694,14 @@ func TestDeployUnbuilt(t *testing.T) {
 	}
 
 	// Now try to deploy it.  Ie. without having run the necessary build step.
-	err := client.Deploy(root)
+	err := client.Deploy(context.TODO(), root)
 	if err == nil {
 		t.Fatal("did not receive an error attempting to deploy an unbuilt Function")
 	}
 
 	if !errors.Is(err, bosonFunc.ErrNotBuilt) {
 		t.Fatalf("did not receive expected error type.  Expected ErrNotBuilt, got %T", err)
 	}
-
 }
 
 // TODO: The tests which confirm an error is generated do not currently test

cmd/deploy.go

@@ -1,10 +1,18 @@
 package cmd
 
 import (
+	"bufio"
+	"context"
 	"fmt"
+	"os"
+	"strings"
 
+	"github.com/containers/image/v5/pkg/docker/config"
+	containersTypes "github.com/containers/image/v5/types"
 	"github.com/ory/viper"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"golang.org/x/crypto/ssh/terminal"
 
 	bosonFunc "github.com/boson-project/func"
 	"github.com/boson-project/func/buildpacks"
@@ -96,7 +104,10 @@ func runDeploy(cmd *cobra.Command, _ []string) (err error) {
 	builder := buildpacks.NewBuilder()
 	builder.Verbose = config.Verbose
 
-	pusher := docker.NewPusher()
+	pusher, err := docker.NewPusher(docker.WithCredentialsProvider(credentialsProvider))
+	if err != nil {
+		return err
+	}
 	pusher.Verbose = config.Verbose
 
 	ns := config.Namespace
@@ -127,12 +138,93 @@ func runDeploy(cmd *cobra.Command, _ []string) (err error) {
 		}
 	}
 
-	return client.Deploy(config.Path)
+	return client.Deploy(cmd.Context(), config.Path)
 
 	// NOTE: Namespace is optional, default is that used by k8s client
 	// (for example kubectl usually uses ~/.kube/config)
 }
 
+func credentialsProvider(ctx context.Context, registry string) (docker.Credentials, error) {
+
+	result := docker.Credentials{}
+	credentials, err := config.GetCredentials(nil, registry)
+	if err != nil {
+		return result, errors.Wrap(err, "failed to get credentials")
+	}
+
+	if credentials != (containersTypes.DockerAuthConfig{}) {
+		result.Username, result.Password = credentials.Username, credentials.Password
+		return result, nil
+	}
+
+	fmt.Print("Username: ")
+	username, err := getUserName(ctx)
+	if err != nil {
+		return result, err
+	}
+
+	fmt.Print("Password: ")
+	bytePassword, err := getPassword(ctx)
+	if err != nil {
+		return result, err
+	}
+	password := string(bytePassword)
+
+	result.Username, result.Password = username, password
+
+	return result, nil
+}
+
+func getPassword(ctx context.Context) ([]byte, error) {
+	ch := make(chan struct {
+		p []byte
+		e error
+	})
+
+	go func() {
+		pass, err := terminal.ReadPassword(0)
+		ch <- struct {
+			p []byte
+			e error
+		}{p: pass, e: err}
+	}()
+
+	select {
+	case res := <-ch:
+		return res.p, res.e
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	}
+}
+
+func getUserName(ctx context.Context) (string, error) {
+	ch := make(chan struct {
+		u string
+		e error
+	})
+	go func() {
+		reader := bufio.NewReader(os.Stdin)
+		username, err := reader.ReadString('\n')
+		if err != nil {
+			ch <- struct {
+				u string
+				e error
+			}{u: "", e: err}
+		}
+		ch <- struct {
+			u string
+			e error
+		}{u: strings.TrimRight(username, "\n"), e: nil}
+	}()
+
+	select {
+	case res := <-ch:
+		return res.u, res.e
+	case <-ctx.Done():
+		return "", ctx.Err()
+	}
+}
+
 type deployConfig struct {
 	buildConfig