MINOR: crt-store: add support for acme and domains attributes

Author: oliwer

config-parser/parsers/crt-store-load.go

@@ -48,8 +48,12 @@ func (p *LoadCert) parse(line string, parts []string, comment string) (*types.Lo
 		switch element {
 		case "crt":
 			CheckParsePair(parts, &i, &load.Certificate)
+		case "acme":
+			CheckParsePair(parts, &i, &load.Acme)
 		case "alias":
 			CheckParsePair(parts, &i, &load.Alias)
+		case "domains":
+			CheckParsePair(parts, &i, &load.Domains)
 		case "key":
 			CheckParsePair(parts, &i, &load.Key)
 		case "ocsp":
@@ -60,6 +64,9 @@ func (p *LoadCert) parse(line string, parts []string, comment string) (*types.Lo
 			CheckParsePair(parts, &i, &load.Sctl)
 		case "ocsp-update":
 			i++
+			if i >= len(parts) {
+				return nil, p.parseError(line)
+			}
 			load.OcspUpdate = new(bool)
 			if parts[i] == "on" {
 				*load.OcspUpdate = true
@@ -90,7 +97,9 @@ func (p *LoadCert) Result() ([]common.ReturnResultLine, error) {
 		sb.Reset()
 		sb.WriteString("load")
 		CheckWritePair(sb, "crt", load.Certificate)
+		CheckWritePair(sb, "acme", load.Acme)
 		CheckWritePair(sb, "alias", load.Alias)
+		CheckWritePair(sb, "domains", load.Domains)
 		CheckWritePair(sb, "key", load.Key)
 		CheckWritePair(sb, "ocsp", load.Ocsp)
 		CheckWritePair(sb, "issuer", load.Issuer)

config-parser/tests/configs/haproxy_generated.cfg.go

@@ -1662,11 +1662,14 @@ type HTTPFailCodes struct {
 //test:ok:load crt foo.pem alias foo.com key foo.priv.key ocsp foo.ocsp.der issuer foo.issuer.pem sctl foo.sctl
 //test:ok:load crt foo.pem alias foo.com key foo.priv.key ocsp foo.ocsp.der issuer foo.issuer.pem sctl foo.sctl ocsp-update on
 //test:ok:load crt foo.pem alias foo.com key foo.priv.key ocsp foo.ocsp.der issuer foo.issuer.pem sctl foo.sctl ocsp-update off
+//test:ok:load crt foo.pem acme LE domains example.com,example.org
 //test:fail:load alias foo.com key foo.priv.key
 //test:fail:load crt foo.pem alias foo.com key foo.priv.key ocsp foo.ocsp.der issuer foo.issuer.pem ocsp-update lol
 type LoadCert struct {
 	Certificate string
+	Acme        string
 	Alias       string
+	Domains     string
 	Key         string
 	Ocsp        string
 	Issuer      string

config-parser/tests/integration/crt-store_data_test.go

@@ -16,6 +16,8 @@
 package configuration
 
 import (
+	"strings"
+
 	strfmt "github.com/go-openapi/strfmt"
 	parser "github.com/haproxytech/client-native/v6/config-parser"
 	parser_errors "github.com/haproxytech/client-native/v6/config-parser/errors"
@@ -152,8 +154,10 @@ func (c *client) EditCrtLoad(certificate, crtStore string, data *models.CrtLoad,
 
 func SerializeCrtLoad(load *models.CrtLoad) *types.LoadCert {
 	t := &types.LoadCert{
+		Acme:        load.Acme,
 		Alias:       load.Alias,
 		Certificate: load.Certificate,
+		Domains:     strings.Join(load.Domains, ","),
 		Key:         load.Key,
 		Issuer:      load.Issuer,
 		Ocsp:        load.Ocsp,

config-parser/tests/load_generated_test.go

@@ -18,6 +18,7 @@ package configuration
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	strfmt "github.com/go-openapi/strfmt"
 	parser "github.com/haproxytech/client-native/v6/config-parser"
@@ -197,9 +198,15 @@ func ParseCrtStore(p parser.Parser, name string) (*models.CrtStore, error) {
 	}
 	store.Loads = make(models.CrtLoads, len(tloads))
 	for i, l := range tloads {
+		domains := strings.Split(l.Domains, ",")
+		if len(domains) == 1 && domains[0] == "" {
+			domains = nil
+		}
 		mload := &models.CrtLoad{
+			Acme:        l.Acme,
 			Alias:       l.Alias,
 			Certificate: l.Certificate,
+			Domains:     domains,
 			Issuer:      l.Issuer,
 			Key:         l.Key,
 			Ocsp:        l.Ocsp,