diff --git a/pkg/controller/elasticsearch/client/model.go b/pkg/controller/elasticsearch/client/model.go index 7b13555aef..3c835121fa 100644 --- a/pkg/controller/elasticsearch/client/model.go +++ b/pkg/controller/elasticsearch/client/model.go @@ -293,7 +293,8 @@ type License struct { IssueDateInMillis int64 `json:"issue_date_in_millis"` ExpiryDate *time.Time `json:"expiry_date,omitempty"` ExpiryDateInMillis int64 `json:"expiry_date_in_millis"` - MaxNodes int `json:"max_nodes"` + MaxNodes int `json:"max_nodes,omitempty"` + MaxResourceUnits int `json:"max_resource_units,omitempty"` IssuedTo string `json:"issued_to"` Issuer string `json:"issuer"` StartDateInMillis int64 `json:"start_date_in_millis"` diff --git a/pkg/controller/elasticsearch/client/model_test.go b/pkg/controller/elasticsearch/client/model_test.go index 936489e4c8..305f8171f2 100644 --- a/pkg/controller/elasticsearch/client/model_test.go +++ b/pkg/controller/elasticsearch/client/model_test.go @@ -58,6 +58,52 @@ func TestModel_RemoteCluster(t *testing.T) { } } +func TestModel_License(t *testing.T) { + tests := []struct { + name string + license License + want string + }{ + { + name: "platinum", + license: License{ + UID: "304d04fe-c2d2-8774-cd34-7a71a4cc8c4d", + Type: "platinum", + IssueDateInMillis: 1576000000000, + ExpiryDateInMillis: 1590000000000, + MaxNodes: 100, + IssuedTo: "ECK Test", + Issuer: "ECK Tester", + StartDateInMillis: 1576000000000, + Signature: "AAA...xyz", + }, + want: `{"uid":"304d04fe-c2d2-8774-cd34-7a71a4cc8c4d","type":"platinum","issue_date_in_millis":1576000000000,"expiry_date_in_millis":1590000000000,"max_nodes":100,"issued_to":"ECK Test","issuer":"ECK Tester","start_date_in_millis":1576000000000,"signature":"AAA...xyz"}`, + }, + { + name: "enterprise", + license: License{ + UID: "304d04fe-c2d2-8774-cd34-7a71a4cc8c4d", + Type: "enterprise", + IssueDateInMillis: 1576000000000, + ExpiryDateInMillis: 1590000000000, + MaxResourceUnits: 100, + IssuedTo: "ECK Test", + Issuer: "ECK Tester", + StartDateInMillis: 1576000000000, + Signature: "AAA...xyz", + }, + want: `{"uid":"304d04fe-c2d2-8774-cd34-7a71a4cc8c4d","type":"enterprise","issue_date_in_millis":1576000000000,"expiry_date_in_millis":1590000000000,"max_resource_units":100,"issued_to":"ECK Test","issuer":"ECK Tester","start_date_in_millis":1576000000000,"signature":"AAA...xyz"}`, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + json, err := json.Marshal(tt.license) + assert.NoError(t, err) + assert.Equal(t, tt.want, string(json)) + }) + } +} + func TestClusterRoutingAllocation(t *testing.T) { clusterSettingsSample := `{"persistent":{},"transient":{"cluster":{"routing":{"allocation":{"enable":"none","exclude":{"_name":"excluded"}}}}}}` expected := ClusterRoutingAllocation{Transient: AllocationSettings{Cluster: ClusterRoutingSettings{Routing: RoutingSettings{Allocation: RoutingAllocationSettings{Enable: "none", Exclude: AllocationExclude{Name: "excluded"}}}}}}