Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions packages/nats-server/packaging
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
#!/usr/bin/env bash

set -ex
set -e

mkdir -p ${BOSH_INSTALL_TARGET}/src
mv * ${BOSH_INSTALL_TARGET}/src
mv ${BOSH_INSTALL_TARGET}/src .
mkdir -p ${BOSH_INSTALL_TARGET}/bin

export GOBIN=${BOSH_INSTALL_TARGET}/bin
mkdir -p "${GOBIN}"

source /var/vcap/packages/golang-*-linux/bosh/compile.env

pushd "src/code.cloudfoundry.org"
go build -o "${GOBIN}/nats-server" github.com/nats-io/nats-server/v2
popd
tar xzf nats-server-gh-release/nats-server-v*-linux-amd64.tar.gz
cp nats-server-v*-linux-amd64/nats-server ${BOSH_INSTALL_TARGET}/bin/nats-server
chmod +x ${BOSH_INSTALL_TARGET}/bin/nats-server
65 changes: 2 additions & 63 deletions packages/nats-server/spec
Original file line number Diff line number Diff line change
@@ -1,68 +1,7 @@
---
name: nats-server

dependencies:
- golang-1.24-linux
dependencies: []

files:
- code.cloudfoundry.org/go.mod
- code.cloudfoundry.org/go.sum
- code.cloudfoundry.org/vendor/modules.txt
- code.cloudfoundry.org/vendor/github.com/google/go-tpm/legacy/tpm2/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/google/go-tpm/tpmutil/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/google/go-tpm/tpmutil/tbs/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/klauspost/compress/flate/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/klauspost/compress/internal/le/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/klauspost/compress/internal/race/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/klauspost/compress/s2/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/klauspost/compress/s2/*.s # gosub
- code.cloudfoundry.org/vendor/github.com/minio/highwayhash/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/minio/highwayhash/*.s # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/jwt/v2/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/conf/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/internal/fastrand/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/internal/ldap/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/logger/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/avl/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/certidp/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/certstore/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/gsl/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/pse/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/stree/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/sysmem/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/thw/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2/server/tpm/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nkeys/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/nats-io/nuid/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/automaxprocs/internal/cgroups/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/automaxprocs/internal/runtime/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/automaxprocs/maxprocs/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/bcrypt/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blake2b/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blake2b/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blowfish/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/chacha20/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/chacha20/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/chacha20poly1305/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/chacha20poly1305/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/cryptobyte/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/cryptobyte/asn1/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/curve25519/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/internal/alias/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/internal/poly1305/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/internal/poly1305/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/nacl/box/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/nacl/secretbox/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/ocsp/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/salsa20/salsa/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/salsa20/salsa/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/cpu/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/cpu/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/windows/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/windows/registry/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/windows/svc/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/windows/svc/eventlog/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/sys/windows/svc/mgr/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/time/rate/*.go # gosub
- nats-server-gh-release/nats-server-v*-linux-amd64.tar.gz
6 changes: 0 additions & 6 deletions src/code.cloudfoundry.org/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
code.cloudfoundry.org/lager/v3 v3.32.0
code.cloudfoundry.org/tlsconfig v0.23.0
github.com/nats-io/gnatsd v1.4.1
github.com/nats-io/nats-server/v2 v2.11.0
github.com/nats-io/nats.go v1.40.1
github.com/onsi/ginkgo/v2 v2.23.3
github.com/onsi/gomega v1.36.3
Expand All @@ -25,24 +24,19 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-tpm v0.9.3 // indirect
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/minio/highwayhash v1.0.3 // indirect
github.com/nats-io/go-nats v1.7.2 // indirect
github.com/nats-io/jwt/v2 v2.7.3 // indirect
github.com/nats-io/nkeys v0.4.10 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/openzipkin/zipkin-go v0.4.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/square/certstrap v1.3.0 // indirect
go.step.sm/crypto v0.60.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.31.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
17 changes: 0 additions & 17 deletions src/code.cloudfoundry.org/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,6 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/antithesishq/antithesis-sdk-go v0.4.3-default-no-op h1:+OSa/t11TFhqfrX0EOSqQBDJ0YlpmK0rDSiB19dg9M0=
github.com/antithesishq/antithesis-sdk-go v0.4.3-default-no-op/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl3v2yvUZjmKncl7U91fup7E=
github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
Expand Down Expand Up @@ -750,8 +748,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc=
github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
Expand Down Expand Up @@ -833,16 +829,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q=
github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ=
github.com/nats-io/gnatsd v1.4.1 h1:RconcfDeWpKCD6QIIwiVFcvForlXpWeJP7i5/lDLy44=
github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ=
github.com/nats-io/go-nats v1.7.2 h1:cJujlwCYR8iMz5ofZSD/p2WLW8FabhkQ2lIEVbSvNSA=
github.com/nats-io/go-nats v1.7.2/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0=
github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE=
github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4=
github.com/nats-io/nats-server/v2 v2.11.0 h1:fdwAT1d6DZW/4LUz5rkvQUe5leGEwjjOQYntzVRKvjE=
github.com/nats-io/nats-server/v2 v2.11.0/go.mod h1:leXySghbdtXSUmWem8K9McnJ6xbJOb0t9+NQ5HTRZjI=
github.com/nats-io/nats.go v1.40.1 h1:MLjDkdsbGUeCMKFyCFoLnNn/HDTqcgVa3EQm+pMNDPk=
github.com/nats-io/nats.go v1.40.1/go.mod h1:wV73x0FSI/orHPSYoyMeJB+KajMDoWyXmFaRrrYaaTo=
github.com/nats-io/nkeys v0.4.10 h1:glmRrpCmYLHByYcePvnTBEAwawwapjCPMjy2huw20wc=
Expand Down Expand Up @@ -902,8 +892,6 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
Expand Down Expand Up @@ -959,8 +947,6 @@ go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
go.step.sm/crypto v0.60.0 h1:UgSw8DFG5xUOGB3GUID17UA32G4j1iNQ4qoMhBmsVFw=
go.step.sm/crypto v0.60.0/go.mod h1:Ep83Lv818L4gV0vhFTdPWRKnL6/5fRMpi8SaoP5ArSw=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down Expand Up @@ -1229,7 +1215,6 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
Expand Down Expand Up @@ -1268,8 +1253,6 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
8 changes: 0 additions & 8 deletions src/code.cloudfoundry.org/nats-server/nats-server.go

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (runner *NATSRunner) Start(version ...string) {
Expect(err).NotTo(HaveOccurred())
cmd = exec.Command(gnatsdBin, "-p", strconv.Itoa(runner.port))
} else {
natsServerBin, err := gexec.Build("github.com/nats-io/nats-server/v2", "-buildvcs=false")
natsServerBin, err := exec.LookPath("nats-server")
Expect(err).NotTo(HaveOccurred())
cmd = exec.Command(natsServerBin, "-p", strconv.Itoa(runner.port))
}
Expand Down
Loading