Update to faas-provider 0.14.0

**What**
- Update faas-provider to 0.14.0
- Refactor to remove the gateway dep
- Add logs and secrets handlers so that the implementation is complete
- Moved makefile targets that referenced the docker compose, because the
  file does not exist anymore
- Add new `make start` command that builds and starts the faas-memory on
  port 8083

Signed-off-by: Lucas Roesler <[email protected]>

Author: LucasRoesler

Gopkg.lock

@@ -35,7 +35,7 @@
 
 [[constraint]]
   name = "github.com/openfaas/faas-provider"
-  version = "0.9.0"
+  version = "0.14.0"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"

Gopkg.toml

@@ -18,21 +18,16 @@ build:
 
 .PHONY: build-local
 build-local:
-	go build --ldflags "-s -w \
+	GO111MODULE=off go build --ldflags "-s -w \
         -X github.com/openfaas-incubator/faas-memory/version.GitCommitSHA=${GIT_COMMIT_SHA} \
         -X \"github.com/openfaas-incubator/faas-memory/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\" \
         -X github.com/openfaas-incubator/faas-memory/version.Version=${VERSION}" \
         -o faas-memory .
 
-.PHONY: up-local-deps
-up-local-deps:
-	docker-compose -f./docker-compose.local.yml up -d
 
-.PHONY: up-local
-up-local: build-local
-	-pkill faas-memory
-	docker-compose -f ./docker-compose.local.yml up -d
-	env port=8081 ./faas-memory
+.PHONY: start
+start: build-local
+	port=8083 ./faas-memory
 
 .PHONY: release
 release:
@@ -70,4 +65,4 @@ lint:
 		echo "Lint found errors in the source code. Please check the reported errors"; \
 		echo "and fix them if necessary before submitting the code for review."; \
 		exit 1; \
-	fi
+	fi

Makefile

@@ -14,18 +14,12 @@ In one terminal, build and start the provider:
 export GOPATH=$HOME/go
 go get -u github.com/openfaas-incubator/faas-memory
 cd $GOPATH/go/src/github.com/openfaas-incubator/faas-memory
-
-make build-local
-
-port=8083 ./faas-provider
+make start
 ```
 
 In another use the CLI with it:
 
 ```sh
-$ export GOPATH=$HOME/go
-$ cd $GOPATH/go/src/github.com/openfaas-incubator/faas-memory
-
 $ export OPENFAAS_URL=127.0.0.1:8083
 
 $ faas-cli list
@@ -42,6 +36,6 @@ URL: http://127.0.0.1:8083/function/figlet
 $ faas-cli list
 
 Function                      	Invocations    	Replicas
-figlet                        	0              	1    
+figlet                        	0              	1
 ```
 

README.md

@@ -8,18 +8,21 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/openfaas/faas/gateway/requests"
 	log "github.com/sirupsen/logrus"
 )
 
+type deleteFunctionRequest struct {
+	FunctionName string `json:"functionName"`
+}
+
 // MakeDeleteHandler delete a function
 func MakeDeleteHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		log.Info("delete request")
 		defer r.Body.Close()
 
 		body, _ := ioutil.ReadAll(r.Body)
-		request := requests.DeleteFunctionRequest{}
+		request := deleteFunctionRequest{}
 		if err := json.Unmarshal(body, &request); err != nil {
 			log.Errorf("error de-serializing request body:%s", body)
 			log.Error(err)

handlers/delete.go

@@ -8,11 +8,12 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/openfaas/faas/gateway/requests"
 	log "github.com/sirupsen/logrus"
+
+	typesv1 "github.com/openfaas/faas-provider/types"
 )
 
-var functions = map[string]*requests.Function{}
+var functions = map[string]*typesv1.FunctionStatus{}
 
 // MakeDeployHandler creates a handler to create new functions in the cluster
 func MakeDeployHandler() http.HandlerFunc {
@@ -23,14 +24,14 @@ func MakeDeployHandler() http.HandlerFunc {
 
 		body, _ := ioutil.ReadAll(r.Body)
 
-		request := requests.CreateFunctionRequest{}
+		request := typesv1.FunctionDeployment{}
 		if err := json.Unmarshal(body, &request); err != nil {
 			log.Errorln("error during unmarshal of create function request. ", err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
-		functions[request.Service] = createToRequest(request)
+		functions[request.Service] = requestToStatus(request)
 
 		log.Infof("deployment request for function %s", request.Service)
 

handlers/deploy.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/openfaas/faas-provider/types"
+	typesv1 "github.com/openfaas/faas-provider/types"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -24,16 +24,16 @@ func MakeInfoHandler(version, sha string) http.HandlerFunc {
 
 		log.Info("info request")
 
-		infoRequest := types.InfoRequest{
+		infoResponse := typesv1.InfoResponse{
 			Orchestration: OrchestrationIdentifier,
 			Provider:      ProviderName,
-			Version: types.ProviderVersion{
+			Version: typesv1.ProviderVersion{
 				Release: version,
 				SHA:     sha,
 			},
 		}
 
-		jsonOut, marshalErr := json.Marshal(infoRequest)
+		jsonOut, marshalErr := json.Marshal(infoResponse)
 		if marshalErr != nil {
 			log.Error("Error during unmarshal of info request ", marshalErr)
 			w.WriteHeader(http.StatusInternalServerError)

handlers/info.go

@@ -0,0 +1,27 @@
+package handlers
+
+import (
+	"context"
+
+	"github.com/openfaas/faas-provider/logs"
+)
+
+// LogRequester implements the Requester interface
+type LogRequester struct{}
+
+// NewLogRequester returns a Requestor instance that can be used in the function logs endpoint
+func NewLogRequester() logs.Requester {
+	return &LogRequester{}
+}
+
+// Query implements the actual Swarm logs request logic for the Requester interface
+func (l LogRequester) Query(ctx context.Context, r logs.Request) (<-chan logs.Message, error) {
+	msgStream := make(chan logs.Message, 1)
+	msgStream <- logs.Message{
+		Name:      r.Name,
+		Namespace: r.Namespace,
+		Text:      "memory log line",
+	}
+	close(msgStream)
+	return msgStream, nil
+}

handlers/logs.go

@@ -0,0 +1,25 @@
+package handlers
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+)
+
+// faas-memory does not use namespaces, so we return an empty list. see https://github.com/openfaas-incubator/connector-sdk/pull/46
+func NamespaceLister() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		namespaces := []string{}
+		nsJSON, err := json.Marshal(namespaces)
+
+		if err != nil {
+			log.Printf("Unable to marshal namespaces into JSON %q", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte("\"error\": \"unable to return namespaces\""))
+		}
+
+		w.WriteHeader(http.StatusOK)
+		w.Write(nsJSON)
+	}
+}

handlers/namespace.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/openfaas/faas/gateway/requests"
+	typesv1 "github.com/openfaas/faas-provider/types"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -32,17 +32,17 @@ func MakeFunctionReader() http.HandlerFunc {
 	}
 }
 
-func readServices() ([]*requests.Function, error) {
-	var list []*requests.Function
+func readServices() ([]*typesv1.FunctionStatus, error) {
+	var list []*typesv1.FunctionStatus
 	for _, v := range functions {
 		list = append(list, v)
 	}
 
 	return list, nil
 }
 
-func createToRequest(request requests.CreateFunctionRequest) *requests.Function {
-	return &requests.Function{
+func requestToStatus(request typesv1.FunctionDeployment) *typesv1.FunctionStatus {
+	return &typesv1.FunctionStatus{
 		Name:              request.Service,
 		Annotations:       request.Annotations,
 		EnvProcess:        request.EnvProcess,