Skip to content

Commit ffad909

Browse files
committed
chore: Bump nixpkgs pin
Main change is the move to Go 1.23
1 parent 2ed306c commit ffad909

8 files changed

+15
-7
lines changed

.github/workflows/CI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
2121
with:
22-
go-version: '^1.21.0'
22+
go-version: '^1.23.0'
2323
- name: Tests
2424
run: "go test -race -coverprofile='coverage.txt' -covermode=atomic -v ./gpg/"
2525
- uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303

.goreleaser.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
version: 2
2+
13
gomod:
24
proxy: true
35

6+
metadata:
7+
mod_timestamp: "{{ .CommitTimestamp }}"
8+
49
report_sizes: true
510

611
builds:
@@ -49,6 +54,6 @@ signs:
4954
args: ["sign-blob", "--bundle", "${signature}", "--yes", "${artifact}"]
5055
artifacts: all
5156
snapshot:
52-
name_template: "{{ incpatch .Version }}-next"
57+
version_template: "{{ incpatch .Version }}-next"
5358
release:
5459
draft: true

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/LeSuisse/vault-gpg-plugin
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
github.com/ProtonMail/go-crypto v1.1.3

gpg/backend_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ func getTestBackend(t *testing.T) (logical.Backend, logical.Storage) {
207207
return b, config.StorageView
208208
}
209209

210+
//nolint:gosec
210211
const gpgKey = `-----BEGIN PGP PRIVATE KEY BLOCK-----
211212
212213
lQOYBFmZfJIBCACx2NgAf4rLLx2QKo444ATs3ewJICdy/cYhETxcn5wewdrxQayJ

gpg/path_decrypt_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ func TestGPG_DecryptError(t *testing.T) {
134134
decryptMustFail("test", encryptedAndSignedMessageASCIIArmored, "ascii-armor", privateDecryptKey)
135135
}
136136

137+
//nolint:gosec
137138
const privateDecryptKey = `-----BEGIN PGP PRIVATE KEY BLOCK-----
138139
139140
lQEVBFmbQ68BCADeLSajk7PSagzGt4rs0Dy4LRD22qn9g2J0V/eG0BEqGPup3xYi

gpg/path_show_session_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (b *backend) pathShowSessionKeyWrite(ctx context.Context, req *logical.Requ
110110
for _, key := range keys {
111111
encryptedKey.Decrypt(key.PrivateKey, nil)
112112

113-
if encryptedKey.Key != nil && len(encryptedKey.Key) > 0 {
113+
if len(encryptedKey.Key) > 0 {
114114
sessionKey = fmt.Sprintf("%d:%s", encryptedKey.CipherFunc, strings.ToUpper(hex.EncodeToString(encryptedKey.Key)))
115115
return &logical.Response{
116116
Data: map[string]interface{}{

gpg/path_show_session_key_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ func TestGPG_ShowSessionKeyError(t *testing.T) {
135135
showSessionKeyMustFail("test", encryptedSessionMessageASCIIArmored, "ascii-armor", "Signer key is not ASCII armored")
136136
}
137137

138+
//nolint:gosec
138139
const privateSessionDecryptKey = `-----BEGIN PGP PRIVATE KEY BLOCK-----
139140
140141
lQOYBFmbQ68BCADeLSajk7PSagzGt4rs0Dy4LRD22qn9g2J0V/eG0BEqGPup3xYi

shell.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{ pkgs ? import (
22
fetchTarball {
3-
url = "https://github.com/NixOS/nixpkgs/archive/01441e14af5e29c9d27ace398e6dd0b293e25a54.tar.gz";
4-
sha256 = "sha256:0yvkamjbk3aj4lvhm6vdgdk4b2j0xdv3gx9n4p7wfky52j2529dy";
3+
url = "https://github.com/NixOS/nixpkgs/archive/69b9a8c860bdbb977adfa9c5e817ccb717884182.tar.gz";
4+
sha256 = "sha256:12ljkkjg3gicamvryxr2bnfcdb05qdlbc5wv4lcw9sxamszp4cp7";
55
}
66
) {} }:
77

88
pkgs.mkShell {
99
buildInputs = [
10-
pkgs.go_1_21
10+
pkgs.go_1_23
1111
pkgs.gitMinimal
1212
pkgs.goreleaser
1313
pkgs.syft

0 commit comments

Comments
 (0)