Add client SDK for making proxy API calls

Decouples the "config" package from the "proxy" package so that
it can stand alone.

Signed-off-by: Vivek Singh <[email protected]>

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

Gopkg.toml

@@ -53,3 +53,4 @@
 [[constraint]]
   name = "github.com/alexellis/go-execute"
   version = "0.3.0"
+

commands/deploy.go

@@ -4,6 +4,7 @@
 package commands
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -166,13 +167,19 @@ func runDeployCommand(args []string, image string, fprocess string, functionName
 		}
 	}
 
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	ctx := context.Background()
+
 	var failedStatusCodes = make(map[string]int)
 	if len(services.Functions) > 0 {
 
 		if len(services.Provider.Network) == 0 {
 			services.Provider.Network = defaultNetwork
 		}
 
+		cliAuth := NewCLIAuth(token, services.Provider.GatewayURL)
+		proxyClient := proxy.NewClient(cliAuth, services.Provider.GatewayURL, transport, &commandTimeout)
+
 		for k, function := range services.Functions {
 
 			functionSecrets := deployFlags.secrets
@@ -268,7 +275,6 @@ Error: %s`, fprocessErr.Error())
 
 			deploySpec := &proxy.DeployFunctionSpec{
 				FProcess:                function.FProcess,
-				Gateway:                 services.Provider.GatewayURL,
 				FunctionName:            function.Name,
 				Image:                   function.Image,
 				RegistryAuth:            function.RegistryAuth,
@@ -288,12 +294,10 @@ Error: %s`, fprocessErr.Error())
 				Namespace:               function.Namespace,
 			}
 
-			if msg := checkTLSInsecure(deploySpec.Gateway, deploySpec.TLSInsecure); len(msg) > 0 {
+			if msg := checkTLSInsecure(services.Provider.GatewayURL, deploySpec.TLSInsecure); len(msg) > 0 {
 				fmt.Println(msg)
 			}
-
-			statusCode := proxy.DeployFunction(deploySpec)
-
+			statusCode := proxyClient.DeployFunction(ctx, deploySpec)
 			if badStatusCode(statusCode) {
 				failedStatusCodes[k] = statusCode
 			}
@@ -303,6 +307,8 @@ Error: %s`, fprocessErr.Error())
 			return fmt.Errorf("To deploy a function give --yaml/-f or a --image and --name flag")
 		}
 		gateway = getGatewayURL(gateway, defaultGateway, "", os.Getenv(openFaaSURLEnvironment))
+		cliAuth := NewCLIAuth(token, gateway)
+		proxyClient := proxy.NewClient(cliAuth, gateway, transport, &commandTimeout)
 
 		var registryAuth string
 		if deployFlags.sendRegistryAuth {
@@ -317,7 +323,7 @@ Error: %s`, fprocessErr.Error())
 		// default to a readable filesystem until we get more input about the expected behavior
 		// and if we want to add another flag for this case
 		defaultReadOnlyRFS := false
-		statusCode, err := deployImage(image, fprocess, functionName, registryAuth, deployFlags,
+		statusCode, err := deployImage(ctx, proxyClient, image, fprocess, functionName, registryAuth, deployFlags,
 			tlsInsecure, defaultReadOnlyRFS, token, functionNamespace)
 		if err != nil {
 			return err
@@ -337,6 +343,8 @@ Error: %s`, fprocessErr.Error())
 
 // deployImage deploys a function with the given image
 func deployImage(
+	ctx context.Context,
+	client *proxy.Client,
 	image string,
 	fprocess string,
 	functionName string,
@@ -370,7 +378,6 @@ func deployImage(
 
 	deploySpec := &proxy.DeployFunctionSpec{
 		FProcess:                fprocess,
-		Gateway:                 gateway,
 		FunctionName:            functionName,
 		Image:                   image,
 		RegistryAuth:            registryAuth,
@@ -390,11 +397,11 @@ func deployImage(
 		Namespace:               namespace,
 	}
 
-	if msg := checkTLSInsecure(deploySpec.Gateway, deploySpec.TLSInsecure); len(msg) > 0 {
+	if msg := checkTLSInsecure(gateway, deploySpec.TLSInsecure); len(msg) > 0 {
 		fmt.Println(msg)
 	}
 
-	statusCode = proxy.DeployFunction(deploySpec)
+	statusCode = client.DeployFunction(ctx, deploySpec)
 
 	return statusCode, nil
 }

commands/describe.go

@@ -4,6 +4,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strconv"
@@ -63,14 +64,18 @@ func runDescribe(cmd *cobra.Command, args []string) error {
 		}
 	}
 	gatewayAddress := getGatewayURL(gateway, defaultGateway, yamlGateway, os.Getenv(openFaaSURLEnvironment))
+	cliAuth := NewCLIAuth(token, gatewayAddress)
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	cliClient := proxy.NewClient(cliAuth, gatewayAddress, transport, &commandTimeout)
+	ctx := context.Background()
 
-	function, err := proxy.GetFunctionInfoToken(gatewayAddress, functionName, tlsInsecure, token, functionNamespace)
+	function, err := cliClient.GetFunctionInfo(ctx, functionName, functionNamespace)
 	if err != nil {
 		return err
 	}
 
 	//To get correct value for invocation count from /system/functions endpoint
-	functionList, err := proxy.ListFunctionsToken(gatewayAddress, tlsInsecure, token, functionNamespace)
+	functionList, err := cliClient.ListFunctions(ctx, functionNamespace)
 	if err != nil {
 		return err
 	}

commands/general.go

@@ -0,0 +1,101 @@
+package commands
+
+import (
+	"crypto/tls"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/openfaas/faas-cli/config"
+	"github.com/openfaas/faas-cli/proxy"
+)
+
+var (
+	commandTimeout = 60 * time.Second
+)
+
+//CLIAuth auth struct for the CLI
+type CLIAuth struct {
+	Username string
+	Password string
+	Token    string
+}
+
+//BasicAuth basic authentication type
+type BasicAuth struct {
+	username string
+	password string
+}
+
+func (auth *BasicAuth) Set(req *http.Request) error {
+	req.SetBasicAuth(auth.username, auth.password)
+	return nil
+}
+
+//BearerToken bearer token
+type BearerToken struct {
+	token string
+}
+
+func (c *BearerToken) Set(req *http.Request) error {
+	req.Header.Set("Authorization", "Bearer "+c.token)
+	return nil
+}
+
+//NewCLIAuth returns a new CLI Auth
+func NewCLIAuth(token string, gateway string) proxy.ClientAuth {
+	authConfig, _ := config.LookupAuthConfig(gateway)
+
+	var (
+		username    string
+		password    string
+		bearerToken string
+	)
+
+	if authConfig.Auth == config.BasicAuthType {
+		username, password, _ = config.DecodeAuth(authConfig.Token)
+
+		return &BasicAuth{
+			username: username,
+			password: password,
+		}
+
+	}
+
+	// User specified token gets priority
+	if len(token) > 0 {
+		bearerToken = token
+	} else {
+		bearerToken = authConfig.Token
+	}
+
+	return &BearerToken{
+		token: bearerToken,
+	}
+}
+
+func GetDefaultCLITransport(tlsInsecure bool, timeout *time.Duration) *http.Transport {
+	if timeout != nil || tlsInsecure {
+		tr := &http.Transport{
+			Proxy:             http.ProxyFromEnvironment,
+			DisableKeepAlives: false,
+		}
+
+		if timeout != nil {
+			tr.DialContext = (&net.Dialer{
+				Timeout: *timeout,
+			}).DialContext
+
+			tr.IdleConnTimeout = 120 * time.Millisecond
+			tr.ExpectContinueTimeout = 1500 * time.Millisecond
+		}
+
+		if tlsInsecure {
+			tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: tlsInsecure}
+		}
+		tr.DisableKeepAlives = false
+
+		return tr
+	}
+	return nil
+}

commands/list.go

@@ -4,6 +4,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -54,9 +55,12 @@ func runList(cmd *cobra.Command, args []string) error {
 			yamlGateway = services.Provider.GatewayURL
 		}
 	}
-
 	gatewayAddress = getGatewayURL(gateway, defaultGateway, yamlGateway, os.Getenv(openFaaSURLEnvironment))
-	functions, err := proxy.ListFunctionsToken(gatewayAddress, tlsInsecure, token, functionNamespace)
+
+	cliAuth := NewCLIAuth(token, gatewayAddress)
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	proxyClient := proxy.NewClient(cliAuth, gatewayAddress, transport, &commandTimeout)
+	functions, err := proxyClient.ListFunctions(context.Background(), functionNamespace)
 	if err != nil {
 		return err
 	}

commands/logs.go

@@ -4,7 +4,10 @@
 package commands
 
 import (
+	"context"
+	"crypto/tls"
 	"fmt"
+	"net/http"
 	"os"
 	"time"
 
@@ -90,7 +93,10 @@ func runLogs(cmd *cobra.Command, args []string) error {
 	}
 
 	logRequest := logRequestFromFlags(cmd, args)
-	logEvents, err := proxy.GetLogs(gatewayAddress, tlsInsecure, logRequest, logFlagValues.token)
+	cliAuth := NewCLIAuth(logFlagValues.token, gatewayAddress)
+	transport := getLogStreamingTransport(tlsInsecure)
+	cliClient := proxy.NewClient(cliAuth, gatewayAddress, transport, nil)
+	logEvents, err := cliClient.GetLogs(context.Background(), logRequest)
 	if err != nil {
 		return err
 	}
@@ -123,3 +129,15 @@ func sinceValue(t time.Time, d time.Duration) *time.Time {
 	}
 	return nil
 }
+
+func getLogStreamingTransport(tlsInsecure bool) http.RoundTripper {
+	if tlsInsecure {
+		tr := &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		}
+		tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: tlsInsecure}
+
+		return tr
+	}
+	return nil
+}

commands/namespaces.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -29,14 +30,14 @@ var namespacesCmd = &cobra.Command{
 
 func runNamespaces(cmd *cobra.Command, args []string) error {
 	gatewayAddress := getGatewayURL(gateway, defaultGateway, "", os.Getenv(openFaaSURLEnvironment))
-
-	namespaces, err := proxy.ListNamespacesToken(gatewayAddress, tlsInsecure, token)
+	cliAuth := NewCLIAuth(token, gatewayAddress)
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	client := proxy.NewClient(cliAuth, gatewayAddress, transport, &commandTimeout)
+	namespaces, err := client.ListNamespaces(context.Background())
 	if err != nil {
 		return err
 	}
-
 	printNamespaces(namespaces)
-
 	return nil
 }
 

commands/remove.go

@@ -4,6 +4,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -59,6 +60,11 @@ func runDelete(cmd *cobra.Command, args []string) error {
 
 	gatewayAddress = getGatewayURL(gateway, defaultGateway, yamlGateway, os.Getenv(openFaaSURLEnvironment))
 
+	cliAuth := NewCLIAuth(token, gatewayAddress)
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	proxyclient := proxy.NewClient(cliAuth, gatewayAddress, transport, &commandTimeout)
+	ctx := context.Background()
+
 	if len(services.Functions) > 0 {
 		if len(services.Provider.Network) == 0 {
 			services.Provider.Network = defaultNetwork
@@ -68,7 +74,7 @@ func runDelete(cmd *cobra.Command, args []string) error {
 			function.Name = k
 			fmt.Printf("Deleting: %s.\n", function.Name)
 
-			proxy.DeleteFunctionToken(gatewayAddress, function.Name, tlsInsecure, token, functionNamespace)
+			proxyclient.DeleteFunction(ctx, function.Name, functionNamespace)
 		}
 	} else {
 		if len(args) < 1 {
@@ -77,7 +83,7 @@ func runDelete(cmd *cobra.Command, args []string) error {
 
 		functionName = args[0]
 		fmt.Printf("Deleting: %s.\n", functionName)
-		proxy.DeleteFunctionToken(gatewayAddress, functionName, tlsInsecure, token, functionNamespace)
+		proxyclient.DeleteFunction(ctx, functionName, functionNamespace)
 	}
 
 	return nil

commands/secret_create.go

@@ -4,6 +4,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -109,9 +110,11 @@ func runSecretCreate(cmd *cobra.Command, args []string) error {
 	if msg := checkTLSInsecure(gatewayAddress, tlsInsecure); len(msg) > 0 {
 		fmt.Println(msg)
 	}
-
+	cliAuth := NewCLIAuth(token, gatewayAddress)
+	transport := GetDefaultCLITransport(tlsInsecure, &commandTimeout)
+	client := proxy.NewClient(cliAuth, gatewayAddress, transport, &commandTimeout)
 	fmt.Println("Creating secret: " + secret.Name)
-	_, output := proxy.CreateSecretToken(gatewayAddress, secret, tlsInsecure, token)
+	_, output := client.CreateSecret(context.Background(), secret)
 	fmt.Printf(output)
 
 	return nil