Skip to content

Commit 0125148

Browse files
committed
BUG/MINOR: Fix serialization of ACME provider-name
1 parent c07c9c4 commit 0125148

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

config-parser/section-parsers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,6 @@ func (p *configParser) getAcmeParser() *Parsers {
10401040
parser := map[string]ParserInterface{}
10411041
sequence := []Section{}
10421042
addParser(parser, &sequence, &simple.Word{Name: "account-key"})
1043-
addParser(parser, &sequence, &simple.Word{Name: "acme-provider"})
10441043
addParser(parser, &sequence, &simple.Word{Name: "acme-vars"})
10451044
addParser(parser, &sequence, &simple.Number{Name: "bits"})
10461045
addParser(parser, &sequence, &simple.Word{Name: "challenge"})
@@ -1050,6 +1049,7 @@ func (p *configParser) getAcmeParser() *Parsers {
10501049
addParser(parser, &sequence, &simple.Word{Name: "keytype"})
10511050
addParser(parser, &sequence, &simple.Word{Name: "map"})
10521051
addParser(parser, &sequence, &simple.Word{Name: "profile"})
1052+
addParser(parser, &sequence, &simple.Word{Name: "provider-name"})
10531053
addParser(parser, &sequence, &simple.OnOff{Name: "reuse-key"})
10541054
return p.createParsers(parser, sequence)
10551055
}

configuration/acme_provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func ParseAcmeProvider(p parser.Parser, name string) (*models.AcmeProvider, erro
165165

166166
stringAttr := map[string]*string{
167167
"account-key": &acme.AccountKey,
168-
"acme-provider": &acme.AcmeProvider,
168+
"provider-name": &acme.AcmeProvider,
169169
"acme-vars": &varsStr,
170170
"challenge": &acme.Challenge,
171171
"contact": &acme.Contact,
@@ -236,7 +236,7 @@ func SerializeAcmeProvider(p parser.Parser, acme *models.AcmeProvider) error {
236236

237237
stringAttr := map[string]string{
238238
"account-key": acme.AccountKey,
239-
"acme-provider": acme.AcmeProvider,
239+
"provider-name": acme.AcmeProvider,
240240
"acme-vars": acmeVars,
241241
"challenge": acme.Challenge,
242242
"contact": acme.Contact,

test/configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ mailers localmailer1
10231023
10241024
acme test
10251025
contact me@example.com
1026-
acme-provider gandy
1026+
provider-name gandy
10271027
acme-vars "ApiKey=ple744587,Zone=example.com"
10281028
bits 4096
10291029
challenge http-01

0 commit comments

Comments
 (0)