From 87ae06d8c7a2ebb211f50852517ee31418363c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A1udia=20Correia?= Date: Thu, 14 Dec 2023 13:57:49 +0000 Subject: [PATCH] Fix IC unit tests --- .../instanceconfigapi/config_test.go | 6 +++--- .../instanceconfigapi/create_test.go | 18 +++++++++--------- .../platformapi/instanceconfigapi/get_test.go | 12 ++++++------ .../platformapi/instanceconfigapi/list_test.go | 12 ++++++------ .../instanceconfigapi/update_test.go | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkg/api/platformapi/instanceconfigapi/config_test.go b/pkg/api/platformapi/instanceconfigapi/config_test.go index c58ee961..1ae520d8 100644 --- a/pkg/api/platformapi/instanceconfigapi/config_test.go +++ b/pkg/api/platformapi/instanceconfigapi/config_test.go @@ -47,12 +47,12 @@ func TestNewConfig(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, diff --git a/pkg/api/platformapi/instanceconfigapi/create_test.go b/pkg/api/platformapi/instanceconfigapi/create_test.go index 8bf2609e..185219eb 100644 --- a/pkg/api/platformapi/instanceconfigapi/create_test.go +++ b/pkg/api/platformapi/instanceconfigapi/create_test.go @@ -62,12 +62,12 @@ func TestCreate(t *testing.T) { Config: &models.InstanceConfiguration{ Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, @@ -100,12 +100,12 @@ func TestCreate(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, @@ -125,12 +125,12 @@ func TestCreate(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, diff --git a/pkg/api/platformapi/instanceconfigapi/get_test.go b/pkg/api/platformapi/instanceconfigapi/get_test.go index 1b14ab06..ecf958f8 100644 --- a/pkg/api/platformapi/instanceconfigapi/get_test.go +++ b/pkg/api/platformapi/instanceconfigapi/get_test.go @@ -64,12 +64,12 @@ func TestGet(t *testing.T) { ID: "data.highstorage", Description: "Instance configuration to be used for a higher disk/memory ratio", Name: ec.String("data.highstorage"), - InstanceType: ec.String("elasticsearch"), + InstanceType: "elasticsearch", StorageMultiplier: float64(32), NodeTypes: []string{"data", "ingest", "master"}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, @@ -106,11 +106,11 @@ func TestGet(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, diff --git a/pkg/api/platformapi/instanceconfigapi/list_test.go b/pkg/api/platformapi/instanceconfigapi/list_test.go index cf5beb91..b3bab5e3 100644 --- a/pkg/api/platformapi/instanceconfigapi/list_test.go +++ b/pkg/api/platformapi/instanceconfigapi/list_test.go @@ -66,12 +66,12 @@ func TestList(t *testing.T) { ID: "data.highstorage", Description: "Instance configuration to be used for a higher disk/memory ratio", Name: ec.String("data.highstorage"), - InstanceType: ec.String("elasticsearch"), + InstanceType: "elasticsearch", StorageMultiplier: float64(32), NodeTypes: []string{"data", "ingest", "master"}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, @@ -89,11 +89,11 @@ func TestList(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, diff --git a/pkg/api/platformapi/instanceconfigapi/update_test.go b/pkg/api/platformapi/instanceconfigapi/update_test.go index bd4f6f05..3590e608 100644 --- a/pkg/api/platformapi/instanceconfigapi/update_test.go +++ b/pkg/api/platformapi/instanceconfigapi/update_test.go @@ -63,12 +63,12 @@ func TestUpdate(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048, @@ -88,12 +88,12 @@ func TestUpdate(t *testing.T) { ID: "kibana", Description: "Instance configuration to be used for Kibana", Name: ec.String("kibana"), - InstanceType: ec.String("kibana"), + InstanceType: "kibana", StorageMultiplier: float64(4), NodeTypes: []string{}, DiscreteSizes: &models.DiscreteSizes{ - DefaultSize: ec.Int32(1024), - Resource: ec.String("memory"), + DefaultSize: 1024, + Resource: "memory", Sizes: []int32{ 1024, 2048,