Correct naming of faas-provider

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

cmd/provider.go

@@ -21,7 +21,7 @@ import (
 
 var providerCmd = &cobra.Command{
 	Use:   "provider",
-	Short: "Run the faasd faas-provider",
+	Short: "Run the faasd-provider",
 	RunE:  runProvider,
 }
 
@@ -32,7 +32,7 @@ func runProvider(_ *cobra.Command, _ []string) error {
 		return err
 	}
 
-	log.Printf("faas-containerd starting..\tService Timeout: %s\n", config.WriteTimeout.String())
+	log.Printf("faasd-provider starting..\tService Timeout: %s\n", config.WriteTimeout.String())
 
 	wd, err := os.Getwd()
 	if err != nil {

cmd/up.go

@@ -217,7 +217,7 @@ func makeServiceDefinitions(archSuffix string) []pkg.Service {
 			Name: "gateway",
 			Env: []string{
 				"basic_auth=true",
-				"functions_provider_url=http://faas-containerd:8081/",
+				"functions_provider_url=http://faasd-provider:8081/",
 				"direct_functions=false",
 				"read_timeout=60s",
 				"write_timeout=60s",

hack/faasd.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=faasd
-After=faas-containerd.service
+After=faasd-provider.service
 
 [Service]
 MemoryLimit=500M

pkg/supervisor.go

@@ -27,6 +27,20 @@ const (
 	faasdNamespace = "default"
 )
 
+type Service struct {
+	Image  string
+	Env    []string
+	Name   string
+	Mounts []Mount
+	Caps   []string
+	Args   []string
+}
+
+type Mount struct {
+	Src  string
+	Dest string
+}
+
 type Supervisor struct {
 	client *containerd.Client
 	cni    gocni.CNI
@@ -35,12 +49,12 @@ type Supervisor struct {
 func NewSupervisor(sock string) (*Supervisor, error) {
 	client, err := containerd.New(sock)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	cni, err := cninetwork.InitNetwork()
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	return &Supervisor{
@@ -49,28 +63,6 @@ func NewSupervisor(sock string) (*Supervisor, error) {
 	}, nil
 }
 
-func (s *Supervisor) Close() {
-	defer s.client.Close()
-}
-
-func (s *Supervisor) Remove(svcs []Service) error {
-	ctx := namespaces.WithNamespace(context.Background(), faasdNamespace)
-
-	for _, svc := range svcs {
-		err := cninetwork.DeleteCNINetwork(ctx, s.cni, s.client, svc.Name)
-		if err != nil {
-			log.Printf("[Delete] error removing CNI network for %s, %s\n", svc.Name, err)
-			return err
-		}
-
-		err = service.Remove(ctx, s.client, svc.Name)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func (s *Supervisor) Start(svcs []Service) error {
 	ctx := namespaces.WithNamespace(context.Background(), faasdNamespace)
 
@@ -82,7 +74,7 @@ func (s *Supervisor) Start(svcs []Service) error {
 	}
 	hosts := fmt.Sprintf(`
 127.0.0.1	localhost
-%s	faas-containerd`, gw)
+%s	faasd-provider`, gw)
 
 	writeHostsErr := ioutil.WriteFile(path.Join(wd, "hosts"),
 		[]byte(hosts), workingDirectoryPermission)
@@ -90,7 +82,6 @@ func (s *Supervisor) Start(svcs []Service) error {
 	if writeHostsErr != nil {
 		return fmt.Errorf("cannot write hosts file: %s", writeHostsErr)
 	}
-	// os.Chown("hosts", 101, 101)
 
 	images := map[string]containerd.Image{}
 
@@ -211,6 +202,28 @@ func (s *Supervisor) Start(svcs []Service) error {
 	return nil
 }
 
+func (s *Supervisor) Close() {
+	defer s.client.Close()
+}
+
+func (s *Supervisor) Remove(svcs []Service) error {
+	ctx := namespaces.WithNamespace(context.Background(), faasdNamespace)
+
+	for _, svc := range svcs {
+		err := cninetwork.DeleteCNINetwork(ctx, s.cni, s.client, svc.Name)
+		if err != nil {
+			log.Printf("[Delete] error removing CNI network for %s, %s\n", svc.Name, err)
+			return err
+		}
+
+		err = service.Remove(ctx, s.client, svc.Name)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func withOCIArgs(args []string) oci.SpecOpts {
 	if len(args) > 0 {
 		return oci.WithProcessArgs(args...)
@@ -220,17 +233,3 @@ func withOCIArgs(args []string) oci.SpecOpts {
 		return nil
 	}
 }
-
-type Service struct {
-	Image  string
-	Env    []string
-	Name   string
-	Mounts []Mount
-	Caps   []string
-	Args   []string
-}
-
-type Mount struct {
-	Src  string
-	Dest string
-}