1 files changed, 18 insertions, 28 deletions

diff --git a/clients/autocert/autocert_wrapper.go b/clients/autocert/autocert_wrapper.go
index 017490e..f871101 100644
--- a/clients/autocert/autocert_wrapper.go
+++ b/clients/autocert/autocert_wrapper.go
@@ -2,24 +2,21 @@ package autocert
 
 import (
         "context"
-        "fmt"
         "sync"
 
         "code.crute.us/mcrute/golib/clients/dns"
         glautocert "code.crute.us/mcrute/golib/crypto/acme/autocert"
         "code.crute.us/mcrute/golib/log"
-        "code.crute.us/mcrute/golib/secrets"
         "code.crute.us/mcrute/golib/service"
 
         "golang.org/x/crypto/acme/autocert"
 )
 
 type AutocertConfig struct {
-        Hosts      []string
-        Secrets    secrets.Client
-        SecretName string
-        Email      string
-        CertHost   string
+        ApiKey   string
+        Hosts    []string
+        Email    string
+        CertHost string
 }
 
 type AutocertWrapper struct {
@@ -37,29 +34,22 @@ func MustNewAutocertWrapper(ctx context.Context, c AutocertConfig) *AutocertWrap
 }
 
 func NewAutocertWrapper(ctx context.Context, c AutocertConfig) (*AutocertWrapper, error) {
-        w := &AutocertWrapper{
-                hl: glautocert.NewACMEHostList(c.Hosts...),
+        hl := glautocert.NewACMEHostList(c.Hosts...)
+        return &AutocertWrapper{
+                hl: hl,
                 pr: make(chan string, 10),
-        }
-
-        apiKey := &secrets.ApiKey{}
-        if _, err := c.Secrets.Secret(ctx, c.SecretName, apiKey); err != nil {
-                return nil, fmt.Errorf("Error fetching credential %s: %w", c.SecretName, err)
-        }
-
-        w.Manager = &autocert.Manager{
-                Cache:      autocert.DirCache("ssl/"),
-                Prompt:     autocert.AcceptTOS,
-                HostPolicy: w.hl.HostPolicy,
-                Email:      c.Email,
-                StapleOCSP: true,
-                DNSManager: &dns.AcmeDNSServiceClient{
-                        URL:    c.CertHost,
-                        ApiKey: apiKey.Key,
+                Manager: &autocert.Manager{
+                        Cache:      autocert.DirCache("ssl/"),
+                        Prompt:     autocert.AcceptTOS,
+                        HostPolicy: hl.HostPolicy,
+                        Email:      c.Email,
+                        StapleOCSP: true,
+                        DNSManager: &dns.AcmeDNSServiceClient{
+                                URL:    c.CertHost,
+                                ApiKey: c.ApiKey,
+                        },
                 },
-        }
-
-        return w, nil
+        }, nil
 }
 
 func (w *AutocertWrapper) PrimeCache() error {