gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for v2.0.4 with goreleaser

Browse Source 
Also fixed some flappers

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
This commit is contained in:
Ivan Kozlovic
2019-08-14 13:18:53 -06:00
parent 0fd42cffcb
commit 07e3db6b8e
14 changed files with 112 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
.goreleaser.yml Normal file
View File

@@ -0,0 +1,57 @@
project_name: nats-server
release:
github:
owner: nats-io
name: nats-server
name_template: 'Release {{.Tag}}'
draft: true
changelog:
skip: true
builds:
- main: ./main.go
binary: nats-server
ldflags:
- -s -w -X github.com/nats-io/nats-server/server.gitCommit={{.ShortCommit}}
env:
- GO111MODULE=off
- CGO_ENABLED=0
goos:
- darwin
- linux
- windows
goarch:
- amd64
- arm
- arm64
- 386
goarm:
- 6
- 7
ignore:
- goos: darwin
goarch: 386
nfpms:
- name_template: '{{.ProjectName}}-{{.Tag}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
homepage: https://nats.io
description: High-Performance server for NATS, the cloud native messaging system.
maintainer: Ivan Kozlovic <ivan@synadia.com>
license: Apache 2.0
vendor: Synadia Inc.
formats:
- deb
- rpm
archives:
- name_template: '{{.ProjectName}}-{{.Tag}}-{{.Os}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
wrap_in_directory: true
format: zip
files:
- README.md
- LICENSE
checksum:
name_template: '{{.ProjectName}}-{{.Tag}}-checksums.txt'

25
.travis.yml
View File

@@ -2,6 +2,10 @@ language: go
go:
- 1.11.x
- 1.12.x
addons:
apt:
packages:
- rpm
env:
- GO111MODULE=off
go_import_path: github.com/nats-io/nats-server
@@ -9,9 +13,6 @@ install:
- go get github.com/nats-io/nats.go/
- go get github.com/nats-io/nkeys
- go get github.com/nats-io/jwt
- go get github.com/mattn/goveralls
- go get github.com/wadey/gocovmerge
- go get github.com/tcnksm/ghr
- go get -u honnef.co/go/tools/cmd/staticcheck
- go get -u github.com/client9/misspell/cmd/misspell
before_script:
@@ -21,11 +22,19 @@ before_script:
- go vet $EXCLUDE_VENDOR
- misspell -error -locale US $EXCLUDE_VENDOR
- staticcheck $EXCLUDE_VENDOR
- if [[ "$TRAVIS_GO_VERSION" =~ 1.11 ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; fi
script:
- go test -i $EXCLUDE_VENDOR
- go test -run=TestNoRace $EXCLUDE_VENDOR
- GOGC=10 go test -v -race -p=1 --failfast $EXCLUDE_VENDOR
# - if [[ "$TRAVIS_GO_VERSION" =~ 1.11 ]]; then ./scripts/cov.sh TRAVIS; else GOGC=10 go test -v -race -p=1 --failfast $EXCLUDE_VENDOR; fi
after_success:
- if [[ "$TRAVIS_GO_VERSION" =~ 1.11 ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
- if [[ "$TRAVIS_GO_VERSION" =~ 1.12 ]]; then ./scripts/cov.sh TRAVIS; else GOGC=10 go test -v -race -p=1 --failfast $EXCLUDE_VENDOR; fi
deploy:
provider: script
skip_cleanup: true
script: curl -sL http://git.io/goreleaser | bash
verbose: true
on:
tags: true
condition: $TRAVIS_GO_VERSION =~ 1.12
notifications:
email: false

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM golang:1.11.12
FROM golang:1.12.8
MAINTAINER Ivan Kozlovic <ivan@synadia.com>

2
Dockerfile.all
View File

@@ -1,4 +1,4 @@
FROM golang:1.11.12
FROM golang:1.12.8
MAINTAINER Ivan Kozlovic <ivan@synadia.com>

4
README.md
View File

@@ -29,8 +29,8 @@ If you are interested in contributing to NATS, read about our...
[Fossa-Image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnats-io%2Fgnatsd.svg?type=shield
[Build-Status-Url]: https://travis-ci.org/nats-io/nats-server
[Build-Status-Image]: https://travis-ci.org/nats-io/nats-server.svg?branch=master
[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.0.2
[Release-image]: https://img.shields.io/badge/release-v2.0.2-1eb0fc.svg
[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.0.4
[Release-image]: https://img.shields.io/badge/release-v2.0.4-1eb0fc.svg
[Coverage-Url]: https://coveralls.io/r/nats-io/nats-server?branch=master
[Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-server/badge.svg?branch=master
[ReportCard-Url]: https://goreportcard.com/report/nats-io/nats-server

2
go.mod
View File

@@ -1,7 +1,7 @@
module github.com/nats-io/nats-server/v2
require (
github.com/nats-io/jwt v0.2.13-0.20190807221443-88776a07123f
github.com/nats-io/jwt v0.2.14
github.com/nats-io/nats.go v1.8.1
github.com/nats-io/nkeys v0.1.0
github.com/nats-io/nuid v1.0.1

6
go.sum
View File

@@ -1,7 +1,5 @@
github.com/nats-io/jwt v0.2.13-0.20190726194050-829b612a49c3 h1:5vVSRJhjWOTv/TeJX1NUGuDYbZkfcWTu/97AHlsC02o=
github.com/nats-io/jwt v0.2.13-0.20190726194050-829b612a49c3/go.mod h1:mQxQ0uHQ9FhEVPIcTSKwx2lqZEpXWWcCgA7R6NrWvvY=
github.com/nats-io/jwt v0.2.13-0.20190807221443-88776a07123f h1:HXbsDIrce5ay5anz4HAI57VYDcGznOYs0hCj2QZXBzI=
github.com/nats-io/jwt v0.2.13-0.20190807221443-88776a07123f/go.mod h1:mQxQ0uHQ9FhEVPIcTSKwx2lqZEpXWWcCgA7R6NrWvvY=
github.com/nats-io/jwt v0.2.14 h1:wA50KvFz/JXGXMHRygTWsRGh/ixxgC5E3kHvmtGLNf4=
github.com/nats-io/jwt v0.2.14/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
github.com/nats-io/nats.go v1.8.1 h1:6lF/f1/NN6kzUDBz6pyvQDEXO39jqXcWRLu/tKjtOUQ=
github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=

13
scripts/cov.sh
View File

@@ -1,12 +1,17 @@
#!/bin/bash -e
# Run from directory above via ./scripts/cov.sh
export GO111MODULE="off"
go get github.com/mattn/goveralls
go get github.com/wadey/gocovmerge
rm -rf ./cov
mkdir cov
go test -v -covermode=atomic -coverprofile=./cov/conf.out ./conf
go test -v -covermode=atomic -coverprofile=./cov/log.out ./logger
go test -v -covermode=atomic -coverprofile=./cov/server.out --failfast ./server
go test -v -covermode=atomic -coverprofile=./cov/test.out -coverpkg=./server --failfast ./test
go test -v -failfast -covermode=atomic -coverprofile=./cov/conf.out ./conf
go test -v -failfast -covermode=atomic -coverprofile=./cov/log.out ./logger
go test -v -failfast -covermode=atomic -coverprofile=./cov/server.out ./server
go test -v -failfast -covermode=atomic -coverprofile=./cov/test.out -coverpkg=./server ./test
gocovmerge ./cov/*.out > acc.out
rm -rf ./cov

36
scripts/cross_compile.sh
View File

@@ -1,36 +0,0 @@
#!/bin/bash
set -e
# For now depend on vendor directory.
# When we change to modules we need this to force pull in windows.
# GOOS=windows GOARCH=amd64 go get -u
export GO111MODULE="off"
go get github.com/mitchellh/gox
export APPNAME="nats-server"
export OSARCH="linux/386 linux/amd64 linux/arm64 darwin/amd64 windows/386 windows/amd64"
export DIRS="linux-386 linux-amd64 linux-arm6 linux-arm7 linux-arm64 darwin-amd64 windows-386 windows-amd64"
export OUTDIR="pkg"
# If we have an arg, assume its a version tag and rename as appropriate.
if [[ -n $1 ]]; then
export APPNAME=$APPNAME-$1
fi
# Build all from OSARCH list
env CGO_ENABLED=0 gox -osarch="$OSARCH" -ldflags="-s -w" -output "$OUTDIR/$APPNAME-{{.OS}}-{{.Arch}}/nats-server"
# Be explicit about the ARM builds
# ARMv6
env CGO_ENABLED=0 GOARM=6 gox -osarch="linux/arm" -ldflags="-s -w" -output "$OUTDIR/$APPNAME-linux-arm6/nats-server"
# ARMv7
env CGO_ENABLED=0 GOARM=7 gox -osarch="linux/arm" -ldflags="-s -w" -output "$OUTDIR/$APPNAME-linux-arm7/nats-server"
# Create the zip files
for dir in $DIRS; do \
(cp README.md $OUTDIR/$APPNAME-$dir/README.md) ;\
(cp LICENSE $OUTDIR/$APPNAME-$dir/LICENSE) ;\
(cd $OUTDIR && zip -q $APPNAME-$dir.zip -r $APPNAME-$dir) ;\
echo "make $OUTDIR/$APPNAME-$dir.zip" ;\
done

2
server/norace_test.go
View File

@@ -692,7 +692,7 @@ func TestNoRaceRouteCache(t *testing.T) {
checkExpected := func(t *testing.T, expected int) {
t.Helper()
checkFor(t, time.Second, 15*time.Millisecond, func() error {
checkFor(t, 2*time.Second, 15*time.Millisecond, func() error {
route.mu.Lock()
n := len(route.in.pacache)
route.mu.Unlock()

29
test/tls_test.go
View File

@@ -548,28 +548,13 @@ func TestTLSRoutesCertificateCNBasedAuth(t *testing.T) {
t.Error("Expected Cluster TLS verify and map feature to be activated")
}
routeA, err := url.Parse("nats://localhost:9935")
if err != nil {
t.Fatal(err)
}
routeB, err := url.Parse("nats://localhost:9936")
if err != nil {
t.Fatal(err)
}
routeC, err := url.Parse("nats://localhost:9937")
if err != nil {
t.Fatal(err)
}
routes := make([]*url.URL, 3)
routes[0] = routeA
routes[1] = routeB
routes[2] = routeC
routeURLs := "nats://localhost:9935, nats://localhost:9936, nats://localhost:9937"
optsA.Host = "127.0.0.1"
optsA.Port = 9335
optsA.Cluster.Host = optsA.Host
optsA.Cluster.Port = 9935
optsA.Routes = routes
optsA.Routes = server.RoutesFromStr(routeURLs)
srvA := RunServer(optsA)
defer srvA.Shutdown()
@@ -577,7 +562,7 @@ func TestTLSRoutesCertificateCNBasedAuth(t *testing.T) {
optsB.Port = 9336
optsB.Cluster.Host = optsB.Host
optsB.Cluster.Port = 9936
optsB.Routes = routes
optsB.Routes = server.RoutesFromStr(routeURLs)
srvB := RunServer(optsB)
defer srvB.Shutdown()
@@ -585,10 +570,13 @@ func TestTLSRoutesCertificateCNBasedAuth(t *testing.T) {
optsC.Port = 9337
optsC.Cluster.Host = optsC.Host
optsC.Cluster.Port = 9937
optsC.Routes = routes
optsC.Routes = server.RoutesFromStr(routeURLs)
srvC := RunServer(optsC)
defer srvC.Shutdown()
// srvC is not connected to srvA and srvB due to wrong cert
checkClusterFormed(t, srvA, srvB)
nc1, err := nats.Connect(fmt.Sprintf("%s:%d", optsA.Host, optsA.Port), nats.Name("A"))
if err != nil {
t.Fatalf("Expected to connect, got %v", err)
@@ -720,6 +708,9 @@ func TestTLSGatewaysCertificateCNBasedAuth(t *testing.T) {
srvC := RunServer(optsC)
defer srvC.Shutdown()
waitForOutboundGateways(t, srvA, 1, 2*time.Second)
waitForOutboundGateways(t, srvB, 1, 2*time.Second)
nc1, err := nats.Connect(srvA.Addr().String(), nats.Name("A"))
if err != nil {
t.Fatalf("Expected to connect, got %v", err)

2
vendor/github.com/nats-io/jwt/go.mod generated vendored
View File

@@ -1,3 +1,3 @@
module github.com/nats-io/jwt
require github.com/nats-io/nkeys v0.0.2
require github.com/nats-io/nkeys v0.1.0

15
vendor/github.com/nats-io/jwt/go.sum generated vendored
View File

@@ -1,6 +1,9 @@
github.com/nats-io/nkeys v0.0.1 h1:D8diORXpjJEBxbDeeBtr4+drc4Ydzf4THJDVamDbd/g=
github.com/nats-io/nkeys v0.0.1/go.mod h1:/5AG7AMgoe6jJRxS8l8qz974c6zxp5ApcV7VkXwSciY=
github.com/nats-io/nkeys v0.0.2 h1:+qM7QpgXnvDDixitZtQUBDY9w/s9mu1ghS+JIbsrx6M=
github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4=
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

2
vendor/modules.txt vendored
View File

@@ -1,4 +1,4 @@
# github.com/nats-io/jwt v0.2.13-0.20190807221443-88776a07123f
# github.com/nats-io/jwt v0.2.14
github.com/nats-io/jwt
# github.com/nats-io/nats.go v1.8.1
github.com/nats-io/nats.go