Skip to content

Commit c5c4187

Browse files
jeanfrancoisgrattonjeanfrancoisgratton
committed
Handling a previously unhandled error in kv.ListEntries()
1 parent 6a6bc1b commit c5c4187

File tree

10 files changed

+34
-18
lines changed

10 files changed

+34
-18
lines changed

‎__alpine/APKBUILD

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: J.F. Gratton <[email protected]>
22
# Packager: APK/DEB/RPM package builder <[email protected]>
33
pkgname=vclt
4-
pkgver=1.02.00
4+
pkgver=1.03.00
55
pkgrel=0
66
pkgdir=/data/packages
77
builddir="$startdir/src/BUILD"
@@ -25,5 +25,3 @@ build() {
2525
package() {
2626
make -f "$startdir"/Makefile BUILDDIR="$builddir" PREFIX=/opt PKGNM="$binaryname" DESTDIR="$pkgdir" install
2727
}
28-
29-

‎__alpine/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ all:
33
CGO_ENABLED=0 go build . -o ./vclt.exe
44

55
prepare:
6-
sudo /opt/bin/install_golang.sh 1.22.5 amd64
6+
sudo /opt/bin/install_golang.sh 1.23.0 amd64
77
sudo apk update --no-cache
88

99
install:

‎__debian/2.build_binary.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
PKGDIR="vclt-1.02.00-0_amd64"
3+
PKGDIR="vclt-1.03.00-0_amd64"
44

55
mkdir -p ${PKGDIR}/opt/bin ${PKGDIR}/DEBIAN
66
mkdir -p ${PKGDIR}/opt/bin ${PKGDIR}/DEBIAN

‎__debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: vclt
2-
Version: 1.02.00-0
2+
Version: 1.03.00-0
33
Architecture: amd64
44
Maintainer: J.F. Gratton<[email protected]>
55
Description: Hashicorp Vault client

‎rpmbuild-deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ grep ^BuildRequires "vclt.spec" |awk -F\: '{print "sudo dnf install -y"$2}'|sed
55
echo;echo;echo "Done. Now installing the Go binaries"
66

77
echo "Fetching archive..."
8-
sudo wget -q https://go.dev/dl/go1.22.5.linux-amd64.tar.gz -O /tmp/go.tar.gz -O /opt/go.tar.gz
8+
sudo wget -q https://go.dev/dl/go1.23.0.linux-amd64.tar.gz -O /tmp/go.tar.gz -O /opt/go.tar.gz
99

1010
echo "Unarchiving..."
1111
cd /opt ; sudo rm -rf go;sudo tar zxf go.tar.gz; sudo rm -f go.tar.gz

‎src/cmd/root.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import (
1313
"vclt/sys"
1414
)
1515

16-
1716
// rootCmd represents the base command when called without any subcommands
1817
var rootCmd = &cobra.Command{
1918
Use: "vclt",
2019
Short: "Hashicorp Vault client",
21-
Version: hf.White(fmt.Sprintf("1.02.00-0-%s (2024.08.02)", runtime.GOARCH)),
20+
Version: hf.White(fmt.Sprintf("1.03.00-0-%s (2024.08.30)", runtime.GOARCH)),
2221
}
2322

2423
var clCmd = &cobra.Command{
@@ -68,6 +67,7 @@ func changelog() {
6867
fmt.Print(`
6968
VERSION DATE COMMENT
7069
------- ---- -------
70+
1.03.00 2024.08.30 Handling a previously unhandled error in kv.ListEntries(), updated buildDeps
7171
1.02.00 2024.07.08 Added env create, to create new environment files from the CLI, updated to GO 1.22.5
7272
1.01.00 2024.07.02 Completed kv get, kv lse, kv lsf
7373
1.00.00 2024.06.27 Initial version

‎src/go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module vclt
22

3-
go 1.22.5
3+
go 1.23.0
44

55
require (
66
github.com/jeanfrancoisgratton/customError v1.7.2
@@ -23,7 +23,7 @@ require (
2323
github.com/hashicorp/hcl v1.0.0 // indirect
2424
github.com/hashicorp/vault/api v1.14.0 // indirect
2525
github.com/inconshreveable/mousetrap v1.1.0 // indirect
26-
github.com/jeanfrancoisgratton/hcpVaultLib v0.0.1 // indirect
26+
github.com/jeanfrancoisgratton/hcpVaultLib v0.1.4 // indirect
2727
github.com/jwalton/gchalk v1.3.0 // indirect
2828
github.com/jwalton/go-supportscolor v1.2.0 // indirect
2929
github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -32,10 +32,10 @@ require (
3232
github.com/rivo/uniseg v0.4.7 // indirect
3333
github.com/ryanuber/go-glob v1.0.0 // indirect
3434
github.com/spf13/pflag v1.0.5 // indirect
35-
golang.org/x/crypto v0.25.0 // indirect
36-
golang.org/x/net v0.27.0 // indirect
37-
golang.org/x/sys v0.22.0 // indirect
38-
golang.org/x/term v0.22.0 // indirect
39-
golang.org/x/text v0.16.0 // indirect
40-
golang.org/x/time v0.5.0 // indirect
35+
golang.org/x/crypto v0.26.0 // indirect
36+
golang.org/x/net v0.28.0 // indirect
37+
golang.org/x/sys v0.24.0 // indirect
38+
golang.org/x/term v0.23.0 // indirect
39+
golang.org/x/text v0.17.0 // indirect
40+
golang.org/x/time v0.6.0 // indirect
4141
)

‎src/go.sum

+15
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ github.com/jeanfrancoisgratton/customError v1.7.2 h1:q6kR3aazIs+CgpmDFNxO8VuLaPS
5454
github.com/jeanfrancoisgratton/customError v1.7.2/go.mod h1:5NSP17pCkzMtgHq3YXAoHSXOouXYXa90Orga1Ylbzzg=
5555
github.com/jeanfrancoisgratton/hcpVaultLib v0.0.1 h1:DZ2WQrCtXks/B6aHwqxyQC5rJ8IpTETxVm0W5Q7ue3c=
5656
github.com/jeanfrancoisgratton/hcpVaultLib v0.0.1/go.mod h1:Xu1z3ClyLb0KkMHZ6NuDXcPNYVRQkIDruQHitYLQFoA=
57+
github.com/jeanfrancoisgratton/hcpVaultLib v0.1.4 h1:fan+9mf98NaW458wUK+s7Dp5RdhHVZ/9muFp1eQHKjM=
58+
github.com/jeanfrancoisgratton/hcpVaultLib v0.1.4/go.mod h1:Xu1z3ClyLb0KkMHZ6NuDXcPNYVRQkIDruQHitYLQFoA=
5759
github.com/jeanfrancoisgratton/helperFunctions v1.5.2 h1:5s/2GrhuzstHLQwfRoSfMURE+KDsWv2/nGkqTajtFks=
5860
github.com/jeanfrancoisgratton/helperFunctions v1.5.2/go.mod h1:NKtd8XFVlORq8/7tKgFKEFPC6VRufq0tU5cbYg8ziLM=
5961
github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+UV8OU=
@@ -98,12 +100,16 @@ golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
98100
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
99101
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
100102
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
103+
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
104+
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
101105
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
102106
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
103107
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
104108
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
105109
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
106110
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
111+
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
112+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
107113
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
108114
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
109115
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -113,18 +119,27 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
113119
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
114120
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
115121
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
122+
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
123+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
124+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
116125
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
117126
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
118127
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
119128
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
120129
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
121130
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
131+
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
132+
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
122133
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
123134
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
135+
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
136+
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
124137
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
125138
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
126139
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
127140
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
141+
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
142+
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
128143
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
129144
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
130145
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎src/kv/ls.go

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ func ListFields(entry string, version int) (map[string]interface{}, *cerr.Custom
5353
func ListEntries() ([]string, *cerr.CustomError) {
5454
var err error
5555
client, kvPath, ce := sys.Login(false)
56+
if ce != nil {
57+
return nil, ce
58+
}
5659
isVersioned, ce := sys.IsKVv2(client, kvPath)
5760
if ce != nil {
5861
return nil, ce

‎vclt.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%define _build_id_links none
33
%define _name vclt
44
%define _prefix /opt
5-
%define _version 1.02.00
5+
%define _version 1.03.00
66
%define _rel 0
77
%define _arch x86_64
88
%define _binaryname vclt

0 commit comments

Comments
 (0)