Skip to content

Commit 52cde1a

Browse files
dependabot[bot]heussd
dependabot[bot]
authored and
heussd
committed
Bump golang.org/x/crypto from 0.22.0 to 0.35.0 in /golang (#22)
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.22.0 to 0.35.0. - [Commits](golang/crypto@v0.22.0...v0.35.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.35.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 0644ca4 commit 52cde1a

File tree

4 files changed

+29
-32
lines changed

4 files changed

+29
-32
lines changed

‎golang/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ FROM alpine:3.6 AS alpine
1313
RUN apk add -U --no-cache ca-certificates
1414

1515

16-
FROM base as devcontainer
16+
FROM base AS devcontainer
1717

1818
RUN go install -v golang.org/x/tools/gopls@latest
1919
RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
2020
RUN go install github.com/nats-io/natscli/nats@latest
2121

2222
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
2323

24-
FROM base as builder
24+
FROM base AS builder
2525

2626
COPY pkg ./pkg
2727
COPY internal ./internal

‎golang/go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
module github.com/heussd/nats-news-analysis
22

3-
go 1.22
4-
5-
toolchain go1.22.2
3+
go 1.23.0
64

75
require (
6+
github.com/SlyMarbo/rss v1.0.5
87
github.com/dlclark/regexp2 v1.11.0
9-
github.com/microcosm-cc/bluemonday v1.0.26
8+
github.com/joho/godotenv v1.5.1
109
github.com/nats-io/nats.go v1.34.1
11-
github.com/rs/zerolog v1.32.0
1210
github.com/stretchr/testify v1.8.1
1311
)
1412

1513
require (
16-
github.com/SlyMarbo/rss v1.0.5 // indirect
1714
github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 // indirect
1815
github.com/aymerick/douceur v0.2.0 // indirect
1916
github.com/davecgh/go-spew v1.1.1 // indirect
2017
github.com/gorilla/css v1.0.1 // indirect
21-
github.com/joho/godotenv v1.5.1 // indirect
2218
github.com/klauspost/compress v1.17.8 // indirect
2319
github.com/kr/pretty v0.1.0 // indirect
2420
github.com/mattn/go-colorable v0.1.13 // indirect
25-
github.com/mattn/go-isatty v0.0.20 // indirect
21+
github.com/mattn/go-isatty v0.0.19 // indirect
22+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
2623
github.com/nats-io/nkeys v0.4.7 // indirect
2724
github.com/nats-io/nuid v1.0.1 // indirect
2825
github.com/pmezard/go-difflib v1.0.0 // indirect
29-
golang.org/x/crypto v0.22.0 // indirect
30-
golang.org/x/net v0.24.0 // indirect
31-
golang.org/x/sys v0.19.0 // indirect
26+
github.com/rs/zerolog v1.34.0 // indirect
27+
golang.org/x/crypto v0.35.0 // indirect
28+
golang.org/x/net v0.26.0 // indirect
29+
golang.org/x/sys v0.30.0 // indirect
3230
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
3331
gopkg.in/yaml.v3 v3.0.1 // indirect
3432
)

‎golang/go.sum‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2525
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
2626
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
2727
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
28+
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
2829
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
29-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
30-
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
31-
github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
32-
github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
30+
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
31+
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
3332
github.com/nats-io/nats.go v1.34.1 h1:syWey5xaNHZgicYBemv0nohUPPmaLteiBEUT6Q5+F/4=
3433
github.com/nats-io/nats.go v1.34.1/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
3534
github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
@@ -39,25 +38,25 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
3938
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
4039
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4140
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
42-
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
43-
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
44-
github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
41+
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
42+
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
43+
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
4544
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4645
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
4746
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
4847
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
4948
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
5049
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
5150
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
52-
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
53-
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
54-
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
55-
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
51+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
52+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
53+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
54+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
5655
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5756
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5857
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
59-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
60-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
58+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
59+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
6160
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6261
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
6362
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎golang/internal/nats/nats.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ import (
1515
"github.com/nats-io/nats.go"
1616
)
1717

18-
var nc *nats.Conn
19-
var js nats.JetStreamContext
20-
var kv nats.KeyValue
18+
var (
19+
nc *nats.Conn
20+
js nats.JetStreamContext
21+
kv nats.KeyValue
22+
)
2123

2224
var (
23-
NatsServer = utils.GetEnv("NATS_SERVER", nats.DefaultURL)
25+
NatsServer = utils.GetEnv("NATS_URL", nats.DefaultURL)
2426
NatsPullConsumerBatchSize = utils.GetEnv("NATS_CONSUMER_BATCH_SIZE", "5")
2527
NatsPullConsumerBatchSizeInt, _ = strconv.Atoi(NatsPullConsumerBatchSize)
2628
NatsKeyValueBucket = utils.GetEnv("NATS_KV_BUCKET", "article-urls-proposed")
@@ -50,7 +52,6 @@ func init() {
5052
panic(err)
5153
}
5254
}
53-
5455
}
5556

5657
func Subscribe[T model.PayloadTypes](
@@ -102,7 +103,6 @@ func Publish[T model.PayloadTypes](
102103
natsMessageId string, // Meaningful ID to make use of NATS's deduplication feature
103104
persistDeduplication bool,
104105
) (*nats.PubAck, error) {
105-
106106
// Workaround for https://github.com/nats-io/nats-server/issues/3272
107107
// Use KV storage for remembering what we already put on the queue.
108108
if persistDeduplication && hasKV(message.GetUrl()) {

0 commit comments

Comments
 (0)