Skip to content

Commit ef95819

Browse files
colinhoglundcolinhoglund
authored
Update dependencies to address security alerts (#8)
* update deps * update drone
1 parent a4fe3e9 commit ef95819

File tree

14 files changed

+1032
-207
lines changed

14 files changed

+1032
-207
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ name: default
55

66
steps:
77
- name: test
8-
image: golangci/golangci-lint:v1.30.0-alpine
8+
image: golangci/golangci-lint:v1.42.1
99
commands:
10-
- apk update
11-
- apk add make
1210
- make test

‎cmd/ksec/create.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56

67
"github.com/spf13/cobra"
@@ -14,8 +15,10 @@ var createCmd = &cobra.Command{
1415
}
1516

1617
func createCommand(cmd *cobra.Command, args []string) error {
18+
ctx := context.Background()
19+
1720
for _, name := range args {
18-
if _, err := secretsClient.Create(name); err != nil {
21+
if _, err := secretsClient.Create(ctx, name); err != nil {
1922
return err
2023
}
2124
fmt.Printf("Created secret \"%s\"\n", name)

‎cmd/ksec/delete.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56
"os"
67

@@ -15,13 +16,15 @@ var deleteCmd = &cobra.Command{
1516
}
1617

1718
func deleteCommand(cmd *cobra.Command, args []string) error {
19+
ctx := context.Background()
20+
1821
skipconfirm, err := cmd.Flags().GetBool("yes")
1922
if err != nil {
2023
return err
2124
}
2225

2326
for _, name := range args {
24-
if _, err := secretsClient.Get(name); err != nil {
27+
if _, err := secretsClient.Get(ctx, name); err != nil {
2528
fmt.Fprintln(os.Stderr, err)
2629
continue
2730
}
@@ -32,7 +35,7 @@ func deleteCommand(cmd *cobra.Command, args []string) error {
3235
continue
3336
}
3437

35-
if err := secretsClient.Delete(name); err != nil {
38+
if err := secretsClient.Delete(ctx, name); err != nil {
3639
return err
3740
}
3841
fmt.Printf("Deleted secret \"%s\"\n", name)

‎cmd/ksec/get.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"encoding/json"
56
"fmt"
67

@@ -17,9 +18,10 @@ var getCmd = &cobra.Command{
1718

1819
func getCommand(cmd *cobra.Command, args []string) error {
1920
secretName := args[0]
21+
ctx := context.Background()
2022

2123
if len(args) > 1 {
22-
value, err := secretsClient.GetKey(secretName, args[1])
24+
value, err := secretsClient.GetKey(ctx, secretName, args[1])
2325
if err != nil {
2426
return err
2527
}
@@ -28,7 +30,7 @@ func getCommand(cmd *cobra.Command, args []string) error {
2830
return nil
2931
}
3032

31-
secret, err := secretsClient.Get(secretName)
33+
secret, err := secretsClient.Get(ctx, secretName)
3234
if err != nil {
3335
return err
3436
}

‎cmd/ksec/list.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56

67
"github.com/spf13/cobra"
7-
"k8s.io/api/core/v1"
8+
v1 "k8s.io/api/core/v1"
89
)
910

1011
// listCmd represents the list command
@@ -17,7 +18,9 @@ var listCmd = &cobra.Command{
1718
}
1819

1920
func listCommand(cmd *cobra.Command, args []string) error {
20-
secrets, err := secretsClient.List()
21+
ctx := context.Background()
22+
23+
secrets, err := secretsClient.List(ctx)
2124
if err != nil {
2225
return err
2326
}

‎cmd/ksec/main_test.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"bufio"
5+
"context"
56
"io/ioutil"
67
"os"
78
"strings"
@@ -44,13 +45,15 @@ func cmdExec(args []string) error {
4445

4546
// tests
4647
func TestCreateSecret(t *testing.T) {
48+
ctx := context.Background()
49+
4750
err := cmdExec([]string{"create", "test"})
4851
testErr(err, t)
4952

5053
err = cmdExec([]string{"set", "test", "key=value"})
5154
testErr(err, t)
5255

53-
secret, err := secretsClient.Get("test")
56+
secret, err := secretsClient.Get(ctx, "test")
5457
testErr(err, t)
5558

5659
val, ok := secret.Data["key"]
@@ -62,10 +65,11 @@ func TestCreateSecret(t *testing.T) {
6265
}
6366

6467
func TestUnsetSecretKey(t *testing.T) {
68+
ctx := context.Background()
6569
err := cmdExec([]string{"unset", "test", "key"})
6670
testErr(err, t)
6771

68-
secret, err := secretsClient.Get("test")
72+
secret, err := secretsClient.Get(ctx, "test")
6973
testErr(err, t)
7074

7175
if _, ok := secret.Data["key"]; ok {
@@ -84,6 +88,7 @@ func TestDeleteSecret(t *testing.T) {
8488
}
8589

8690
func TestPushSecret(t *testing.T) {
91+
ctx := context.Background()
8792
content := []byte("ENV_VAR=secret")
8893
tempfile, err := ioutil.TempFile("", "ksec")
8994
testErr(err, t)
@@ -95,7 +100,7 @@ func TestPushSecret(t *testing.T) {
95100
err = cmdExec([]string{"push", tempfile.Name(), "pushtest"})
96101
testErr(err, t)
97102

98-
secret, err := secretsClient.Get("pushtest")
103+
secret, err := secretsClient.Get(ctx, "pushtest")
99104
testErr(err, t)
100105

101106
val, ok := secret.Data["ENV_VAR"]

‎cmd/ksec/pull.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56
"os"
67

@@ -16,8 +17,9 @@ var pullCmd = &cobra.Command{
1617

1718
func pullCommand(cmd *cobra.Command, args []string) error {
1819
name := args[0]
20+
ctx := context.Background()
1921

20-
secret, err := secretsClient.Get(name)
22+
secret, err := secretsClient.Get(ctx, name)
2123
if err != nil {
2224
return err
2325
}

‎cmd/ksec/push.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"bufio"
5+
"context"
56
"io"
67
"os"
78
"strings"
@@ -19,6 +20,7 @@ var pushCmd = &cobra.Command{
1920
func pushCommand(cmd *cobra.Command, args []string) error {
2021
fileArg := args[0]
2122
secretName := args[1]
23+
ctx := context.Background()
2224

2325
file, err := os.Open(fileArg)
2426
if err != nil {
@@ -31,7 +33,7 @@ func pushCommand(cmd *cobra.Command, args []string) error {
3133
return err
3234
}
3335

34-
_, err = secretsClient.Upsert(secretName, data)
36+
_, err = secretsClient.Upsert(ctx, secretName, data)
3537
if err != nil {
3638
return err
3739
}

‎cmd/ksec/set.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56
"strings"
67

@@ -18,6 +19,7 @@ func setCommand(cmd *cobra.Command, args []string) error {
1819
name := args[0]
1920
dataArgs := args[1:]
2021
data := make(map[string][]byte)
22+
ctx := context.Background()
2123

2224
for _, item := range dataArgs {
2325
split := strings.SplitN(item, "=", 2)
@@ -27,7 +29,7 @@ func setCommand(cmd *cobra.Command, args []string) error {
2729
data[split[0]] = []byte(split[1])
2830
}
2931

30-
_, err := secretsClient.Upsert(name, data)
32+
_, err := secretsClient.Upsert(ctx, name, data)
3133
if err != nil {
3234
return err
3335
}

‎cmd/ksec/unset.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"fmt"
56

67
"github.com/spf13/cobra"
@@ -16,8 +17,9 @@ var unsetCmd = &cobra.Command{
1617
func unsetCommand(cmd *cobra.Command, args []string) error {
1718
name := args[0]
1819
keys := args[1:]
20+
ctx := context.Background()
1921

20-
secret, err := secretsClient.Get(name)
22+
secret, err := secretsClient.Get(ctx, name)
2123
if err != nil {
2224
return err
2325
}
@@ -28,7 +30,7 @@ func unsetCommand(cmd *cobra.Command, args []string) error {
2830
fmt.Printf("Removed \"%s\" from secret \"%s\"\n", key, name)
2931
}
3032

31-
_, err = secretsClient.Update(secret, secret.Data)
33+
_, err = secretsClient.Update(ctx, secret, secret.Data)
3234
if err != nil {
3335
return err
3436
}

0 commit comments

Comments
 (0)