Skip to content

Commit b571106

Browse files
oliwermjuraga
authored andcommitted
BUG/MINOR: Fix serialization of ACME provider-name
1 parent 62a370f commit b571106

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
@@ -1062,7 +1062,6 @@ func (p *configParser) getAcmeParser() *Parsers {
10621062
parser := map[string]ParserInterface{}
10631063
sequence := []Section{}
10641064
addParser(parser, &sequence, &simple.Word{Name: "account-key"})
1065-
addParser(parser, &sequence, &simple.Word{Name: "acme-provider"})
10661065
addParser(parser, &sequence, &simple.Word{Name: "acme-vars"})
10671066
addParser(parser, &sequence, &simple.Number{Name: "bits"})
10681067
addParser(parser, &sequence, &simple.Word{Name: "challenge"})
@@ -1075,6 +1074,7 @@ func (p *configParser) getAcmeParser() *Parsers {
10751074
addParser(parser, &sequence, &simple.Word{Name: "keytype"})
10761075
addParser(parser, &sequence, &simple.Word{Name: "map"})
10771076
addParser(parser, &sequence, &simple.Word{Name: "profile"})
1077+
addParser(parser, &sequence, &simple.Word{Name: "provider-name"})
10781078
addParser(parser, &sequence, &simple.OnOff{Name: "reuse-key"})
10791079
return p.createParsers(parser, sequence)
10801080
}

configuration/acme_provider.go

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

173173
stringAttr := map[string]*string{
174174
"account-key": &acme.AccountKey,
175-
"acme-provider": &acme.AcmeProvider,
176175
"acme-vars": &varsStr,
177176
"challenge": &acme.Challenge,
178177
"challenge-ready": &challReadyStr,
@@ -184,6 +183,7 @@ func ParseAcmeProvider(p parser.Parser, name string) (*models.AcmeProvider, erro
184183
"keytype": &acme.Keytype,
185184
"map": &acme.Map,
186185
"profile": &acme.Profile,
186+
"provider-name": &acme.AcmeProvider,
187187
"reuse-key": &acme.ReuseKey,
188188
}
189189

@@ -274,7 +274,6 @@ func SerializeAcmeProvider(p parser.Parser, acme *models.AcmeProvider, opt *opti
274274

275275
stringAttr := map[string]string{
276276
"account-key": acme.AccountKey,
277-
"acme-provider": acme.AcmeProvider,
278277
"acme-vars": acmeVars,
279278
"challenge": acme.Challenge,
280279
"challenge-ready": strings.Join(acme.ChallengeReady, ","),
@@ -286,6 +285,7 @@ func SerializeAcmeProvider(p parser.Parser, acme *models.AcmeProvider, opt *opti
286285
"keytype": acme.Keytype,
287286
"map": acme.Map,
288287
"profile": acme.Profile,
288+
"provider-name": acme.AcmeProvider,
289289
"reuse-key": onOff(acme.ReuseKey),
290290
}
291291

test/configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ mailers localmailer1
10591059
10601060
acme test
10611061
contact me@example.com
1062-
acme-provider gandy
1062+
provider-name gandy
10631063
acme-vars "ApiKey=ple744587,Zone=example.com"
10641064
bits 4096
10651065
challenge http-01

0 commit comments

Comments
 (0)