From bade46d45f2c37a3b66d2c0642d5e6a3f626ce73 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Wed, 17 Mar 2021 23:26:30 +0000 Subject: [PATCH] go/pki: fix error return DeveloperCredentialsLocation used to glog.Exitf instead of returning an error, and a consumer (prodaccess) used to not check the return code. Bad refactor? Change-Id: I6c2d05966ba6b3eb300c24a51584ccf5e324cd49 --- cluster/prodaccess/hspki.go | 3 +++ go/pki/locate.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/prodaccess/hspki.go b/cluster/prodaccess/hspki.go index 2fcfaf05..04876fb9 100644 --- a/cluster/prodaccess/hspki.go +++ b/cluster/prodaccess/hspki.go @@ -12,6 +12,9 @@ import ( func useHSPKIKeys(keys *pb.HSPKIKeys) { path, err := pki.DeveloperCredentialsLocation() + if err != nil { + glog.Exitf("Could not get location of HSPKI creds: %v", err) + } err = os.MkdirAll(path, 0700) if err != nil { glog.Exitf("mkdir %q: %v", path, err) diff --git a/go/pki/locate.go b/go/pki/locate.go index 3b4ca294..e075f55b 100644 --- a/go/pki/locate.go +++ b/go/pki/locate.go @@ -16,7 +16,7 @@ import ( func DeveloperCredentialsLocation() (string, error) { cfgDir, err := os.UserConfigDir() if err != nil { - glog.Exitf("UserConfigDir: %w", err) + return "", fmt.Errorf("UserConfigDir: %w", err) } return fmt.Sprintf("%s/hspki", cfgDir), nil