references to client now faas root package

cmd/describe.go

@@ -8,7 +8,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/boson-project/faas/client"
+	"github.com/boson-project/faas"
 	"github.com/boson-project/faas/knative"
 	"github.com/ory/viper"
 	"github.com/spf13/cobra"
@@ -37,15 +37,15 @@ func describe(cmd *cobra.Command, args []string) (err error) {
 	)
 	name := args[0]
 
-	describer, err := knative.NewDescriber(client.DefaultNamespace)
+	describer, err := knative.NewDescriber(faas.DefaultNamespace)
 	if err != nil {
 		return
 	}
 	describer.Verbose = verbose
 
-	client, err := client.New(".",
-		client.WithVerbose(verbose),
-		client.WithDescriber(describer),
+	client, err := faas.New(".",
+		faas.WithVerbose(verbose),
+		faas.WithDescriber(describer),
 	)
 	if err != nil {
 		return

kn/updater.go

@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"time"
 
-	faasclient "github.com/boson-project/faas/client"
+	"github.com/boson-project/faas"
 	"github.com/boson-project/faas/k8s"
 )
 
@@ -42,7 +42,7 @@ func (d *Updater) Update(name, image string) (err error) {
 
 	// TODO: use knative client directly.
 	// TODO: use tags and traffic splitting.
-	cmd := exec.Command("kn", "service", "update", project, "--env", timestamp, "--namespace", faasclient.DefaultNamespace)
+	cmd := exec.Command("kn", "service", "update", project, "--env", timestamp, "--namespace", faas.DefaultNamespace)
 
 	// If verbose logging is enabled, echo appsody's chatty stdout.
 	if d.Verbose {

knative/describer.go

@@ -2,7 +2,8 @@ package knative
 
 import (
 	"fmt"
-	"github.com/boson-project/faas/client"
+
+	"github.com/boson-project/faas"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -16,7 +17,7 @@ type Describer struct {
 	namespace      string
 	servingClient  *servingv1client.ServingV1alpha1Client
 	eventingClient *eventingv1client.EventingV1alpha1Client
-	config 		   *rest.Config
+	config         *rest.Config
 }
 
 func NewDescriber(namespace string) (describer *Describer, err error) {
@@ -45,7 +46,7 @@ func NewDescriber(namespace string) (describer *Describer, err error) {
 	return
 }
 
-func (describer *Describer) Describe(name string) (description client.FunctionDescription, err error) {
+func (describer *Describer) Describe(name string) (description faas.FunctionDescription, err error) {
 
 	namespace := describer.namespace
 	servingClient := describer.servingClient
@@ -79,11 +80,11 @@ func (describer *Describer) Describe(name string) (description client.FunctionDe
 
 	}
 
-	subscriptions := make([]client.Subscription, 0, len(triggers.Items))
+	subscriptions := make([]faas.Subscription, 0, len(triggers.Items))
 	for _, trigger := range triggers.Items {
 		if triggerMatches(&trigger) {
 			filterAttrs := *trigger.Spec.Filter.Attributes
-			subscription := client.Subscription{
+			subscription := faas.Subscription{
 				Source: filterAttrs["source"],
 				Type:   filterAttrs["type"],
 				Broker: trigger.Spec.Broker,

kubectl/deployer.go

@@ -11,7 +11,7 @@ import (
 	"os/exec"
 	"strings"
 
-	faasclient "github.com/boson-project/faas/client"
+	"github.com/boson-project/faas"
 	"github.com/boson-project/faas/k8s"
 )
 
@@ -97,7 +97,7 @@ func (d *Deployer) Deploy(name, image string) (address string, err error) {
 	// Write out the final service yaml
 	err = t.Execute(f, map[string]string{
 		"Project":   project,
-		"Namespace": faasclient.DefaultNamespace,
+		"Namespace": faas.DefaultNamespace,
 		"Subdomain": subdomain,
 		"Domain":    domain,
 		"Image":     image,

kubectl/remover.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"os/exec"
 
-	faasclient "github.com/boson-project/faas/client"
+	"github.com/boson-project/faas"
 	"github.com/boson-project/faas/k8s"
 )
 
@@ -39,7 +39,7 @@ func (d *Remover) Remove(name string) (err error) {
 	}
 
 	// Command to run
-	cmd := exec.Command("kubectl", "delete", "kservice", serviceName, "--namespace", faasclient.DefaultNamespace)
+	cmd := exec.Command("kubectl", "delete", "kservice", serviceName, "--namespace", faas.DefaultNamespace)
 
 	// If verbose logging is enabled, echo appsody's chatty stdout.
 	if d.Verbose {