From 8215db3be9318ca39a7e70e56aae7ac0b60ca382 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 18 Oct 2020 08:10:46 +0100 Subject: [PATCH] move acme out of api --- {api/acme => acme}/acme.go | 12 ++++++------ {api/acme => acme}/autocert/autocert.go | 2 +- {api/acme => acme}/autocert/autocert_test.go | 0 {api/acme => acme}/autocert/cache.go | 0 {api/acme => acme}/options.go | 0 api/options.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename {api/acme => acme}/acme.go (100%) rename {api/acme => acme}/autocert/autocert.go (96%) rename {api/acme => acme}/autocert/autocert_test.go (100%) rename {api/acme => acme}/autocert/cache.go (100%) rename {api/acme => acme}/options.go (100%) diff --git a/api/acme/acme.go b/acme/acme.go similarity index 100% rename from api/acme/acme.go rename to acme/acme.go index c962d038..dd536574 100644 --- a/api/acme/acme.go +++ b/acme/acme.go @@ -7,6 +7,12 @@ import ( "net" ) +// The Let's Encrypt ACME endpoints +const ( + LetsEncryptStagingCA = "https://acme-staging-v02.api.letsencrypt.org/directory" + LetsEncryptProductionCA = "https://acme-v02.api.letsencrypt.org/directory" +) + var ( // ErrProviderNotImplemented can be returned when attempting to // instantiate an unimplemented provider @@ -20,9 +26,3 @@ type Provider interface { // TLSConfig returns a tls config TLSConfig(...string) (*tls.Config, error) } - -// The Let's Encrypt ACME endpoints -const ( - LetsEncryptStagingCA = "https://acme-staging-v02.api.letsencrypt.org/directory" - LetsEncryptProductionCA = "https://acme-v02.api.letsencrypt.org/directory" -) diff --git a/api/acme/autocert/autocert.go b/acme/autocert/autocert.go similarity index 96% rename from api/acme/autocert/autocert.go rename to acme/autocert/autocert.go index a4a3900e..cb61032e 100644 --- a/api/acme/autocert/autocert.go +++ b/acme/autocert/autocert.go @@ -7,7 +7,7 @@ import ( "net" "os" - "github.com/micro/go-micro/v3/api/acme" + "github.com/micro/go-micro/v3/acme" "github.com/micro/go-micro/v3/logger" "golang.org/x/crypto/acme/autocert" ) diff --git a/api/acme/autocert/autocert_test.go b/acme/autocert/autocert_test.go similarity index 100% rename from api/acme/autocert/autocert_test.go rename to acme/autocert/autocert_test.go diff --git a/api/acme/autocert/cache.go b/acme/autocert/cache.go similarity index 100% rename from api/acme/autocert/cache.go rename to acme/autocert/cache.go diff --git a/api/acme/options.go b/acme/options.go similarity index 100% rename from api/acme/options.go rename to acme/options.go diff --git a/api/options.go b/api/options.go index 9e988828..47eaa457 100644 --- a/api/options.go +++ b/api/options.go @@ -3,7 +3,7 @@ package api import ( "crypto/tls" - "github.com/micro/go-micro/v3/api/acme" + "github.com/micro/go-micro/v3/acme" "github.com/micro/go-micro/v3/api/resolver" )