Merge pull request #2125 from ripienaar/dependencies

(misc) Update dependencies

.github/workflows/installation.yaml

@@ -10,46 +10,46 @@ jobs:
     steps:
       - name: EL7 Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el7-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el7-go1.21
 
   el8_64:
     runs-on: ubuntu-latest
     steps:
       - name: EL8 Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el8-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el8-go1.21
 
   el9_64:
     runs-on: ubuntu-latest
     steps:
       - name: EL9 Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el9-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:el9-go1.21
 
   bionic_64:
     runs-on: ubuntu-latest
     steps:
       - name: Bionic Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:bionic-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:bionic-go1.21
 
   focal_64:
     runs-on: ubuntu-latest
     steps:
       - name: Focal Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:focal-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:focal-go1.21
 
   buster_64:
     runs-on: ubuntu-latest
     steps:
       - name: Buster Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:buster-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:buster-go1.21
 
   bullseye_64:
     runs-on: ubuntu-latest
     steps:
       - name: Bullseye Installation Tests
         shell: bash
-        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:bullseye-go1.20
+        run: docker run --entrypoint=/bin/install-choria.sh registry.choria.io/choria/packager:bullseye-go1.21

.github/workflows/test.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{matrix.go}}
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM almalinux:8
+FROM almalinux:9
 
 ARG REPO="https://yum.eu.choria.io/release/el/release.repo"
 

Dockerfile-nightly

@@ -1,13 +1,13 @@
-FROM almalinux:8
+FROM almalinux:9
 
 ARG DATE="unknown"
 
 WORKDIR /
 
-COPY choria-0.99.0.${DATE}-1.el8.x86_64.rpm /tmp
+COPY choria-0.99.0.${DATE}-1.el9.x86_64.rpm /tmp
 
 RUN yum -y install nc procps-ng openssl net-tools iproute && \
-    yum -y localinstall /tmp/choria-0.99.0.${DATE}-1.el8.x86_64.rpm && \
+    yum -y localinstall /tmp/choria-0.99.0.${DATE}-1.el9.x86_64.rpm && \
     yum -y clean all
 
 RUN groupadd --gid 2048 choria && \

go.mod

@@ -31,11 +31,11 @@ require (
 	github.com/looplab/fsm v1.0.1
 	github.com/miekg/pkcs11 v1.1.1
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/nats-io/jsm.go v0.1.1-0.20240111112330-8508bd502b64
-	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240217230419-4b3317b980ba
+	github.com/nats-io/jsm.go v0.1.1-0.20240207100149-2665d2ce5928
+	github.com/nats-io/nats-server/v2 v2.11.0-preview.1
 	github.com/nats-io/nats.go v1.33.1
-	github.com/nats-io/natscli v0.1.2-0.20240111163134-59e8c66e1dcb
-	github.com/onsi/ginkgo/v2 v2.15.0
+	github.com/nats-io/natscli v0.1.3
+	github.com/onsi/ginkgo/v2 v2.16.0
 	github.com/onsi/gomega v1.31.1
 	github.com/open-policy-agent/opa v0.61.0
 	github.com/prometheus/client_golang v1.18.0
@@ -47,9 +47,9 @@ require (
 	github.com/tidwall/gjson v1.17.1
 	github.com/tidwall/pretty v1.2.1
 	github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5
-	golang.org/x/crypto v0.19.0
-	golang.org/x/sys v0.17.0
-	golang.org/x/term v0.17.0
+	golang.org/x/crypto v0.21.0
+	golang.org/x/sys v0.18.0
+	golang.org/x/term v0.18.0
 	golang.org/x/text v0.14.0
 	golang.org/x/tools v0.18.0
 	rsc.io/goversion v1.2.0
@@ -63,6 +63,7 @@ require (
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
 	github.com/achanda/go-sysctl v0.0.0-20160222034550-6be7678c45d2 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
+	github.com/antonmedv/expr v1.15.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/brutella/dnssd v1.2.10 // indirect
@@ -73,14 +74,14 @@ require (
 	github.com/dgryski/trifles v0.0.0-20220729183022-231ecf6ed548 // indirect
 	github.com/emicklei/dot v1.6.1 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/gdamore/tcell/v2 v2.7.1 // indirect
+	github.com/gdamore/tcell/v2 v2.7.4 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/google/flatbuffers v23.3.3+incompatible // indirect
-	github.com/google/pprof v0.0.0-20240224134209-9dc27345a773 // indirect
+	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/goss-org/GOnetstat v0.0.0-20230101144325-22be0bd9e64d // indirect
@@ -103,27 +104,23 @@ require (
 	github.com/miekg/dns v1.1.58 // indirect
 	github.com/minio/highwayhash v1.0.2 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/sys/mountinfo v0.7.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nats-io/jwt/v2 v2.5.5 // indirect
 	github.com/nats-io/nkeys v0.4.7 // indirect
-	github.com/nats-io/nsc/v2 v2.8.6-0.20231117160437-b49262c20be8 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/nsf/termbox-go v1.1.1 // indirect
 	github.com/oleiade/reflections v1.0.1 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common v0.47.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/samber/lo v1.39.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/synadia-io/jwt-auth-builder.go v0.0.0-20240110145530-7404d7ddb699 // indirect
 	github.com/tadglines/go-pkgs v0.0.0-20210623144937-b983b20f54f9 // indirect
 	github.com/tchap/go-patricia/v2 v2.3.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
@@ -139,13 +136,12 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
-	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gonum.org/v1/gonum v0.12.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/alessio/shellescape.v1 v1.0.0-20170105083845-52074bc9df61 // indirect
-	gopkg.in/gizak/termui.v1 v1.0.0-20151021151108-e62b5929642a // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect