Skip to content

Commit 5fa718d

Browse files
chriskolenkoalexellis
chriskolenko
authored and
alexellis
committed
Upgrades
* Upgrade to latest version of connector-sdk * Add build, push and travis files (Copied from kafka-connector)
1 parent ea5afc9 commit 5fa718d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+6200
-197
lines changed

‎.DEREK.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
redirect: https://raw.githubusercontent.com/openfaas/faas/master/.DEREK.yml

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
nats-connector
1+
.ash_history
2+
connector
3+
nats-connector

‎.travis.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
sudo: required
2+
3+
language: go
4+
5+
go:
6+
- "1.10.x"
7+
8+
services:
9+
- docker
10+
11+
addons:
12+
apt:
13+
packages:
14+
- docker-ce
15+
16+
script:
17+
- make build
18+
19+
after_success:
20+
- if [ -z $DOCKER_NS ] ; then
21+
export DOCKER_NS=openfaas;
22+
fi
23+
24+
- if [ ! -z "$TRAVIS_TAG" ] ; then
25+
docker tag $DOCKER_NS/nats-connector:latest-dev $DOCKER_NS/nats-connector:$TRAVIS_TAG;
26+
echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin;
27+
docker push $DOCKER_NS/nats-connector:$TRAVIS_TAG;
28+
29+
docker tag $DOCKER_NS/nats-connector:latest-dev quay.io/$DOCKER_NS/nats-connector:$TRAVIS_TAG;
30+
echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io;
31+
docker push quay.io/$DOCKER_NS/nats-connector:$TRAVIS_TAG;
32+
fi

‎Dockerfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM golang:1.9.2
1+
FROM golang:1.10 as build
2+
23
RUN mkdir -p /go/src/github.com/openfaas-incubator/nats-connector
34
WORKDIR /go/src/github.com/openfaas-incubator/nats-connector
45

56
COPY vendor vendor
6-
COPY config config
7-
COPY nats nats
87
COPY main.go .
98

109
# Run a gofmt and exclude all vendored code.
@@ -13,6 +12,12 @@ RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
1312
RUN go test -v ./...
1413

1514
# Stripping via -ldflags "-s -w"
16-
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o ./connector
15+
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o /usr/bin/producer
16+
17+
FROM alpine:3.9 as ship
18+
RUN apk add --no-cache ca-certificates
19+
20+
COPY --from=build /usr/bin/producer /usr/bin/producer
21+
WORKDIR /root/
1722

18-
CMD ["./connector"]
23+
CMD ["/usr/bin/producer"]

‎Dockerfile.armhf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM golang:1.10
2+
RUN mkdir -p /go/src/github.com/openfaas-incubator/nats-connector
3+
WORKDIR /go/src/github.com/openfaas-incubator/nats-connector
4+
5+
COPY vendor vendor
6+
COPY main.go .
7+
8+
# Run a gofmt and exclude all vendored code.
9+
RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
10+
11+
RUN go test -v ./...
12+
13+
# Stripping via -ldflags "-s -w"
14+
RUN GOARM=7 CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o ./connector
15+
16+
CMD ["./connector"]

‎Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
TAG?=latest-dev
2+
NAMESPACE?=openfaas
3+
.PHONY: build
4+
5+
build:
6+
./build.sh $(TAG)
7+
8+
ci-armhf-build:
9+
./build.sh $(TAG)
10+
11+
ci-armhf-push:
12+
./build.sh $(TAG)
13+
14+
push:
15+
./push.sh $(TAG)

‎build.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/sh
2+
set -e
3+
4+
export dockerfile="Dockerfile"
5+
export arch=$(uname -m)
6+
export TAG="latest"
7+
8+
if [ "$arch" = "armv7l" ]; then
9+
dockerfile="Dockerfile.armhf"
10+
TAG="latest-armhf-dev"
11+
fi
12+
13+
if [ "$1" ]; then
14+
TAG=$1
15+
if [ "$arch" = "armv7l" ]; then
16+
TAG="$1-armhf"
17+
fi
18+
fi
19+
20+
if [ -z "$NAMESPACE" ]; then
21+
NAMESPACE="openfaas"
22+
fi
23+
24+
docker build -t $NAMESPACE/nats-connector:$TAG . -f $dockerfile --no-cache
25+
#(cd yaml && docker service rm nats_connector ; docker stack deploy nats -c connector-swarm.yml)

‎go.mod

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
module github.com/openfaas-incubator/nats-connector
22

33
require (
4-
github.com/nats-io/go-nats v1.6.0
4+
github.com/golang/protobuf v1.3.1 // indirect
5+
github.com/nats-io/gnatsd v1.4.1 // indirect
6+
github.com/nats-io/go-nats v1.7.2
7+
github.com/nats-io/nkeys v0.0.2 // indirect
58
github.com/nats-io/nuid v1.0.0 // indirect
6-
github.com/openfaas-incubator/connector-sdk v0.0.0-20181118154933-2db120a2ec4b
9+
github.com/openfaas-incubator/connector-sdk v0.0.0-20190611163053-d4baf95d4c62
710
github.com/openfaas/faas v0.0.0-20181122165013-495cf9e7aff0 // indirect
811
github.com/openfaas/faas-provider v0.0.0-20181104131730-8b3147b013c6 // indirect
12+
github.com/pkg/errors v0.8.1 // indirect
13+
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
914
)

‎go.sum

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1-
github.com/nats-io/go-nats v1.6.0 h1:FznPwMfrVwGnSCh7JTXyJDRW0TIkD4Tr+M1LPJt9T70=
2-
github.com/nats-io/go-nats v1.6.0/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
1+
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
2+
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
3+
github.com/nats-io/gnatsd v1.4.1 h1:RconcfDeWpKCD6QIIwiVFcvForlXpWeJP7i5/lDLy44=
4+
github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ=
5+
github.com/nats-io/go-nats v1.7.2 h1:cJujlwCYR8iMz5ofZSD/p2WLW8FabhkQ2lIEVbSvNSA=
6+
github.com/nats-io/go-nats v1.7.2/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
7+
github.com/nats-io/nkeys v0.0.2 h1:+qM7QpgXnvDDixitZtQUBDY9w/s9mu1ghS+JIbsrx6M=
8+
github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
39
github.com/nats-io/nuid v1.0.0 h1:44QGdhbiANq8ZCbUkdn6W5bqtg+mHuDE4wOUuxxndFs=
410
github.com/nats-io/nuid v1.0.0/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
5-
github.com/openfaas-incubator/connector-sdk v0.0.0-20181118154933-2db120a2ec4b h1:XRljIkAJNgYWzx5py2w/fRHPVuRS0/5kSXSlPTT/Evw=
6-
github.com/openfaas-incubator/connector-sdk v0.0.0-20181118154933-2db120a2ec4b/go.mod h1:jHCtd1HCZwhuwdPy4OB8CQU7ZqzxBdWNhIhH/khCJqQ=
11+
github.com/openfaas-incubator/connector-sdk v0.0.0-20190611163053-d4baf95d4c62 h1:NoF7kLOXQIeKRTbqa6ZOG8u+e5Ptng7aSA+R33BFKl0=
12+
github.com/openfaas-incubator/connector-sdk v0.0.0-20190611163053-d4baf95d4c62/go.mod h1:jHCtd1HCZwhuwdPy4OB8CQU7ZqzxBdWNhIhH/khCJqQ=
713
github.com/openfaas/faas v0.0.0-20181122165013-495cf9e7aff0 h1:4+fM0yvoGK5uhdI3kKLzJ8bZTmcyss2FAU6hfpEXh84=
814
github.com/openfaas/faas v0.0.0-20181122165013-495cf9e7aff0/go.mod h1:E0m2rLup0Vvxg53BKxGgaYAGcZa3Xl+vvL7vSi5yQ14=
915
github.com/openfaas/faas-provider v0.0.0-20181104131730-8b3147b013c6 h1:PGmPk5iR8IY2Gl4SlMd2+o4sUmeEFBGFy0SmJoxSIlU=
1016
github.com/openfaas/faas-provider v0.0.0-20181104131730-8b3147b013c6/go.mod h1:W4OIp33RUOpR7wW+omJB/7GhIydRmYXvKf/VqUKI4yM=
17+
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
18+
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
19+
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
20+
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
21+
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k=
22+
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎push.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
set -e
3+
4+
if [ -z "$NAMESPACE" ]; then
5+
NAMESPACE="openfaas"
6+
fi
7+
8+
docker push $NAMESPACE/nats-connector:$TAG

‎vendor/github.com/nats-io/go-nats/.travis.yml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/nats-io/go-nats/README.md

Lines changed: 44 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/nats-io/go-nats/context.go

Lines changed: 63 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)