Skip to content

Commit

Permalink
Move to using templates-sdk repo for http function
Browse files Browse the repository at this point in the history 
The HTTP function now makes use of a dedicated repository
for SDK resources in the openfaas org.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
@alexellis
alexellis committed Jul 23, 2020
1 parent aeae736 commit 158d288
Show file tree
Hide file tree
Showing 26 changed files with 41 additions and 52 deletions.
6 changes: 3 additions & 3 deletions template/golang-http-armhf/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM openfaas/of-watchdog:0.7.7 as watchdog
FROM openfaas/of-watchdog:0.8.0 as watchdog
FROM golang:1.13-alpine3.11 as build

RUN apk --no-cache add git

ENV CGO_ENABLED=0

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog

ENV CGO_ENABLED=0

RUN mkdir -p /go/src/handler
WORKDIR /go/src/handler
COPY . .
Expand Down
7 changes: 0 additions & 7 deletions template/golang-http-armhf/function/Gopkg.toml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion template/golang-http-armhf/function/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

"github.com/openfaas-incubator/go-function-sdk"
handler "github.com/openfaas/templates-sdk/go-http"
)

// Handle a function invocation
Expand Down
2 changes: 1 addition & 1 deletion template/golang-http-armhf/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.13

replace handler/function => ./function

require github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
require github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
4 changes: 2 additions & 2 deletions template/golang-http-armhf/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33 h1:KhbcrtXR+IO7IWF08RzKpgMudBhEeRRqNmRurE1iph4=
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625 h1:6JSt10GDCOw0F67bWnqZ6AYg92pbqCcchTu181aT1w0=
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625/go.mod h1:JWcVHdzlHcR7nLuaDL88Mz68wOqDvOn0CLO6t27OMhk=
2 changes: 1 addition & 1 deletion template/golang-http-armhf/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"handler/function"

handler "github.com/openfaas-incubator/go-function-sdk"
handler "github.com/openfaas/templates-sdk/go-http"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion template/golang-http-armhf/template.yml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
language: golang-http-armhf
language: golang-http
fprocess: ./handler
1 change: 0 additions & 1 deletion template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/.DEREK.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/.gitignore
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...penfaas-incubator/go-function-sdk/LICENSE → ...github.com/openfaas/templates-sdk/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions ...nfaas-incubator/go-function-sdk/README.md → .../openfaas/templates-sdk/go-http/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...faas-incubator/go-function-sdk/handler.go → ...openfaas/templates-sdk/go-http/handler.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions template/golang-http-armhf/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
github.com/openfaas-incubator/go-function-sdk
# github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
github.com/openfaas/templates-sdk/go-http
4 changes: 1 addition & 3 deletions template/golang-http/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openfaas/of-watchdog:0.7.7 as watchdog
FROM openfaas/of-watchdog:0.8.0 as watchdog
FROM golang:1.13-alpine3.11 as build

RUN apk --no-cache add git
Expand All @@ -8,8 +8,6 @@ ENV CGO_ENABLED=0
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
RUN chmod +x /usr/bin/fwatchdog

ENV CGO_ENABLED=0

RUN mkdir -p /go/src/handler
WORKDIR /go/src/handler
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion template/golang-http/function/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

handler "github.com/openfaas-incubator/go-function-sdk"
handler "github.com/openfaas/templates-sdk/go-http"
)

// Handle a function invocation
Expand Down
2 changes: 1 addition & 1 deletion template/golang-http/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.13

replace handler/function => ./function

require github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
require github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
4 changes: 2 additions & 2 deletions template/golang-http/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33 h1:KhbcrtXR+IO7IWF08RzKpgMudBhEeRRqNmRurE1iph4=
github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625 h1:6JSt10GDCOw0F67bWnqZ6AYg92pbqCcchTu181aT1w0=
github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625/go.mod h1:JWcVHdzlHcR7nLuaDL88Mz68wOqDvOn0CLO6t27OMhk=
2 changes: 1 addition & 1 deletion template/golang-http/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"handler/function"

handler "github.com/openfaas-incubator/go-function-sdk"
handler "github.com/openfaas/templates-sdk/go-http"
)

var (
Expand Down
1 change: 0 additions & 1 deletion template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/.DEREK.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion template/golang-http/vendor/github.com/openfaas-incubator/go-function-sdk/.gitignore
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...penfaas-incubator/go-function-sdk/LICENSE → ...github.com/openfaas/templates-sdk/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions ...nfaas-incubator/go-function-sdk/README.md → .../openfaas/templates-sdk/go-http/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...faas-incubator/go-function-sdk/handler.go → ...openfaas/templates-sdk/go-http/handler.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions template/golang-http/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# github.com/openfaas-incubator/go-function-sdk v0.0.0-20200405082418-b31e65bf8a33
github.com/openfaas-incubator/go-function-sdk
# github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
github.com/openfaas/templates-sdk/go-http
2 changes: 1 addition & 1 deletion template/golang-middleware-armhf/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openfaas/of-watchdog:0.7.7 as watchdog
FROM openfaas/of-watchdog:0.8.0 as watchdog
FROM golang:1.13-alpine3.11 as build

RUN apk --no-cache add git
Expand Down
2 changes: 1 addition & 1 deletion template/golang-middleware/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openfaas/of-watchdog:0.7.7 as watchdog
FROM openfaas/of-watchdog:0.8.0 as watchdog
FROM golang:1.13-alpine3.11 as build

RUN apk --no-cache add git
Expand Down

0 comments on commit 158d288

Please sign in to comment.