egctl create httpproxy cmd support update or create autocertmanager

cmd/client/commandv2/create/createhttpproxy.go

@@ -20,6 +20,7 @@
 import (
  "encoding/base64"
  "fmt"
+ "net/http"
  "os"
  "path/filepath"
  "strings"
@@ -30,6 +31,7 @@
  "github.com/megaease/easegress/v2/pkg/filters"
  "github.com/megaease/easegress/v2/pkg/filters/proxies"
  "github.com/megaease/easegress/v2/pkg/filters/proxies/httpproxy"
+ "github.com/megaease/easegress/v2/pkg/object/autocertmanager"
  "github.com/megaease/easegress/v2/pkg/object/httpserver/routers"
  "github.com/megaease/easegress/v2/pkg/util/codectool"
  "github.com/spf13/cobra"
@@ -47,10 +49,15 @@
  CertFiles []string
  KeyFiles []string
 
- caCert string
- certs []string
- keys []string
- rules []*HTTPProxyRule
+ AutoCertDomainName string
+ AutoCertEmail string
+ AutoCertDNSProvider []string
+
+ caCert string
+ certs []string
+ keys []string
+ rules []*HTTPProxyRule
+ dnsProvider map[string]string
 }
 
 var httpProxyOptions = &HTTPProxyOptions{}
@@ -103,6 +110,9 @@
  cmd.Flags().StringVar(&o.CaCertFile, "ca-cert-file", "", "CA cert file")
  cmd.Flags().StringArrayVar(&o.CertFiles, "cert-file", []string{}, "Cert file")
  cmd.Flags().StringArrayVar(&o.KeyFiles, "key-file", []string{}, "Key file")
+ cmd.Flags().StringVar(&o.AutoCertDomainName, "auto-cert-domain-name", "", "Auto cert domain name")
+ cmd.Flags().StringArrayVar(&o.AutoCertDNSProvider, "dns-provider", []string{}, "Auto cert DNS provider")
+ cmd.Flags().StringVar(&o.AutoCertEmail, "auto-cert-email", "", "Auto cert email")
  return cmd
 }
 
@@ -134,6 +144,20 @@
  for _, p := range pls {
  allSpec = append(allSpec, p)
  }
+ if o.AutoCertDomainName != "" {
+ autoCertSpec, err := o.TranslateAutoCertManager()
+ if err != nil {
+ return err
+ }
+ generalSpec, err := toGeneralSpec(autoCertSpec)
+ if err != nil {
+ return err
+ }
+ err = resources.ApplyObject(cmd, generalSpec)
+ if err != nil {
+ return err
+ }
+ }
  for _, s := range allSpec {
  spec, err := toGeneralSpec(s)
  if err != nil {
@@ -194,6 +218,27 @@
  keys = append(keys, key)
  }
  o.keys = keys
+
+ // parse dns provider
+ if o.AutoCertDomainName != "" || len(o.AutoCertDNSProvider) != 0 {
+ if !o.AutoCert {
+ return fmt.Errorf("auto cert domain name or dns provider is set, but auto cert is not enabled")
+ }
+ if o.AutoCertDomainName == "" {
+ return fmt.Errorf("auto cert domain name is required")
+ }
+ if len(o.AutoCertDNSProvider) == 0 {
+ return fmt.Errorf("auto cert dns provider is required")
+ }
+ }
+ o.dnsProvider = map[string]string{}
+ for _, dnsProvider := range o.AutoCertDNSProvider {
+ parts := strings.SplitN(dnsProvider, "=", 2)
+ if len(parts) != 2 {
+ return fmt.Errorf("dns provider %s should in format 'name=secret', invalid format", dnsProvider)
+ }
+ o.dnsProvider[parts[0]] = parts[1]
+ }
  return nil
 }
 
@@ -258,6 +303,50 @@
  return rules, pipelines
 }
 
+func (o *HTTPProxyOptions) TranslateAutoCertManager() (*specs.AutoCertManagerSpec, error) {
+ url := general.MakePath(general.ObjectsURL)
+ body, err := general.HandleRequest(http.MethodGet, url, nil)
+ if err != nil {
+ return nil, err
+ }
+ allSpecs, err := general.UnmarshalMapInterface(body, true)
+ if err != nil {
+ return nil, err
+ }
+ var spec *specs.AutoCertManagerSpec
+ for _, s := range allSpecs {
+ if s["kind"] == "AutoCertManager" {
+ if spec == nil {
+ spec = &specs.AutoCertManagerSpec{}
+ data, err := codectool.MarshalYAML(s)
+ if err != nil {
+ return nil, err
+ }
+ if err := codectool.Unmarshal(data, spec); err != nil {
+ return nil, err
+ }
+ } else {
+ return nil, fmt.Errorf("there are more than one AutoCertManager")
+ }
+ }
+ }
+ if spec == nil {
+ if o.AutoCertEmail != "" {
+ spec = specs.NewAutoCertManagerSpec()
+ spec.Email = o.AutoCertEmail
+ } else {
+ return nil, fmt.Errorf("there is no AutoCertManager and auto-cert-email is not set, please create one or set auto-cert-email")
+ }
+ } else if o.AutoCertEmail != "" {
+ spec.Email = o.AutoCertEmail
+ }
+ spec.AddOrUpdateDomain(&autocertmanager.DomainSpec{
+ Name: o.AutoCertDomainName,
+ DNSProvider: o.dnsProvider,
+ })
+ return spec, nil
+}
+
 func toGeneralSpec(data interface{}) (*general.Spec, error) {
  var yamlStr []byte
  var err error

cmd/client/commandv2/specs/spec.go

@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
 package specs
 
 import (
  "github.com/megaease/easegress/v2/cmd/client/general"
  "github.com/megaease/easegress/v2/pkg/filters"
  "github.com/megaease/easegress/v2/pkg/filters/builder"
  "github.com/megaease/easegress/v2/pkg/filters/proxies/httpproxy"
+ "github.com/megaease/easegress/v2/pkg/object/autocertmanager"
  "github.com/megaease/easegress/v2/pkg/object/httpserver"
  "github.com/megaease/easegress/v2/pkg/object/pipeline"
  "github.com/megaease/easegress/v2/pkg/util/codectool"
@@ -79,6 +80,10 @@
  return (&pipeline.Pipeline{}).DefaultSpec().(*pipeline.Spec)
 }
 
+func getDefaultAutoCertManagerSpec() *autocertmanager.Spec {
+ return (&autocertmanager.AutoCertManager{}).DefaultSpec().(*autocertmanager.Spec)
+}
+
 // NewProxyFilterSpec returns a new ProxyFilterSpec.
 func NewProxyFilterSpec(name string) *httpproxy.Spec {
  spec := GetDefaultFilterSpec(httpproxy.Kind).(*httpproxy.Spec)
@@ -107,3 +112,30 @@
 func GetDefaultFilterSpec(kind string) filters.Spec {
  return filters.GetKind(kind).DefaultSpec()
 }
+
+// PipelineSpec is the spec of Pipeline.
+type AutoCertManagerSpec struct {
+ Name string `json:"name"`
+ Kind string `json:"kind"`
+
+ autocertmanager.Spec `json:",inline"`
+}
+
+func NewAutoCertManagerSpec() *AutoCertManagerSpec {
+ return &AutoCertManagerSpec{
+ Name: "default",
+ Kind: autocertmanager.Kind,
+ Spec: *getDefaultAutoCertManagerSpec(),
+ }
+}
+
+// AddOrUpdateDomain adds or updates a domain.
+func (a *AutoCertManagerSpec) AddOrUpdateDomain(domain *autocertmanager.DomainSpec) {
+ for i, d := range a.Domains {
+ if d.Name == domain.Name {
+ a.Domains[i] = *domain
+ return
+ }
+ }
+ a.Domains = append(a.Domains, *domain)
+}