Update to latest faas-provider

* Move to new namespace
* Update to new functions types for CRUD

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

Author: alexellis

Dockerfile

@@ -1,8 +1,9 @@
 FROM golang:1.11 as build
 
-RUN mkdir -p /go/src/github.com/ewilde/faas-federation/
+RUN mkdir -p /go/src/github.com/openfaas-incubator/faas-federation/
+ENV CGO_ENABLED=0
 
-WORKDIR /go/src/github.com/ewilde/faas-federation
+WORKDIR /go/src/github.com/openfaas-incubator/faas-federation
 
 COPY .git     .git
 COPY handlers handlers
@@ -46,6 +47,6 @@ EXPOSE 8080
 ENV http_proxy      ""
 ENV https_proxy     ""
 
-COPY --from=build /go/src/github.com/ewilde/faas-federation/faas-federation    .
+COPY --from=build /go/src/github.com/openfaas-incubator/faas-federation/faas-federation    .
 
 CMD ["./faas-federation"]

Gopkg.lock

@@ -1,41 +1,14 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
 [[constraint]]
   name = "github.com/gorilla/mux"
   version = "1.7.1"
 
 [[constraint]]
   name = "github.com/openfaas/faas"
-  version = "0.13.0"
+  version = "0.18.0"
 
 [[constraint]]
   name = "github.com/openfaas/faas-provider"
-  version = "0.9.0"
+  version = "0.10.2"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"

Gopkg.toml

@@ -15,14 +15,14 @@ testacc: goimportscheck
 
 .PHONY: build
 build:
-	docker build -t ewilde/faas-federation:$(TAG) . --squash=${SQUASH}
+	docker build -t openfaas/faas-federation:$(TAG) . --squash=${SQUASH}
 
 .PHONY: build-local
 build-local:
 	go build --ldflags "-s -w \
-        -X github.com/ewilde/faas-federation/version.GitCommitSHA=${GIT_COMMIT_SHA} \
-        -X \"github.com/ewilde/faas-federation/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\" \
-        -X github.com/ewilde/faas-federation/version.Version=${VERSION}" \
+        -X github.com/openfaas-incubator/faas-federation/version.GitCommitSHA=${GIT_COMMIT_SHA} \
+        -X \"github.com/openfaas-incubator/faas-federation/version.GitCommitMessage=${GIT_COMMIT_MESSAGE}\" \
+        -X github.com/openfaas-incubator/faas-federation/version.Version=${VERSION}" \
         -o faas-federation .
 
 .PHONY: up-local
@@ -31,8 +31,8 @@ up: build
 
 .PHONY: push
 push:
-	docker tag ewilde/faas-federation:latest ewilde/faas-federation:${VERSION}
-	docker push ewilde/faas-federation:${VERSION}
+	docker tag openfaas/faas-federation:latest openfaas/faas-federation:${VERSION}
+	docker push openfaas/faas-federation:${VERSION}
 
 .PHONY: release
 release:

Makefile

@@ -13,5 +13,5 @@ keywords:
 maintainers:
 - name: alexellis
   email: [email protected]
-- name: ewilde
-  email: ewilde@gmail.com
+- name: openfaas
+  email: openfaas@gmail.com

deployment/chart/of-federation/Chart.yaml

@@ -1,3 +1,3 @@
 approvers:
 - alexellis
-- ewilde
+- openfaas

deployment/chart/of-federation/OWNERS

@@ -26,7 +26,7 @@ faasnetes:
     periodSeconds: 10
 
 faasfederation:
-  image: ewilde/faas-federation:0.1
+  image: openfaas/faas-federation:0.1
   replicas: 1
   readTimeout : "60s"
   writeTimeout : "60s"
@@ -44,7 +44,7 @@ faasfederation:
   default_provider: "http://faasnetes.openfaas:8080"
 
 faaslambda:
-  image: ewilde/faas-lambda:0.1
+  image: openfaas/faas-lambda:0.1
   replicas: 1
   readTimeout : "60s"
   writeTimeout : "60s"

deployment/chart/of-federation/values.yaml

@@ -40,7 +40,7 @@ services:
   faas-federation:
     ports:
       - 8081:8080
-    image: ewilde/faas-federation:latest
+    image: openfaas/faas-federation:latest
     networks:
       - federation
     environment:
@@ -67,7 +67,7 @@ services:
   faas-provider-a:
     ports:
       - 8082:8080
-    image: ewilde/faas-inmemory:latest
+    image: openfaas/faas-inmemory:latest
     networks:
       - federation
     environment:
@@ -92,7 +92,7 @@ services:
   faas-provider-b:
     ports:
       - 8083:8080
-    image: ewilde/faas-inmemory:latest
+    image: openfaas/faas-inmemory:latest
     networks:
       - federation
     environment:

docker-compose.yml

@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ewilde/faas-federation/routing"
-	acc "github.com/ewilde/faas-federation/testing"
 	"github.com/gorilla/mux"
+	"github.com/openfaas-incubator/faas-federation/routing"
+	acc "github.com/openfaas-incubator/faas-federation/testing"
 	"github.com/openfaas/faas-provider/proxy"
 )
 

handlers/delete_test.go

@@ -10,9 +10,10 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/ewilde/faas-federation/routing"
+	types "github.com/openfaas/faas-provider/types"
+
 	"github.com/gorilla/mux"
-	"github.com/openfaas/faas/gateway/requests"
+	"github.com/openfaas-incubator/faas-federation/routing"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -35,7 +36,7 @@ func MakeDeployHandler(proxy http.HandlerFunc, providerLookup routing.ProviderLo
 	}
 }
 
-func proxyDeployment(proxy http.HandlerFunc, function *requests.CreateFunctionRequest, w http.ResponseWriter, r *http.Request) {
+func proxyDeployment(proxy http.HandlerFunc, function *types.FunctionDeployment, w http.ResponseWriter, r *http.Request) {
 	pathVars := mux.Vars(r)
 	if pathVars == nil {
 		r = mux.SetURLVars(r, map[string]string{})
@@ -47,11 +48,11 @@ func proxyDeployment(proxy http.HandlerFunc, function *requests.CreateFunctionRe
 	proxy.ServeHTTP(w, r)
 }
 
-func addToFunctionToCache(r *http.Request, providerLookup routing.ProviderLookup) (*requests.CreateFunctionRequest, error) {
+func addToFunctionToCache(r *http.Request, providerLookup routing.ProviderLookup) (*types.FunctionDeployment, error) {
 	defer r.Body.Close()
 	body, _ := ioutil.ReadAll(r.Body)
 
-	request := &requests.CreateFunctionRequest{}
+	request := &types.FunctionDeployment{}
 	if err := json.Unmarshal(body, &request); err != nil {
 		return nil, fmt.Errorf("error during unmarshal of create function request. %v", err)
 	}