Trying to fix some tests...

elastic · Apr 9, 2024 · cccc156 · cccc156
1 parent a05c714
commit cccc156
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/pkg/api/platformapi/instanceconfigapi/config_test.go b/pkg/api/platformapi/instanceconfigapi/config_test.go
@@ -60,6 +60,7 @@ func TestNewConfig(t *testing.T) {
 						8192,
 					},
 				},
+				AllowedZones: []string{},
 			},
 		},
 	}

diff --git a/pkg/api/platformapi/instanceconfigapi/create_test.go b/pkg/api/platformapi/instanceconfigapi/create_test.go
@@ -55,7 +55,7 @@ func TestCreate(t *testing.T) {
 						Header: api.DefaultWriteMockHeaders,
 						Method: "POST",
 						Host:   api.DefaultMockHost,
-						Body:   mock.NewStringBody(`{"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
+						Body:   mock.NewStringBody(`{"allowed_zones":[],"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
 						Path:   "/api/v1/regions/us-east-1/platform/configuration/instances",
 					},
 				}),
@@ -75,6 +75,7 @@ func TestCreate(t *testing.T) {
 							8192,
 						},
 					},
+					AllowedZones: []string{},
 				},
 			}},
 			want: &models.VersionedIDResponse{ID: ec.String("an autogenerated id")},
@@ -92,7 +93,7 @@ func TestCreate(t *testing.T) {
 						Header: api.DefaultWriteMockHeaders,
 						Method: "PUT",
 						Host:   api.DefaultMockHost,
-						Body:   mock.NewStringBody(`{"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"id":"kibana","instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
+						Body:   mock.NewStringBody(`{"allowed_zones":[],"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"id":"kibana","instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
 						Path:   "/api/v1/regions/us-east-1/platform/configuration/instances/kibana",
 					},
 				}),
@@ -113,6 +114,7 @@ func TestCreate(t *testing.T) {
 							8192,
 						},
 					},
+					AllowedZones: []string{},
 				}},
 			},
 			want: &models.VersionedIDResponse{ID: ec.String("kibana")},
@@ -138,6 +140,7 @@ func TestCreate(t *testing.T) {
 							8192,
 						},
 					},
+					AllowedZones: []string{},
 				},
 				API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
 			}},

diff --git a/pkg/api/platformapi/instanceconfigapi/get_test.go b/pkg/api/platformapi/instanceconfigapi/get_test.go
@@ -82,6 +82,7 @@ func TestGet(t *testing.T) {
 						262144,
 					},
 				},
+				AllowedZones: []string{},
 			},
 		},
 		{
@@ -118,6 +119,7 @@ func TestGet(t *testing.T) {
 						8192,
 					},
 				},
+				AllowedZones: []string{},
 			},
 		},
 		{

diff --git a/pkg/api/platformapi/instanceconfigapi/pull_test.go b/pkg/api/platformapi/instanceconfigapi/pull_test.go
@@ -86,6 +86,7 @@ func TestPullToDirectory(t *testing.T) {
 			}},
 			want: map[string]string{
 				"some-folder/data.highstorage.json": `{
+  "allowed_zones": null,
   "description": "Instance configuration to be used for a higher disk/memory ratio",
   "discrete_sizes": {
     "default_size": 1024,
@@ -114,6 +115,7 @@ func TestPullToDirectory(t *testing.T) {
 }
 `,
 				"some-folder/kibana.json": `{
+  "allowed_zones": null,
   "description": "Instance configuration to be used for Kibana",
   "discrete_sizes": {
     "default_size": 1024,

diff --git a/pkg/api/platformapi/instanceconfigapi/testutil_responses_test.go b/pkg/api/platformapi/instanceconfigapi/testutil_responses_test.go
@@ -42,7 +42,8 @@ const listInstanceConfigsSuccess = `[{
     "ingest",
     "master"
   ],
-  "storage_multiplier": 32
+  "storage_multiplier": 32,
+  "allowed_zones": null
 }, {
   "description": "Instance configuration to be used for Kibana",
   "discrete_sizes": {
@@ -59,7 +60,8 @@ const listInstanceConfigsSuccess = `[{
   "instance_type": "kibana",
   "name": "kibana",
   "node_types": null,
-  "storage_multiplier": 4
+  "storage_multiplier": 4,
+  "allowed_zones": null
 }]`
 
 const getInstanceConfigsSuccess = `{
@@ -87,7 +89,8 @@ const getInstanceConfigsSuccess = `{
     "ingest",
     "master"
   ],
-  "storage_multiplier": 32
+  "storage_multiplier": 32,
+  "allowed_zones": []
 }`
 
 const getInstanceConfigsSuccessKibana = `{
@@ -106,7 +109,8 @@ const getInstanceConfigsSuccessKibana = `{
   "instance_type": "kibana",
   "name": "kibana",
   "node_types": null,
-  "storage_multiplier": 4
+  "storage_multiplier": 4,
+  "allowed_zones": []
 }`
 
 const newConfigKibanaInstanceConfig = `{
@@ -125,5 +129,6 @@ const newConfigKibanaInstanceConfig = `{
   "instance_type": "kibana",
   "name": "kibana",
   "node_types": [],
-  "storage_multiplier": 4
+  "storage_multiplier": 4,
+  "allowed_zones": []
 }`
diff --git a/pkg/api/platformapi/instanceconfigapi/update_test.go b/pkg/api/platformapi/instanceconfigapi/update_test.go
@@ -55,7 +55,7 @@ func TestUpdate(t *testing.T) {
 						Header: api.DefaultWriteMockHeaders,
 						Method: "PUT",
 						Host:   api.DefaultMockHost,
-						Body:   mock.NewStringBody(`{"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"id":"kibana","instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
+						Body:   mock.NewStringBody(`{"allowed_zones":[],"description":"Instance configuration to be used for Kibana","discrete_sizes":{"default_size":1024,"resource":"memory","sizes":[1024,2048,4096,8192]},"id":"kibana","instance_type":"kibana","name":"kibana","storage_multiplier":4}` + "\n"),
 						Path:   "/api/v1/regions/us-east-1/platform/configuration/instances/kibana",
 					},
 				}),
@@ -76,6 +76,7 @@ func TestUpdate(t *testing.T) {
 							8192,
 						},
 					},
+					AllowedZones: []string{},
 				},
 			}},
 		},
@@ -101,6 +102,7 @@ func TestUpdate(t *testing.T) {
 							8192,
 						},
 					},
+					AllowedZones: []string{},
 				},
 				API: api.NewMock(mock.New500Response(mock.NewStringBody(`{"error": "some error"}`))),
 			}},