weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Expose GetCertificate function

Browse Source
This commit is contained in:
James Munnelly 2018-08-08 10:31:23 +01:00
parent fa0bc9998e
commit 1ed6855bde
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/acme/client/fake.go
View File

@ -14,6 +14,7 @@ import (
type FakeACME struct {
FakeCreateOrder func(ctx context.Context, order *acme.Order) (*acme.Order, error)
FakeGetOrder func(ctx context.Context, url string) (*acme.Order, error)
FakeGetCertificate func(ctx context.Context, url string) ([][]byte, error)
FakeWaitOrder func(ctx context.Context, url string) (*acme.Order, error)
FakeFinalizeOrder func(ctx context.Context, finalizeURL string, csr []byte) (der [][]byte, err error)
FakeAcceptChallenge func(ctx context.Context, chal *acme.Challenge) (*acme.Challenge, error)
@ -40,6 +41,13 @@ func (f *FakeACME) GetOrder(ctx context.Context, url string) (*acme.Order, error
return nil, fmt.Errorf("GetOrder not implemented")
}
func (f *FakeACME) GetCertificate(ctx context.Context, url string) ([][]byte, error) {
if f.FakeGetCertificate != nil {
return f.FakeGetCertificate(ctx, url)
}
return nil, fmt.Errorf("GetCertificate not implemented")
}
func (f *FakeACME) WaitOrder(ctx context.Context, url string) (*acme.Order, error) {
if f.FakeWaitOrder != nil {
return f.FakeWaitOrder(ctx, url)

1
pkg/acme/client/interfaces.go
View File

@ -9,6 +9,7 @@ import (
type Interface interface {
CreateOrder(ctx context.Context, order *acme.Order) (*acme.Order, error)
GetOrder(ctx context.Context, url string) (*acme.Order, error)
GetCertificate(ctx context.Context, url string) ([][]byte, error)
WaitOrder(ctx context.Context, url string) (*acme.Order, error)
FinalizeOrder(ctx context.Context, finalizeURL string, csr []byte) (der [][]byte, err error)
AcceptChallenge(ctx context.Context, chal *acme.Challenge) (*acme.Challenge, error)

5
pkg/acme/client/middleware/logger.go
View File

@ -28,6 +28,11 @@ func (l *Logger) GetOrder(ctx context.Context, url string) (*acme.Order, error)
return l.baseCl.GetOrder(ctx, url)
}
func (l *Logger) GetCertificate(ctx context.Context, url string) ([][]byte, error) {
glog.Infof("Calling GetCertificate")
return l.baseCl.GetCertificate(ctx, url)
}
func (l *Logger) WaitOrder(ctx context.Context, url string) (*acme.Order, error) {
glog.Infof("Calling WaitOrder")
return l.baseCl.WaitOrder(ctx, url)

4
third_party/crypto/acme/acme.go vendored
View File

@ -247,7 +247,7 @@ func (c *Client) FinalizeOrder(ctx context.Context, finalizeURL string, csr []by
return nil, fmt.Errorf("acme: unexpected order status %q", o.Status)
}
return c.getCert(ctx, o.CertificateURL)
return c.GetCertificate(ctx, o.CertificateURL)
}
// GetOrder retrieves an order identified by url.
@ -818,7 +818,7 @@ func nonceFromHeader(h http.Header) string {
return h.Get("Replay-Nonce")
}
func (c *Client) getCert(ctx context.Context, url string) ([][]byte, error) {
func (c *Client) GetCertificate(ctx context.Context, url string) ([][]byte, error) {
res, err := c.get(ctx, url)
if err != nil {
return nil, err