MINOR: add support for acme keyword reuse-key

Author: oliwer

config-parser/section-parsers.go

@@ -1044,5 +1044,6 @@ func (p *configParser) getAcmeParser() *Parsers {
 	addParser(parser, &sequence, &simple.Word{Name: "directory"})
 	addParser(parser, &sequence, &simple.Word{Name: "keytype"})
 	addParser(parser, &sequence, &simple.Word{Name: "map"})
+	addParser(parser, &sequence, &simple.OnOff{Name: "reuse-key"})
 	return p.createParsers(parser, sequence)
 }

configuration/acme_provider.go

@@ -172,6 +172,7 @@ func ParseAcmeProvider(p parser.Parser, name string) (*models.AcmeProvider, erro
 		"directory":     &acme.Directory,
 		"keytype":       &acme.Keytype,
 		"map":           &acme.Map,
+		"reuse-key":     &acme.ReuseKey,
 	}
 
 	for kw, dest := range stringAttr {
@@ -189,6 +190,8 @@ func ParseAcmeProvider(p parser.Parser, name string) (*models.AcmeProvider, erro
 		*dest = str.Value
 	}
 
+	acme.ReuseKey = onOff(acme.ReuseKey)
+
 	// bits
 	val, err := p.Get(parser.Acme, name, "bits")
 	if err != nil {
@@ -239,6 +242,7 @@ func SerializeAcmeProvider(p parser.Parser, acme *models.AcmeProvider) error {
 		"directory":     acme.Directory,
 		"keytype":       acme.Keytype,
 		"map":           acme.Map,
+		"reuse-key":     onOff(acme.ReuseKey),
 	}
 
 	for kw, val := range stringAttr {
@@ -358,3 +362,18 @@ func acmeValidKey(key string) bool {
 	}
 	return true
 }
+
+func onOff(s string) string {
+	switch len(s) {
+	case 2: // on
+		return "enabled"
+	case 3: // off
+		return "disabled"
+	case 7: // enabled
+		return "on"
+	case 8: // disabled
+		return "off"
+	default:
+		return s
+	}
+}

models/acme_provider.go

@@ -11939,6 +11939,12 @@ definitions:
         description: ACME provider's name
         type: string
         x-nullable: false
+      reuse_key:
+        description: Try to reuse the private key instead of generating a new one.
+        enum:
+          - enabled
+          - disabled
+        type: string
     required:
       - name
       - directory

models/acme_provider_compare_test.go

@@ -51,6 +51,10 @@ acme:
     map:
       type: string
       description: The map which will be used to store the ACME token (key) and thumbprint
+    reuse_key:
+      type: string
+      enum: [enabled, disabled]
+      description: Try to reuse the private key instead of generating a new one.
     metadata:
       additionalProperties:
         type: object

models/acmeprovider_diff_generated.go

@@ -108,6 +108,7 @@ func TestCreateEditDeleteAcmeProvider(t *testing.T) {
 		Directory: "https://acme.ninja.com/directory",
 		Keytype:   "ECDSA",
 		Map:       "acme@virt",
+		ReuseKey:  models.AcmeProviderReuseKeyEnabled,
 	}
 
 	err := clientTest.CreateAcmeProvider(a, "", version)
@@ -132,6 +133,7 @@ func TestCreateEditDeleteAcmeProvider(t *testing.T) {
 	// Edit
 	a.Contact = "[email protected]"
 	a.Bits = misc.Int64P(4096)
+	a.ReuseKey = ""
 	err = clientTest.EditAcmeProvider(a.Name, a, "", version)
 	require.NoError(err)
 	version++

models/acmeprovider_equal_generated.go

@@ -1019,6 +1019,7 @@ acme test
   directory https://acme.example.com/directory
   keytype ECDSA
   map acme@t
+  reuse-key on
 
 crt-store cert-bunker1
   crt-base /secure/certs