瀏覽代碼

Add more context to error handling for parsing certs in order for log format to display properly (#2428)

* Add more context to error handling for parsing certs in order for
log format to display properly

Signed-off-by: Dusan Nikolic <dusannikolic11@gmail.com>

* Create error instead of string as arg

Signed-off-by: Dusan Nikolic <dusannikolic11@gmail.com>

* fix: unit test

Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>

---------

Signed-off-by: Dusan Nikolic <dusannikolic11@gmail.com>
Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
Co-authored-by: Dusan Nikolic <dusannikolic@MacBook-Pro-66.local>
Co-authored-by: Moritz Johner <beller.moritz@googlemail.com>
DusanCar11 3 年之前
父節點
當前提交
298f580d1e
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      pkg/provider/vault/vault.go
  2. 1 1
      pkg/provider/vault/vault_test.go

+ 2 - 2
pkg/provider/vault/vault.go

@@ -993,7 +993,7 @@ func (v *client) newConfig() (*vault.Config, error) {
 	if len(v.store.CABundle) > 0 {
 		ok := caCertPool.AppendCertsFromPEM(v.store.CABundle)
 		if !ok {
-			return nil, errors.New(errVaultCert)
+			return nil, fmt.Errorf(errVaultCert, errors.New("failed to parse certificates from CertPool"))
 		}
 	}
 
@@ -1020,7 +1020,7 @@ func (v *client) newConfig() (*vault.Config, error) {
 
 		ok := caCertPool.AppendCertsFromPEM(cert)
 		if !ok {
-			return nil, errors.New(errVaultCert)
+			return nil, fmt.Errorf(errVaultCert, errors.New("failed to parse certificates from CertPool"))
 		}
 	}
 

+ 1 - 1
pkg/provider/vault/vault_test.go

@@ -258,7 +258,7 @@ MIIFkTCCA3mgAwIBAgIUBEUg3m/WqAsWHG4Q/II3IePFfuowDQYJKoZIhvcNAQELBQAwWDELMAkGA1UE
 				}),
 			},
 			want: want{
-				err: errors.New(errVaultCert),
+				err: fmt.Errorf(errVaultCert, errors.New("failed to parse certificates from CertPool")),
 			},
 		},
 		"VaultAuthFormatError": {