From 034ca690d27e2db0f67d96d3ddd7d51c3e8fb90f Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Wed, 15 Mar 2023 21:10:21 -0400 Subject: [PATCH] Update versions Signed-off-by: Byron Ruth --- cmd/nbe/go.mod | 9 ++++----- cmd/nbe/go.sum | 13 +++++++++---- docker/cli/Dockerfile | 4 +++- docker/docker-compose.cluster.yaml | 6 +++--- docker/docker-compose.yaml | 2 +- docker/go/go.mod | 8 -------- docker/go/go.sum | 12 ++++-------- examples/integrations/debezium/cli/Dockerfile | 2 +- examples/operations/stan2js/cli/Dockerfile | 4 ++-- 9 files changed, 27 insertions(+), 33 deletions(-) diff --git a/cmd/nbe/go.mod b/cmd/nbe/go.mod index 5a44123a..c56ff7bc 100644 --- a/cmd/nbe/go.mod +++ b/cmd/nbe/go.mod @@ -8,15 +8,14 @@ require ( github.com/google/uuid v1.3.0 github.com/olekukonko/tablewriter v0.0.5 github.com/russross/blackfriday/v2 v2.1.0 - github.com/urfave/cli/v2 v2.10.3 - github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5 - golang.org/x/mod v0.7.0 + github.com/urfave/cli/v2 v2.25.0 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/dlclark/regexp2 v1.4.0 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/dlclark/regexp2 v1.8.1 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/rivo/uniseg v0.4.4 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect ) diff --git a/cmd/nbe/go.sum b/cmd/nbe/go.sum index 8f794d2d..3a5558d9 100644 --- a/cmd/nbe/go.sum +++ b/cmd/nbe/go.sum @@ -7,16 +7,23 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0= +github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= 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/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -24,12 +31,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/urfave/cli/v2 v2.10.3 h1:oi571Fxz5aHugfBAJd5nkwSk3fzATXtMlpxdLylSCMo= github.com/urfave/cli/v2 v2.10.3/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= -github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5 h1:gmD7q6cCJfBbcuobWQe/KzLsd9Cd3amS1Mq5f3uU1qo= -github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5/go.mod h1:fVwOndYN3s5IaGlMucfgxwMhqwcaJtlGejBU6zX6Yxw= +github.com/urfave/cli/v2 v2.25.0 h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8= +github.com/urfave/cli/v2 v2.25.0/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= -golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/docker/cli/Dockerfile b/docker/cli/Dockerfile index e442792a..8ecc0364 100644 --- a/docker/cli/Dockerfile +++ b/docker/cli/Dockerfile @@ -2,8 +2,9 @@ FROM golang:1.19-alpine3.17 AS build RUN apk update && apk add git +RUN go install github.com/nats-io/nats-server/v2@v2.9.15 RUN go install github.com/nats-io/natscli/nats@v0.0.35 -RUN go install github.com/nats-io/nats-server/v2@v2.9.11 +RUN go install github.com/nats-io/nsc/v2@v2.7.8 FROM alpine3.17 @@ -11,6 +12,7 @@ RUN apk add bash curl COPY --from=build /go/bin/nats-server /usr/local/bin/ COPY --from=build /go/bin/nats /usr/local/bin/ +COPY --from=build /go/bin/nsc /usr/local/bin/ COPY . . diff --git a/docker/docker-compose.cluster.yaml b/docker/docker-compose.cluster.yaml index a45f38c5..55f4e59a 100644 --- a/docker/docker-compose.cluster.yaml +++ b/docker/docker-compose.cluster.yaml @@ -1,7 +1,7 @@ version: '3.9' services: nats1: - image: docker.io/nats:2.9.10 + image: docker.io/nats:2.9.15 command: - "--debug" - "--name=nats1" @@ -12,7 +12,7 @@ services: - "--js" nats2: - image: docker.io/nats:2.9.10 + image: docker.io/nats:2.9.15 command: - "--debug" - "--name=nats2" @@ -23,7 +23,7 @@ services: - "--js" nats3: - image: docker.io/nats:2.9.10 + image: docker.io/nats:2.9.15 command: - "--debug" - "--name=nats3" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 2429c8e7..6e7a3ed7 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.9' services: nats: - image: docker.io/nats:2.9.10 + image: docker.io/nats:2.9.15 command: - "--debug" - "--http_port=8222" diff --git a/docker/go/go.mod b/docker/go/go.mod index 483d529d..fd882173 100644 --- a/docker/go/go.mod +++ b/docker/go/go.mod @@ -1,11 +1,3 @@ module github.com/ConnectEverything/nats-by-example/go go 1.19 - -require ( - github.com/nats-io/jwt/v2 v2.3.0 // indirect - github.com/nats-io/nats.go v1.22.0 // indirect - github.com/nats-io/nkeys v0.3.0 // indirect - github.com/nats-io/nuid v1.0.1 // indirect - golang.org/x/crypto v0.3.0 // indirect -) diff --git a/docker/go/go.sum b/docker/go/go.sum index 5c9b0f66..67f1dfbe 100644 --- a/docker/go/go.sum +++ b/docker/go/go.sum @@ -1,18 +1,14 @@ github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats.go v1.20.0 h1:T8JJnQfVSdh1CzGiwAOv5hEobYCBho/0EupGznYw0oM= -github.com/nats-io/nats.go v1.20.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA= -github.com/nats-io/nats.go v1.22.0 h1:3dxyVf+S449DbMriqQV27HgSbXklxT9SUKbDKIxhrV0= -github.com/nats-io/nats.go v1.22.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA= +github.com/nats-io/nats.go v1.24.0 h1:CRiD8L5GOQu/DcfkmgBcTTIQORMwizF+rPk6T0RaHVQ= +github.com/nats-io/nats.go v1.24.0/go.mod h1:dVQF+BK3SzUZpwyzHedXsvH3EO38aVKuOPkkHlv5hXA= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= -golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/examples/integrations/debezium/cli/Dockerfile b/examples/integrations/debezium/cli/Dockerfile index 32c2caed..1c76f2ff 100644 --- a/examples/integrations/debezium/cli/Dockerfile +++ b/examples/integrations/debezium/cli/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.19-alpine3.17 AS build RUN apk update && apk add git +RUN go install github.com/nats-io/nats-server/v2@v2.9.15 RUN go install github.com/nats-io/natscli/nats@v0.0.35 -RUN go install github.com/nats-io/nats-server/v2@v2.9.11 FROM alpine:3.17 diff --git a/examples/operations/stan2js/cli/Dockerfile b/examples/operations/stan2js/cli/Dockerfile index 85c1fc9c..1c6b22c1 100644 --- a/examples/operations/stan2js/cli/Dockerfile +++ b/examples/operations/stan2js/cli/Dockerfile @@ -2,9 +2,9 @@ FROM golang:1.20-alpine3.17 AS build RUN apk update && apk add git +RUN go install github.com/nats-io/nats-server/v2@v2.9.15 RUN go install github.com/nats-io/natscli/nats@v0.0.35 -RUN go install github.com/nats-io/nats-server/v2@v2.9.14 -RUN go install github.com/nats-io/stan2js/cmd/stan2js@85a931c +RUN go install github.com/nats-io/stan2js/cmd/stan2js@v0.1.0 COPY ./generate-stan-data ./generate-stan-data