diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/go/vespa/crypto.go | 8 | ||||
| -rw-r--r-- | client/go/vespa/deploy.go | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/client/go/vespa/crypto.go b/client/go/vespa/crypto.go index 25d3a937f4b..6f07df47b33 100644 --- a/client/go/vespa/crypto.go +++ b/client/go/vespa/crypto.go @@ -160,11 +160,15 @@ func ECPrivateKeyFrom(pemPrivateKey []byte) (*ecdsa.PrivateKey, error) { return nil, fmt.Errorf("invalid pem private key") } if privateKeyBlock.Type == "EC PRIVATE KEY" { - return x509.ParseECPrivateKey(privateKeyBlock.Bytes) // Raw EC private key + privateKey, err := x509.ParseECPrivateKey(privateKeyBlock.Bytes) // Raw EC private key + if err != nil { + return nil, fmt.Errorf("invalid raw ec private key: %w", err) + } + return privateKey, nil } privateKey, err := x509.ParsePKCS8PrivateKey(privateKeyBlock.Bytes) // Try PKCS8 format if err != nil { - return nil, err + return nil, fmt.Errorf("invalid pkcs8 private key: %w", err) } ecKey, ok := privateKey.(*ecdsa.PrivateKey) if !ok { diff --git a/client/go/vespa/deploy.go b/client/go/vespa/deploy.go index 613e276a622..59ea8d22d62 100644 --- a/client/go/vespa/deploy.go +++ b/client/go/vespa/deploy.go @@ -242,7 +242,7 @@ func Submit(opts DeploymentOptions) error { serviceDescription := "Submit service" sigKeyId := opts.Target.Deployment().Application.SerializedForm() if err := opts.Target.SignRequest(request, sigKeyId); err != nil { - return err + return fmt.Errorf("failed to sign api request: %w", err) } response, err := opts.HTTPClient.Do(request, time.Minute*10) if err != nil { |