From b25021b9129820147bf596b834d438ef218acf28 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 9 May 2017 13:56:07 +0100 Subject: PLT-6504: Add ElasticSearch feature to license. (#6339) --- model/license.go | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'model/license.go') diff --git a/model/license.go b/model/license.go index 57c49d3d8..558cd43fa 100644 --- a/model/license.go +++ b/model/license.go @@ -49,24 +49,26 @@ type Features struct { MHPNS *bool `json:"mhpns"` SAML *bool `json:"saml"` PasswordRequirements *bool `json:"password_requirements"` + ElasticSearch *bool `json:"elastic_search"` // after we enabled more features for webrtc we'll need to control them with this FutureFeatures *bool `json:"future_features"` } func (f *Features) ToMap() map[string]interface{} { return map[string]interface{}{ - "ldap": *f.LDAP, - "mfa": *f.MFA, - "google": *f.GoogleOAuth, - "office365": *f.Office365OAuth, - "compliance": *f.Compliance, - "cluster": *f.Cluster, - "metrics": *f.Metrics, - "custom_brand": *f.CustomBrand, - "mhpns": *f.MHPNS, - "saml": *f.SAML, - "password": *f.PasswordRequirements, - "future": *f.FutureFeatures, + "ldap": *f.LDAP, + "mfa": *f.MFA, + "google": *f.GoogleOAuth, + "office365": *f.Office365OAuth, + "compliance": *f.Compliance, + "cluster": *f.Cluster, + "metrics": *f.Metrics, + "custom_brand": *f.CustomBrand, + "mhpns": *f.MHPNS, + "saml": *f.SAML, + "password": *f.PasswordRequirements, + "elastic_search": *f.ElasticSearch, + "future": *f.FutureFeatures, } } @@ -135,6 +137,11 @@ func (f *Features) SetDefaults() { f.PasswordRequirements = new(bool) *f.PasswordRequirements = *f.FutureFeatures } + + if f.ElasticSearch == nil { + f.ElasticSearch = new(bool) + *f.ElasticSearch = *f.FutureFeatures + } } func (l *License) IsExpired() bool { -- cgit v1.2.3-1-g7c22