Skip to content

Commit 3305de8

Browse files
SlyngDKSlyngDK
authored
Merge pull request #695 from cego/bump-versions
Bumped versions
2 parents 19ddb63 + 37ed749 commit 3305de8

23 files changed

Lines changed: 2534 additions & 8220 deletions

‎.github/workflows/gofmt.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v4
1919
with:
20-
go-version: 1.25
20+
go-version: 1.26
2121
id: go
2222

2323
- name: Check out code into the Go module directory
@@ -26,9 +26,9 @@ jobs:
2626
- uses: actions/cache@v3
2727
with:
2828
path: ~/go/pkg/mod
29-
key: ${{ runner.os }}-gofmt1.25-${{ hashFiles('**/go.sum') }}
29+
key: ${{ runner.os }}-gofmt1.26-${{ hashFiles('**/go.sum') }}
3030
restore-keys: |
31-
${{ runner.os }}-gofmt1.25-
31+
${{ runner.os }}-gofmt1.26-
3232
3333
- name: gofmt
3434
run: |

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v4
1616
with:
17-
go-version: 1.25
17+
go-version: 1.26
1818

1919
- name: Checkout code
2020
uses: actions/checkout@v4

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go
2222
uses: actions/setup-go@v4
2323
with:
24-
go-version: 1.25
24+
go-version: 1.26
2525
id: go
2626

2727
- name: Check out code into the Go module directory
@@ -30,9 +30,9 @@ jobs:
3030
- uses: actions/cache@v3
3131
with:
3232
path: ~/go/pkg/mod
33-
key: ${{ runner.os }}-go1.25-${{ hashFiles('**/go.sum') }}
33+
key: ${{ runner.os }}-go1.26-${{ hashFiles('**/go.sum') }}
3434
restore-keys: |
35-
${{ runner.os }}-go1.25-
35+
${{ runner.os }}-go1.26-
3636
3737
- name: Checking go mod tidy
3838
run: |

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ PROTOC_GEN_GO_GRPC = $(LOCALBIN)/protoc-gen-go-grpc
9090
GQLGEN = $(LOCALBIN)/gqlgen
9191

9292
## Tool Versions
93-
BUF_VERSION ?= v1.61.0
94-
PROTOC_GEN_GO_VERSION ?= v1.36.10
95-
PROTOC_GEN_GO_GRPC_VERSION ?= v1.6.0
96-
GQLGEN_VERSION ?= v0.17.84
93+
BUF_VERSION ?= v1.66.1
94+
PROTOC_GEN_GO_VERSION ?= v1.36.11
95+
PROTOC_GEN_GO_GRPC_VERSION ?= v1.6.1
96+
GQLGEN_VERSION ?= v0.17.88
9797

9898
.PHONY: buf
9999
buf: $(BUF) ## Download buf locally if necessary.

‎cmd/agent/enrollment.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ func generateNebulaKeyPair() ([]byte, error) {
325325
}
326326
curve25519.ScalarBaseMult(&pubkey, &privkey)
327327

328-
err := ioutil.WriteFile(resolvePath(AgentNebulaKeyPath), cert.MarshalX25519PrivateKey(privkey[:]), 0600)
328+
err := os.WriteFile(resolvePath(AgentNebulaKeyPath), cert.MarshalPrivateKeyToPEM(cert.Curve_CURVE25519, privkey[:]), 0600)
329329
if err != nil {
330330
return nil, fmt.Errorf("error while writing key: %s", err)
331331
}
332332

333-
csr = cert.MarshalX25519PublicKey(pubkey[:])
334-
err = ioutil.WriteFile(resolvePath(AgentNebulaCsrPath), csr, 0600)
333+
csr = cert.MarshalPublicKeyToPEM(cert.Curve_CURVE25519, pubkey[:])
334+
err = os.WriteFile(resolvePath(AgentNebulaCsrPath), csr, 0600)
335335
if err != nil {
336336
return nil, fmt.Errorf("error while writing csr: %s", err)
337337
}

‎cmd/agent/healthcheck.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var healthcheckCmd = &cobra.Command{
6666
fmt.Printf("failed to read file: %s err: %s\n", filepath.Join(outputPath, NebulaCrtPath), err)
6767
os.Exit(2)
6868
}
69-
crt, _, err := cert.UnmarshalNebulaCertificateFromPEM(bytes)
69+
crt, _, err := cert.UnmarshalCertificateFromPEM(bytes)
7070
if err != nil {
7171
fmt.Printf("failed to unmarshall nebula certificate err: %s\n", err)
7272
os.Exit(2)
@@ -78,12 +78,12 @@ var healthcheckCmd = &cobra.Command{
7878
}
7979

8080
if crt.Expired(time.Now().AddDate(0, 0, critDaysBeforeExpire)) {
81-
fmt.Printf("nebula certificate will expire at %s\n", crt.Details.NotAfter)
81+
fmt.Printf("nebula certificate will expire at %s\n", crt.NotAfter())
8282
os.Exit(2)
8383
}
8484

8585
if crt.Expired(time.Now().AddDate(0, 0, warnDaysBeforeExpire)) {
86-
fmt.Printf("nebula certificate will expire at %s\n", crt.Details.NotAfter)
86+
fmt.Printf("nebula certificate will expire at %s\n", crt.NotAfter())
8787
os.Exit(1)
8888
}
8989

@@ -110,21 +110,21 @@ func checkCA(outputPath string, warnDaysBeforeExpire, critDaysBeforeExpire int)
110110
os.Exit(2)
111111
}
112112

113-
var newestCA *cert.NebulaCertificate
113+
var newestCA cert.Certificate
114114

115-
var ca *cert.NebulaCertificate
115+
var ca cert.Certificate
116116
for true {
117117
if len(bytes) <= 1 {
118118
break
119119
}
120-
ca, bytes, err = cert.UnmarshalNebulaCertificateFromPEM(bytes)
120+
ca, bytes, err = cert.UnmarshalCertificateFromPEM(bytes)
121121
if err != nil {
122122
fmt.Printf("failed to unmarshall nebula ca certificate err: %s\n", err)
123123
os.Exit(2)
124124
}
125125
if newestCA == nil {
126126
newestCA = ca
127-
} else if newestCA.Details.NotAfter.Before(ca.Details.NotAfter) {
127+
} else if newestCA.NotAfter().Before(ca.NotAfter()) {
128128
newestCA = ca
129129
}
130130
}
@@ -135,12 +135,12 @@ func checkCA(outputPath string, warnDaysBeforeExpire, critDaysBeforeExpire int)
135135
}
136136

137137
if newestCA.Expired(time.Now().AddDate(0, 0, critDaysBeforeExpire)) {
138-
fmt.Printf("nebula ca certificate will expire at %s\n", newestCA.Details.NotAfter)
138+
fmt.Printf("nebula ca certificate will expire at %s\n", newestCA.NotAfter())
139139
os.Exit(2)
140140
}
141141

142142
if newestCA.Expired(time.Now().AddDate(0, 0, warnDaysBeforeExpire)) {
143-
fmt.Printf("nebula ca certificate will expire at %s\n", newestCA.Details.NotAfter)
143+
fmt.Printf("nebula ca certificate will expire at %s\n", newestCA.NotAfter())
144144
os.Exit(1)
145145
}
146146

‎go.mod‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,70 @@
11
module github.com/cego/nebula-provisioner
22

3-
go 1.25.4
3+
go 1.26.1
44

55
require (
6-
github.com/99designs/gqlgen v0.17.84
6+
github.com/99designs/gqlgen v0.17.88
77
github.com/dgraph-io/badger/v3 v3.2103.5
88
github.com/gorilla/mux v1.8.1
99
github.com/gorilla/sessions v1.4.0
1010
github.com/jackpal/gateway v1.1.1
1111
github.com/jackpal/go-nat-pmp v1.0.2
1212
github.com/lafriks/go-spaproxy v0.2.0
1313
github.com/mitchellh/go-ps v1.0.0
14-
github.com/openbao/openbao/sdk/v2 v2.5.0
14+
github.com/openbao/openbao/sdk/v2 v2.5.1
1515
github.com/pkg/errors v0.9.1
16-
github.com/sirupsen/logrus v1.9.3
17-
github.com/slackhq/nebula v1.9.7
18-
github.com/spf13/cobra v1.10.1
19-
github.com/vektah/gqlparser/v2 v2.5.31
20-
golang.org/x/crypto v0.45.0
21-
golang.org/x/oauth2 v0.33.0
22-
golang.org/x/tools v0.39.0
23-
google.golang.org/grpc v1.77.0
24-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0
25-
google.golang.org/protobuf v1.36.10
16+
github.com/sirupsen/logrus v1.9.4
17+
github.com/slackhq/nebula v1.10.3
18+
github.com/spf13/cobra v1.10.2
19+
github.com/vektah/gqlparser/v2 v2.5.32
20+
golang.org/x/crypto v0.49.0
21+
golang.org/x/oauth2 v0.36.0
22+
golang.org/x/tools v0.43.0
23+
google.golang.org/grpc v1.79.3
24+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.1
25+
google.golang.org/protobuf v1.36.11
2626
gopkg.in/yaml.v3 v3.0.1
2727
)
2828

2929
require (
30-
dario.cat/mergo v1.0.1 // indirect
30+
dario.cat/mergo v1.0.2 // indirect
31+
filippo.io/bigmod v0.1.0 // indirect
3132
github.com/agnivade/levenshtein v1.2.1 // indirect
3233
github.com/cespare/xxhash v1.1.0 // indirect
3334
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3435
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3536
github.com/dgraph-io/ristretto v0.2.0 // indirect
3637
github.com/dustin/go-humanize v1.0.1 // indirect
37-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
38-
github.com/goccy/go-yaml v1.18.0 // indirect
38+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
39+
github.com/goccy/go-yaml v1.19.2 // indirect
3940
github.com/gogo/protobuf v1.3.2 // indirect
40-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
4142
github.com/golang/protobuf v1.5.4 // indirect
42-
github.com/golang/snappy v0.0.4 // indirect
43-
github.com/google/flatbuffers v24.3.25+incompatible // indirect
43+
github.com/golang/snappy v1.0.0 // indirect
44+
github.com/google/flatbuffers v25.12.19+incompatible // indirect
4445
github.com/google/uuid v1.6.0 // indirect
4546
github.com/gorilla/securecookie v1.1.2 // indirect
4647
github.com/gorilla/websocket v1.5.3 // indirect
4748
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4849
github.com/inconshreveable/mousetrap v1.1.0 // indirect
49-
github.com/klauspost/compress v1.18.1 // indirect
50+
github.com/klauspost/compress v1.18.4 // indirect
5051
github.com/kr/pretty v0.3.1 // indirect
5152
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5253
github.com/rogpeppe/go-internal v1.10.0 // indirect
53-
github.com/sosodev/duration v1.3.1 // indirect
54-
github.com/spf13/pflag v1.0.9 // indirect
55-
github.com/stretchr/objx v0.5.2 // indirect
54+
github.com/sosodev/duration v1.4.0 // indirect
55+
github.com/spf13/pflag v1.0.10 // indirect
56+
github.com/stretchr/objx v0.5.3 // indirect
5657
github.com/stretchr/testify v1.11.1 // indirect
57-
github.com/urfave/cli/v3 v3.6.1 // indirect
58+
github.com/urfave/cli/v3 v3.7.0 // indirect
5859
go.opencensus.io v0.24.0 // indirect
59-
golang.org/x/mod v0.30.0 // indirect
60-
golang.org/x/net v0.47.0 // indirect
61-
golang.org/x/sync v0.18.0 // indirect
62-
golang.org/x/sys v0.38.0 // indirect
63-
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
64-
golang.org/x/term v0.37.0 // indirect
65-
golang.org/x/text v0.31.0 // indirect
66-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
60+
go.yaml.in/yaml/v3 v3.0.4 // indirect
61+
golang.org/x/mod v0.34.0 // indirect
62+
golang.org/x/net v0.52.0 // indirect
63+
golang.org/x/sync v0.20.0 // indirect
64+
golang.org/x/sys v0.42.0 // indirect
65+
golang.org/x/telemetry v0.0.0-20260316223853-b6b0c46d1ccd // indirect
66+
golang.org/x/term v0.41.0 // indirect
67+
golang.org/x/text v0.35.0 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 // indirect
6769
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
68-
gopkg.in/yaml.v2 v2.4.0 // indirect
6970
)

0 commit comments

Comments
 (0)