From f6536039db9f5db4ff8f0cd2e1148bbddf387f66 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 13 Dec 2015 16:02:15 +0100 Subject: Add stringer --- challange_http.go | 2 +- challenge.go | 6 +++--- messages.go | 19 ++++++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/challange_http.go b/challange_http.go index b6b1c02..2d10da4 100644 --- a/challange_http.go +++ b/challange_http.go @@ -3,5 +3,5 @@ package acme const wellKnown = `/.well-known/acme-challenge/` func init() { - registerChallenge("http-01") + registerChallenge(ChallengeHTTP) } diff --git a/challenge.go b/challenge.go index 9e7bb06..129f89d 100644 --- a/challenge.go +++ b/challenge.go @@ -5,8 +5,8 @@ type Solver interface { Solve() } -var canSolve []string +var canSolve = make(map[ChallengeType]bool) -func registerChallenge(c string) { - canSolve = append(canSolve, c) +func registerChallenge(c ChallengeType) { + canSolve[c] = true } diff --git a/messages.go b/messages.go index 859061a..65b0904 100644 --- a/messages.go +++ b/messages.go @@ -67,6 +67,7 @@ type Challenge struct { URI string `json:"uri,omitempty"` Validated *time.Time `json:"validated,omitempty"` // 2006-01-02T15:04Z KeyAuthorization string `json:"keyAuthorization,omitempty"` + N int `json:"n,omitempty"` } // Problem description @@ -135,9 +136,13 @@ var resources = map[Resource]string{ ResCert: "cert", } +func (r Resource) String() string { + return resources[r] +} + // MarshalText implements text encoding marshaller func (r Resource) MarshalText() ([]byte, error) { - return []byte(resources[r]), nil + return []byte(r.String()), nil } type IdentType int @@ -148,8 +153,12 @@ var identTypes = map[IdentType]string{ IdentDNS: "dns", } +func (i IdentType) String() string { + return identTypes[i] +} + func (i IdentType) MarshalText() ([]byte, error) { - return []byte(identTypes[i]), nil + return []byte(i.String()), nil } func (i *IdentType) UnmarshalText(b []byte) error { @@ -178,8 +187,12 @@ var challenges = map[ChallengeType]string{ ChallengeDNS: "dns-01", } +func (c ChallengeType) String() string { + return challenges[c] +} + func (c ChallengeType) MarshalText() ([]byte, error) { - return []byte(challenges[c]), nil + return []byte(c.String()), nil } func (c *ChallengeType) UnmarshalText(b []byte) error { -- cgit v1.2.3