From e87ff94458c47eb8b0981ca61b145d27e7fb1476 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Wed, 4 Apr 2018 12:42:16 +0100 Subject: [PATCH] Fix import paths and use util.AppVersion for user agent version --- pkg/issuer/acme/acme.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/issuer/acme/acme.go b/pkg/issuer/acme/acme.go index 8c8bf5f5c..74333c71b 100644 --- a/pkg/issuer/acme/acme.go +++ b/pkg/issuer/acme/acme.go @@ -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, }, }, }