diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/license.go | 6 | ||||
| -rw-r--r-- | model/license_test.go | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/model/license.go b/model/license.go index b6a6f2ac8..05db063e2 100644 --- a/model/license.go +++ b/model/license.go @@ -46,7 +46,6 @@ type Features struct { Compliance *bool `json:"compliance"` Cluster *bool `json:"cluster"` Metrics *bool `json:"metrics"` - CustomBrand *bool `json:"custom_brand"` MHPNS *bool `json:"mhpns"` SAML *bool `json:"saml"` Elasticsearch *bool `json:"elastic_search"` @@ -70,7 +69,6 @@ func (f *Features) ToMap() map[string]interface{} { "compliance": *f.Compliance, "cluster": *f.Cluster, "metrics": *f.Metrics, - "custom_brand": *f.CustomBrand, "mhpns": *f.MHPNS, "saml": *f.SAML, "elastic_search": *f.Elasticsearch, @@ -119,10 +117,6 @@ func (f *Features) SetDefaults() { f.Metrics = NewBool(*f.FutureFeatures) } - if f.CustomBrand == nil { - f.CustomBrand = NewBool(*f.FutureFeatures) - } - if f.MHPNS == nil { f.MHPNS = NewBool(*f.FutureFeatures) } diff --git a/model/license_test.go b/model/license_test.go index a9379d78e..b45473432 100644 --- a/model/license_test.go +++ b/model/license_test.go @@ -21,7 +21,6 @@ func TestLicenseFeaturesToMap(t *testing.T) { CheckTrue(t, m["compliance"].(bool)) CheckTrue(t, m["cluster"].(bool)) CheckTrue(t, m["metrics"].(bool)) - CheckTrue(t, m["custom_brand"].(bool)) CheckTrue(t, m["mhpns"].(bool)) CheckTrue(t, m["saml"].(bool)) CheckTrue(t, m["elastic_search"].(bool)) @@ -44,7 +43,6 @@ func TestLicenseFeaturesSetDefaults(t *testing.T) { CheckTrue(t, *f.Compliance) CheckTrue(t, *f.Cluster) CheckTrue(t, *f.Metrics) - CheckTrue(t, *f.CustomBrand) CheckTrue(t, *f.MHPNS) CheckTrue(t, *f.SAML) CheckTrue(t, *f.Elasticsearch) @@ -66,7 +64,6 @@ func TestLicenseFeaturesSetDefaults(t *testing.T) { *f.Compliance = true *f.Cluster = true *f.Metrics = true - *f.CustomBrand = true *f.MHPNS = true *f.SAML = true *f.Elasticsearch = true @@ -85,7 +82,6 @@ func TestLicenseFeaturesSetDefaults(t *testing.T) { CheckTrue(t, *f.Compliance) CheckTrue(t, *f.Cluster) CheckTrue(t, *f.Metrics) - CheckTrue(t, *f.CustomBrand) CheckTrue(t, *f.MHPNS) CheckTrue(t, *f.SAML) CheckTrue(t, *f.Elasticsearch) @@ -169,7 +165,6 @@ func TestLicenseToFromJson(t *testing.T) { CheckBool(t, *f1.Compliance, *f.Compliance) CheckBool(t, *f1.Cluster, *f.Cluster) CheckBool(t, *f1.Metrics, *f.Metrics) - CheckBool(t, *f1.CustomBrand, *f.CustomBrand) CheckBool(t, *f1.MHPNS, *f.MHPNS) CheckBool(t, *f1.SAML, *f.SAML) CheckBool(t, *f1.Elasticsearch, *f.Elasticsearch) |