Merge pull request #210 from 99designs/fix-nil-pointer-error

Fix nil pointer panic in keyring
99designs · Jan 1, 2018 · 8dbbe8d · 8dbbe8d
2 parents 9bc62f5 + 21aa173
commit 8dbbe8d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/cli/global.go b/cli/global.go
@@ -64,7 +64,6 @@ func ConfigureGlobals(app *kingpin.Application) {
 			if GlobalFlags.Backend != "" {
 				allowedBackends = append(allowedBackends, keyring.BackendType(GlobalFlags.Backend))
 			}
-
 			keyringImpl, err = keyring.Open(keyring.Config{
 				ServiceName:      "aws-vault",
 				AllowedBackends:  allowedBackends,
@@ -74,6 +73,9 @@ func ConfigureGlobals(app *kingpin.Application) {
 				KWalletAppID:     "aws-vault",
 				KWalletFolder:    "aws-vault",
 			})
+			if err != nil {
+				return err
+			}
 		}
 		if awsConfig == nil {
 			awsConfig, err = vault.LoadConfigFromEnv()

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,13 @@
+version: '2.1'
+
+services:
+  aws-vault:
+    image: golang:1.9.2
+    environment:
+      - CGO_ENABLED=0
+    volumes:
+      - .:/go/src/github.com/99designs/aws-vault
+      - /root/.aws
+      - /root/.awsvault
+    working_dir: /go/src/github.com/99designs/aws-vault
+    entrypoint: go run main.go
diff --git a/vendor/github.com/99designs/keyring/kwallet.go b/vendor/github.com/99designs/keyring/kwallet.go
diff --git a/vendor/github.com/99designs/keyring/libsecret.go b/vendor/github.com/99designs/keyring/libsecret.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -3,10 +3,10 @@
 	"ignore": "test",
 	"package": [
 		{
-			"checksumSHA1": "yPdUwIYrb/mMRha15K2OPS2hcSo=",
+			"checksumSHA1": "D8hEjr7exRaY14eEFEXCSV6YXao=",
 			"path": "github.com/99designs/keyring",
-			"revision": "864ec8407057ca036ab7f3cac503aef926fa59eb",
-			"revisionTime": "2017-11-28T00:42:29Z"
+			"revision": "5fbd4674c81065bd80b5adfee8a127c5c47e48ce",
+			"revisionTime": "2017-12-29T03:53:02Z"
 		},
 		{
 			"checksumSHA1": "KmjnydoAbofMieIWm+it5OWERaM=",