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

Fix import paths and use util.AppVersion for user agent version

Browse Source
This commit is contained in:
James Munnelly 2018-04-04 12:42:16 +01:00
parent 8baac71058
commit e87ff94458
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/issuer/acme/acme.go
View File

@ -3,6 +3,7 @@ package acme
import (
"context"
"fmt"
nethttp "net/http"
"github.com/golang/glog"
"golang.org/x/crypto/acme"
@ -16,6 +17,7 @@ import (
"github.com/jetstack/cert-manager/pkg/issuer"
"github.com/jetstack/cert-manager/pkg/issuer/acme/dns"
"github.com/jetstack/cert-manager/pkg/issuer/acme/http"
"github.com/jetstack/cert-manager/pkg/util"
"github.com/jetstack/cert-manager/pkg/util/kube"
)
@ -97,14 +99,14 @@ func New(issuer v1alpha1.GenericIssuer,
// facility for setting User-Agent.
type uaRoundTripper struct {
http.RoundTripper
nethttp.RoundTripper
ua string
}
const Version = "v0.2.3"
var acmeUserAgent = "jetstack-cert-manager/" + util.AppVersion
func (uat uaRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
req.Header.Add("User-Agent", "jetstack-cert-manager/"+Version)
func (uat uaRoundTripper) RoundTrip(req *nethttp.Request) (*nethttp.Response, error) {
req.Header.Add("User-Agent", acmeUserAgent)
return uat.RoundTripper.RoundTrip(req)
}
@ -119,9 +121,9 @@ func (a *Acme) acmeClient() (*acme.Client, error) {
cl := &acme.Client{
Key: accountPrivKey,
DirectoryURL: a.issuer.GetSpec().ACME.Server,
HTTPClient: &http.Client{
HTTPClient: &nethttp.Client{
Transport: uaRoundTripper{
RoundTripper: http.DefaultTransport,
RoundTripper: nethttp.DefaultTransport,
},
},
}