Skip to content

Commit 36fbc1d

Browse files
author
Mika Scheer
committed
Fix cluster parameters
1 parent 26af4cb commit 36fbc1d

File tree

4 files changed

+69
-23
lines changed

4 files changed

+69
-23
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
this package and not the Core API. See the changelog of the [Core API](https://core-api.cyberfusion.io/redoc#section/Changelog)
77
for detailed information.
88

9+
## [1.116.2]
10+
11+
### Fixed
12+
13+
- Fix cluster `create()` and `update()` not working due to incorrect and missing parameters
14+
915
## [1.116.1]
1016

1117
### Fixed

‎src/Client.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Client implements ClientContract
2020

2121
private const TIMEOUT = 180;
2222

23-
private const VERSION = '1.116.1';
23+
private const VERSION = '1.116.2';
2424

2525
private const USER_AGENT = 'cyberfusion-cluster-api-client/' . self::VERSION;
2626

‎src/Endpoints/Clusters.php

+48-8
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ public function create(Cluster $cluster): Response
9595
'postgresql_version',
9696
'postgresql_backup_interval',
9797
'postgresql_backup_local_retention',
98-
'mariadb_toolkit_enabled',
99-
'mariadb_toolkit_scans_enabled',
10098
'bubblewrap_toolkit_enabled',
10199
'sync_toolkit_enabled',
102100
'automatic_borg_repositories_prune_enabled',
@@ -111,6 +109,18 @@ public function create(Cluster $cluster): Response
111109
'meilisearch_backup_local_retention',
112110
'automatic_upgrades_enabled',
113111
'firewall_rules_external_providers_enabled',
112+
'grafana_domain',
113+
'singlestore_studio_domain',
114+
'singlestore_api_domain',
115+
'singlestore_license_key',
116+
'singlestore_root_password',
117+
'elasticsearch_default_users_password',
118+
'rabbitmq_erlang_cookie',
119+
'rabbitmq_admin_password',
120+
'metabase_domain',
121+
'metabase_database_password' ,
122+
'kibana_domain',
123+
'rabbitmq_management_domain',
114124
'site_id',
115125
]);
116126

@@ -141,8 +151,6 @@ public function create(Cluster $cluster): Response
141151
'postgresql_version',
142152
'postgresql_backup_interval',
143153
'postgresql_backup_local_retention',
144-
'mariadb_toolkit_enabled',
145-
'mariadb_toolkit_scans_enabled',
146154
'bubblewrap_toolkit_enabled',
147155
'sync_toolkit_enabled',
148156
'automatic_borg_repositories_prune_enabled',
@@ -157,6 +165,18 @@ public function create(Cluster $cluster): Response
157165
'meilisearch_backup_local_retention',
158166
'automatic_upgrades_enabled',
159167
'firewall_rules_external_providers_enabled',
168+
'grafana_domain',
169+
'singlestore_studio_domain',
170+
'singlestore_api_domain',
171+
'singlestore_license_key',
172+
'singlestore_root_password',
173+
'elasticsearch_default_users_password',
174+
'rabbitmq_erlang_cookie',
175+
'rabbitmq_admin_password',
176+
'metabase_domain',
177+
'metabase_database_password' ,
178+
'kibana_domain',
179+
'rabbitmq_management_domain',
160180
'site_id',
161181
])
162182
);
@@ -202,8 +222,6 @@ public function update(Cluster $cluster): Response
202222
'postgresql_version',
203223
'postgresql_backup_interval',
204224
'postgresql_backup_local_retention',
205-
'mariadb_toolkit_enabled',
206-
'mariadb_toolkit_scans_enabled',
207225
'bubblewrap_toolkit_enabled',
208226
'sync_toolkit_enabled',
209227
'automatic_borg_repositories_prune_enabled',
@@ -218,6 +236,18 @@ public function update(Cluster $cluster): Response
218236
'meilisearch_backup_local_retention',
219237
'automatic_upgrades_enabled',
220238
'firewall_rules_external_providers_enabled',
239+
'grafana_domain',
240+
'singlestore_studio_domain',
241+
'singlestore_api_domain',
242+
'singlestore_license_key',
243+
'singlestore_root_password',
244+
'elasticsearch_default_users_password',
245+
'rabbitmq_erlang_cookie',
246+
'rabbitmq_admin_password',
247+
'metabase_domain',
248+
'metabase_database_password' ,
249+
'kibana_domain',
250+
'rabbitmq_management_domain',
221251
'site_id',
222252
'customer_id',
223253
'id',
@@ -251,8 +281,6 @@ public function update(Cluster $cluster): Response
251281
'postgresql_version',
252282
'postgresql_backup_interval',
253283
'postgresql_backup_local_retention',
254-
'mariadb_toolkit_enabled',
255-
'mariadb_toolkit_scans_enabled',
256284
'bubblewrap_toolkit_enabled',
257285
'sync_toolkit_enabled',
258286
'automatic_borg_repositories_prune_enabled',
@@ -267,6 +295,18 @@ public function update(Cluster $cluster): Response
267295
'meilisearch_backup_local_retention',
268296
'automatic_upgrades_enabled',
269297
'firewall_rules_external_providers_enabled',
298+
'grafana_domain',
299+
'singlestore_studio_domain',
300+
'singlestore_api_domain',
301+
'singlestore_license_key',
302+
'singlestore_root_password',
303+
'elasticsearch_default_users_password',
304+
'rabbitmq_erlang_cookie',
305+
'rabbitmq_admin_password',
306+
'metabase_domain',
307+
'metabase_database_password' ,
308+
'kibana_domain',
309+
'rabbitmq_management_domain',
270310
'site_id',
271311
'customer_id',
272312
'id',

‎src/Models/Cluster.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -817,17 +817,17 @@ public function fromArray(array $data): self
817817
->setSiteId(Arr::get($data, 'site_id'))
818818
->setDescription(Arr::get($data, 'description'))
819819
->setGrafanaDomain(Arr::get($data, 'grafana_domain'))
820-
->setSingleStoreStudioDomain(Arr::get($data, 'single_store_studio_domain'))
821-
->setSingleStoreApiDomain(Arr::get($data, 'single_store_api_domain'))
822-
->setSingleStoreLicenseKey(Arr::get($data, 'single_store_license_key'))
823-
->setSingleStoreRootPassword(Arr::get($data, 'single_store_root_password'))
820+
->setSingleStoreStudioDomain(Arr::get($data, 'singlestore_studio_domain'))
821+
->setSingleStoreApiDomain(Arr::get($data, 'singlestore_api_domain'))
822+
->setSingleStoreLicenseKey(Arr::get($data, 'singlestore_license_key'))
823+
->setSingleStoreRootPassword(Arr::get($data, 'singlestore_root_password'))
824824
->setElasticsearchDefaultUsersPassword(Arr::get($data, 'elastisearch_default_users_password'))
825-
->setRabbitMqErlangCookie(Arr::get($data, 'rabbit_mq_erlang_cookie'))
826-
->setRabbitMqAdminPassword(Arr::get($data, 'rabbit_mq_admin_password'))
825+
->setRabbitMqErlangCookie(Arr::get($data, 'rabbitmq_erlang_cookie'))
826+
->setRabbitMqAdminPassword(Arr::get($data, 'rabbitmq_admin_password'))
827827
->setMetabaseDomain(Arr::get($data, 'metabase_domain'))
828828
->setMetabaseDatabasePassword(Arr::get($data, 'metabase_database_password'))
829829
->setKibanaDomain(Arr::get($data, 'kibana_domain'))
830-
->setRabbitMqManagementDomain(Arr::get($data, 'rabbit_mq_management_domain'))
830+
->setRabbitMqManagementDomain(Arr::get($data, 'rabbitmq_management_domain'))
831831
->setId(Arr::get($data, 'id'))
832832
->setCreatedAt(Arr::get($data, 'created_at'))
833833
->setUpdatedAt(Arr::get($data, 'updated_at'));
@@ -877,17 +877,17 @@ public function toArray(): array
877877
'firewall_rules_external_providers_enabled' => $this->getFirewallRulesExternalProvidersEnabled(),
878878
'site_id' => $this->getSiteId(),
879879
'grafana_domain' => $this->getGrafanaDomain(),
880-
'single_store_studio_domain' => $this->getSingleStoreStudioDomain(),
881-
'single_store_api_domain' => $this->getSingleStoreApiDomain(),
882-
'single_store_license_key' => $this->getSingleStoreLicenseKey(),
883-
'single_store_root_password' => $this->getSingleStoreRootPassword(),
880+
'singlestore_studio_domain' => $this->getSingleStoreStudioDomain(),
881+
'singlestore_api_domain' => $this->getSingleStoreApiDomain(),
882+
'singlestore_license_key' => $this->getSingleStoreLicenseKey(),
883+
'singlestore_root_password' => $this->getSingleStoreRootPassword(),
884884
'elasticsearch_default_users_password' => $this->getElasticsearchDefaultUsersPassword(),
885-
'rabbit_mq_erlang_cookie' => $this->getRabbitMqErlangCookie(),
886-
'rabbit_mq_admin_password' => $this->getRabbitMqAdminPassword(),
885+
'rabbitmq_erlang_cookie' => $this->getRabbitMqErlangCookie(),
886+
'rabbitmq_admin_password' => $this->getRabbitMqAdminPassword(),
887887
'metabase_domain' => $this->getMetabaseDomain(),
888888
'metabase_database_password' => $this->getMetabaseDatabasePassword(),
889889
'kibana_domain' => $this->getKibanaDomain(),
890-
'rabbit_mq_management_domain' => $this->getRabbitMqManagementDomain(),
890+
'rabbitmq_management_domain' => $this->getRabbitMqManagementDomain(),
891891
'id' => $this->getId(),
892892
'created_at' => $this->getCreatedAt(),
893893
'updated_at' => $this->getUpdatedAt(),

0 commit comments

Comments
 (0)