github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 17:56:34 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

caddytls: Remove "IssuerRaw" field

Browse Source 
Has been deprecated and printing warnings for about 8 months now.
Replaced by "IssuersRaw" field in v2.3.0.
This commit is contained in:
Matthew Holt 2021-06-25 11:29:56 -06:00
parent b3d35a4995
commit 81e5318021
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/caddytls/automation.go
View File

@ -89,10 +89,6 @@ type AutomationPolicy struct {
// zerossl. // zerossl.
IssuersRaw []json.RawMessage `json:"issuers,omitempty" caddy:"namespace=tls.issuance inline_key=module"` IssuersRaw []json.RawMessage `json:"issuers,omitempty" caddy:"namespace=tls.issuance inline_key=module"`
// DEPRECATED: Use `issuers` instead (November 2020). This field will
// be removed in the future.
IssuerRaw json.RawMessage `json:"issuer,omitempty" caddy:"namespace=tls.issuance inline_key=module"`
// If true, certificates will be requested with MustStaple. Not all // If true, certificates will be requested with MustStaple. Not all
// CAs support this, and there are potentially serious consequences // CAs support this, and there are potentially serious consequences
// of enabling this feature without proper threat modeling. // of enabling this feature without proper threat modeling.
@ -180,12 +176,6 @@ func (ap *AutomationPolicy) Provision(tlsApp *TLS) error {
} }
} }
// TODO: IssuerRaw field deprecated as of November 2020 - remove this shim after deprecation is complete
if ap.IssuerRaw != nil {
tlsApp.logger.Warn("the 'issuer' field is deprecated and will be removed in the future; use 'issuers' instead; your issuer has been appended automatically for now")
ap.IssuersRaw = append(ap.IssuersRaw, ap.IssuerRaw)
}
// load and provision any explicitly-configured issuer modules // load and provision any explicitly-configured issuer modules
if ap.IssuersRaw != nil { if ap.IssuersRaw != nil {
val, err := tlsApp.ctx.LoadModule(ap, "IssuersRaw") val, err := tlsApp.ctx.LoadModule(ap, "IssuersRaw")