From b0c26b876a28018fc9a6129e5555cc84bc2a59ab Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Wed, 26 Oct 2022 12:32:16 +0000 Subject: [PATCH 01/14] add providers migration --- selfprivacy_api/migrations/providers.py | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 selfprivacy_api/migrations/providers.py diff --git a/selfprivacy_api/migrations/providers.py b/selfprivacy_api/migrations/providers.py new file mode 100644 index 0000000..c565569 --- /dev/null +++ b/selfprivacy_api/migrations/providers.py @@ -0,0 +1,43 @@ +from selfprivacy_api.migrations.migration import Migration +from selfprivacy_api.utils import ReadUserData, WriteUserData + + +class CreateProviderFields(Migration): + """Unhardcode providers""" + + def get_migration_name(self): + return "create_provider_fields" + + def get_migration_description(self): + return "Add DNS, backup and server provider fields to enable user to choose between different clouds and to make the deployment adapt to these preferences." + + def is_migration_needed(self): + try: + with ReadUserData() as userdata: + return "dns" not in userdata + except Exception as e: + print(e) + return False + + def migrate(self): + # Write info about providers to userdata.json + try: + with WriteUserData() as userdata: + userdata["dns"] = { + "provider": "CLOUDFLARE", + "apiToken": userdata["cloudflare"]["apiToken"], + } + userdata["server"] = { + "provider": "HETZNER", + } + userdata["backup"] = { + "provider": "BACKBLAZE", + "accountId": userdata["backblaze"]["accountId"], + "accountKey": userdata["backblaze"]["accountKey"], + "bucket": userdata["backblaze"]["bucket"], + } + + print("Done") + except Exception as e: + print(e) + print("Error migrating provider fields") From decb98afe27e0e07cdc84e89687a21ef9b3b4ade Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 10:17:57 +0000 Subject: [PATCH 02/14] add providers.py to the list of migrations Makes providers.py actually run. --- selfprivacy_api/migrations/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfprivacy_api/migrations/__init__.py b/selfprivacy_api/migrations/__init__.py index b051f04..7385548 100644 --- a/selfprivacy_api/migrations/__init__.py +++ b/selfprivacy_api/migrations/__init__.py @@ -18,6 +18,7 @@ from selfprivacy_api.migrations.migrate_to_selfprivacy_channel import ( MigrateToSelfprivacyChannel, ) from selfprivacy_api.migrations.mount_volume import MountVolume +from selfprivacy_api.migrations.providers import CreateProviderFields migrations = [ FixNixosConfigBranch(), @@ -25,6 +26,7 @@ migrations = [ MigrateToSelfprivacyChannel(), MountVolume(), CheckForFailedBindsMigration(), + CreateProviderFields(), ] From 7d58eb3d928d85bd240bc12077679ec908257fa7 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 11:29:07 +0000 Subject: [PATCH 03/14] fix wrong cloudflare field key --- selfprivacy_api/migrations/providers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfprivacy_api/migrations/providers.py b/selfprivacy_api/migrations/providers.py index c565569..2cd5d5e 100644 --- a/selfprivacy_api/migrations/providers.py +++ b/selfprivacy_api/migrations/providers.py @@ -25,7 +25,7 @@ class CreateProviderFields(Migration): with WriteUserData() as userdata: userdata["dns"] = { "provider": "CLOUDFLARE", - "apiToken": userdata["cloudflare"]["apiToken"], + "apiKey": userdata["cloudflare"]["apiKey"], } userdata["server"] = { "provider": "HETZNER", From 9540e26ce1dc9c6a840321c35f9a5b7da9ca443b Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 11:55:21 +0000 Subject: [PATCH 04/14] add digitalocean and backblaze options --- selfprivacy_api/graphql/queries/providers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/selfprivacy_api/graphql/queries/providers.py b/selfprivacy_api/graphql/queries/providers.py index 6d0381e..eba8df9 100644 --- a/selfprivacy_api/graphql/queries/providers.py +++ b/selfprivacy_api/graphql/queries/providers.py @@ -11,3 +11,9 @@ class DnsProvider(Enum): @strawberry.enum class ServerProvider(Enum): HETZNER = "HETZNER" + DIGITALOCEAN = "DIGITALOCEAN" + + +@strawberry.enum +class BackupProvider(Enum): + BACKBLAZE = "BACKBLAZE" From dd15e0ab658f1587ecc4ded2344891b1db404980 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 12:34:58 +0000 Subject: [PATCH 05/14] reroute dns provider query --- selfprivacy_api/graphql/queries/system.py | 2 +- tests/test_graphql/test_system/turned_on.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/selfprivacy_api/graphql/queries/system.py b/selfprivacy_api/graphql/queries/system.py index 0e2a7ec..6e681be 100644 --- a/selfprivacy_api/graphql/queries/system.py +++ b/selfprivacy_api/graphql/queries/system.py @@ -44,7 +44,7 @@ def get_system_domain_info() -> SystemDomainInfo: return SystemDomainInfo( domain=user_data["domain"], hostname=user_data["hostname"], - provider=DnsProvider.CLOUDFLARE, + provider=user_data["dns"]["provider"], ) diff --git a/tests/test_graphql/test_system/turned_on.json b/tests/test_graphql/test_system/turned_on.json index 821875b..7ad32c7 100644 --- a/tests/test_graphql/test_system/turned_on.json +++ b/tests/test_graphql/test_system/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -51,5 +48,9 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + } } From 2ec0548c0927ecd91f8391c8ef97b0a02c9a7133 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 12:45:19 +0000 Subject: [PATCH 06/14] add provider fields to the test jsons under system --- tests/test_graphql/test_system/no_values.json | 15 ++++++++++++++- tests/test_graphql/test_system/turned_off.json | 15 ++++++++++++++- tests/test_graphql/test_system/turned_on.json | 9 +++++++++ tests/test_graphql/test_system/undefined.json | 15 ++++++++++++++- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/tests/test_graphql/test_system/no_values.json b/tests/test_graphql/test_system/no_values.json index 59e5e71..b903fea 100644 --- a/tests/test_graphql/test_system/no_values.json +++ b/tests/test_graphql/test_system/no_values.json @@ -46,5 +46,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_system/turned_off.json b/tests/test_graphql/test_system/turned_off.json index f451683..13c7556 100644 --- a/tests/test_graphql/test_system/turned_off.json +++ b/tests/test_graphql/test_system/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_system/turned_on.json b/tests/test_graphql/test_system/turned_on.json index 7ad32c7..d2b83b6 100644 --- a/tests/test_graphql/test_system/turned_on.json +++ b/tests/test_graphql/test_system/turned_on.json @@ -52,5 +52,14 @@ "dns": { "provider": "CLOUDFLARE", "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" } } diff --git a/tests/test_graphql/test_system/undefined.json b/tests/test_graphql/test_system/undefined.json index b67b296..69ff97c 100644 --- a/tests/test_graphql/test_system/undefined.json +++ b/tests/test_graphql/test_system/undefined.json @@ -43,5 +43,18 @@ }, "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file From f4a7986cfad3ee6ff45634dc9d3efd3accdf286e Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 12:54:48 +0000 Subject: [PATCH 07/14] Remove old cloudflare apiKey field from system test jsons Strangely, no test were broken. Probably more testing is needed for token-dependent methods. --- tests/test_graphql/test_system/no_values.json | 5 +---- tests/test_graphql/test_system/turned_off.json | 5 +---- tests/test_graphql/test_system/undefined.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/test_graphql/test_system/no_values.json b/tests/test_graphql/test_system/no_values.json index b903fea..e888ae2 100644 --- a/tests/test_graphql/test_system/no_values.json +++ b/tests/test_graphql/test_system/no_values.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -60,4 +57,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_system/turned_off.json b/tests/test_graphql/test_system/turned_off.json index 13c7556..c490a4c 100644 --- a/tests/test_graphql/test_system/turned_off.json +++ b/tests/test_graphql/test_system/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -62,4 +59,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_system/undefined.json b/tests/test_graphql/test_system/undefined.json index 69ff97c..11dacd7 100644 --- a/tests/test_graphql/test_system/undefined.json +++ b/tests/test_graphql/test_system/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -57,4 +54,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} From 5efa85f877ae6ddfe004ff89e106785124afb987 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 13:03:07 +0000 Subject: [PATCH 08/14] add provider fields to the rest of test jsons --- tests/test_graphql/test_ssh/some_users.json | 15 ++++++++++++++- tests/test_graphql/test_users/no_users.json | 15 ++++++++++++++- tests/test_graphql/test_users/one_user.json | 15 ++++++++++++++- tests/test_graphql/test_users/some_users.json | 15 ++++++++++++++- tests/test_graphql/test_users/undefined.json | 15 ++++++++++++++- 5 files changed, 70 insertions(+), 5 deletions(-) diff --git a/tests/test_graphql/test_ssh/some_users.json b/tests/test_graphql/test_ssh/some_users.json index 569253a..987c64f 100644 --- a/tests/test_graphql/test_ssh/some_users.json +++ b/tests/test_graphql/test_ssh/some_users.json @@ -67,5 +67,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_users/no_users.json b/tests/test_graphql/test_users/no_users.json index e5efe86..f205be3 100644 --- a/tests/test_graphql/test_users/no_users.json +++ b/tests/test_graphql/test_users/no_users.json @@ -50,5 +50,18 @@ "ssh-rsa KEY test@pc" ], "users": [ - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_users/one_user.json b/tests/test_graphql/test_users/one_user.json index 5df2108..3edaaa3 100644 --- a/tests/test_graphql/test_users/one_user.json +++ b/tests/test_graphql/test_users/one_user.json @@ -57,5 +57,18 @@ "ssh-rsa KEY user1@pc" ] } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_users/some_users.json b/tests/test_graphql/test_users/some_users.json index 569253a..987c64f 100644 --- a/tests/test_graphql/test_users/some_users.json +++ b/tests/test_graphql/test_users/some_users.json @@ -67,5 +67,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_graphql/test_users/undefined.json b/tests/test_graphql/test_users/undefined.json index 7b2cf8b..90379a5 100644 --- a/tests/test_graphql/test_users/undefined.json +++ b/tests/test_graphql/test_users/undefined.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file From 2d7bc0f15465f07f6cb1c8e9e854a9f0003bae2f Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 13:08:22 +0000 Subject: [PATCH 09/14] remove cloudflare tokens from the rest of the test jsons. nobody seems to care --- tests/test_graphql/test_ssh/some_users.json | 5 +---- tests/test_graphql/test_users/no_users.json | 5 +---- tests/test_graphql/test_users/one_user.json | 5 +---- tests/test_graphql/test_users/some_users.json | 5 +---- tests/test_graphql/test_users/undefined.json | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tests/test_graphql/test_ssh/some_users.json b/tests/test_graphql/test_ssh/some_users.json index 987c64f..2126748 100644 --- a/tests/test_graphql/test_ssh/some_users.json +++ b/tests/test_graphql/test_ssh/some_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -81,4 +78,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_users/no_users.json b/tests/test_graphql/test_users/no_users.json index f205be3..d37c257 100644 --- a/tests/test_graphql/test_users/no_users.json +++ b/tests/test_graphql/test_users/no_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -64,4 +61,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_users/one_user.json b/tests/test_graphql/test_users/one_user.json index 3edaaa3..a083273 100644 --- a/tests/test_graphql/test_users/one_user.json +++ b/tests/test_graphql/test_users/one_user.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -71,4 +68,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_users/some_users.json b/tests/test_graphql/test_users/some_users.json index 987c64f..2126748 100644 --- a/tests/test_graphql/test_users/some_users.json +++ b/tests/test_graphql/test_users/some_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -81,4 +78,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} diff --git a/tests/test_graphql/test_users/undefined.json b/tests/test_graphql/test_users/undefined.json index 90379a5..5bf053c 100644 --- a/tests/test_graphql/test_users/undefined.json +++ b/tests/test_graphql/test_users/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", @@ -62,4 +59,4 @@ "accountKey": "KEY", "bucket": "bucket" } -} \ No newline at end of file +} From 6c6f45781c34a7e504172881dd66404c9356c703 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Fri, 28 Oct 2022 13:32:33 +0000 Subject: [PATCH 10/14] add new fields to the rest of the test jsons. Missed some --- tests/test_block_device_utils/no_devices.json | 13 +++++++++++++ tests/test_block_device_utils/only_root.json | 15 ++++++++++++++- tests/test_block_device_utils/undefined.json | 15 ++++++++++++++- .../services/test_bitwarden/enable_undefined.json | 15 ++++++++++++++- .../services/test_bitwarden/turned_off.json | 15 ++++++++++++++- .../services/test_bitwarden/turned_on.json | 15 ++++++++++++++- .../services/test_bitwarden/undefined.json | 15 ++++++++++++++- .../services/test_gitea/enable_undefined.json | 15 ++++++++++++++- .../services/test_gitea/turned_off.json | 15 ++++++++++++++- .../services/test_gitea/turned_on.json | 15 ++++++++++++++- .../services/test_gitea/undefined.json | 15 ++++++++++++++- .../services/test_nextcloud/enable_undefined.json | 15 ++++++++++++++- .../services/test_nextcloud/turned_off.json | 15 ++++++++++++++- .../services/test_nextcloud/turned_on.json | 15 ++++++++++++++- .../services/test_nextcloud/undefined.json | 15 ++++++++++++++- .../services/test_ocserv/enable_undefined.json | 15 ++++++++++++++- .../services/test_ocserv/turned_off.json | 15 ++++++++++++++- .../services/test_ocserv/turned_on.json | 15 ++++++++++++++- .../services/test_ocserv/undefined.json | 15 ++++++++++++++- .../services/test_pleroma/enable_undefined.json | 15 ++++++++++++++- .../services/test_pleroma/turned_off.json | 15 ++++++++++++++- .../services/test_pleroma/turned_on.json | 15 ++++++++++++++- .../services/test_pleroma/undefined.json | 15 ++++++++++++++- .../services/test_restic/no_values.json | 15 ++++++++++++++- .../services/test_restic/some_values.json | 15 ++++++++++++++- .../services/test_restic/undefined.json | 15 ++++++++++++++- .../services/test_ssh/all_off.json | 15 ++++++++++++++- .../test_ssh/root_and_admin_have_keys.json | 15 ++++++++++++++- .../services/test_ssh/some_users.json | 15 ++++++++++++++- .../services/test_ssh/turned_off.json | 15 ++++++++++++++- .../services/test_ssh/turned_on.json | 15 ++++++++++++++- .../services/test_ssh/undefined.json | 15 ++++++++++++++- .../services/test_ssh/undefined_values.json | 15 ++++++++++++++- .../test_system/no_values.json | 15 ++++++++++++++- .../test_system/turned_off.json | 15 ++++++++++++++- .../test_system/turned_on.json | 15 ++++++++++++++- .../test_system/undefined.json | 15 ++++++++++++++- .../test_rest_endpoints/test_users/no_users.json | 15 ++++++++++++++- .../test_rest_endpoints/test_users/one_user.json | 15 ++++++++++++++- .../test_users/some_users.json | 15 ++++++++++++++- .../test_rest_endpoints/test_users/undefined.json | 15 ++++++++++++++- 41 files changed, 573 insertions(+), 40 deletions(-) diff --git a/tests/test_block_device_utils/no_devices.json b/tests/test_block_device_utils/no_devices.json index 97300ca..33280d9 100644 --- a/tests/test_block_device_utils/no_devices.json +++ b/tests/test_block_device_utils/no_devices.json @@ -49,6 +49,19 @@ "sshKeys": [ "ssh-rsa KEY test@pc" ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + }, "volumes": [ ] } diff --git a/tests/test_block_device_utils/only_root.json b/tests/test_block_device_utils/only_root.json index 0f8ec0d..7fee5b9 100644 --- a/tests/test_block_device_utils/only_root.json +++ b/tests/test_block_device_utils/only_root.json @@ -55,5 +55,18 @@ "mountPoint": "/volumes/sda1", "filesystem": "ext4" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } diff --git a/tests/test_block_device_utils/undefined.json b/tests/test_block_device_utils/undefined.json index eb660cc..9e600e2 100644 --- a/tests/test_block_device_utils/undefined.json +++ b/tests/test_block_device_utils/undefined.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } diff --git a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json index 05e04c1..f7a2c9b 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json @@ -47,5 +47,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json index 7b2cf8b..90379a5 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json index 337e47f..236f89f 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json index 625422b..9b5c2df 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json @@ -45,5 +45,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json index 07b0e78..5def931 100644 --- a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json @@ -47,5 +47,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_off.json b/tests/test_rest_endpoints/services/test_gitea/turned_off.json index 7b2cf8b..90379a5 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_off.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_on.json b/tests/test_rest_endpoints/services/test_gitea/turned_on.json index acb98ce..86690f5 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_on.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/undefined.json b/tests/test_rest_endpoints/services/test_gitea/undefined.json index f689b2e..dca3d0d 100644 --- a/tests/test_rest_endpoints/services/test_gitea/undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/undefined.json @@ -45,5 +45,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json index 68127f0..8352918 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json @@ -47,5 +47,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json index 375e70f..f115c1b 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json index 7b2cf8b..90379a5 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json index fb02c69..cd10bca 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json @@ -40,5 +40,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json index 88d804d..bce258b 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json @@ -47,5 +47,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json index 6220561..f03d3de 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json index 375e70f..f115c1b 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/undefined.json b/tests/test_rest_endpoints/services/test_ocserv/undefined.json index f7e21bf..7d0d05f 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/undefined.json @@ -45,5 +45,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json index 20ab960..cb06c64 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json @@ -47,5 +47,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json index b6d5fd6..c74e28d 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json index 6220561..f03d3de 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/undefined.json b/tests/test_rest_endpoints/services/test_pleroma/undefined.json index b909a95..325f2c4 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/undefined.json @@ -45,5 +45,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/no_values.json b/tests/test_rest_endpoints/services/test_restic/no_values.json index c1ef7a0..26a0196 100644 --- a/tests/test_rest_endpoints/services/test_restic/no_values.json +++ b/tests/test_rest_endpoints/services/test_restic/no_values.json @@ -64,5 +64,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/some_values.json b/tests/test_rest_endpoints/services/test_restic/some_values.json index a7dbf39..67a235d 100644 --- a/tests/test_rest_endpoints/services/test_restic/some_values.json +++ b/tests/test_rest_endpoints/services/test_restic/some_values.json @@ -67,5 +67,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/undefined.json b/tests/test_rest_endpoints/services/test_restic/undefined.json index 59e42a0..0e26dd7 100644 --- a/tests/test_rest_endpoints/services/test_restic/undefined.json +++ b/tests/test_rest_endpoints/services/test_restic/undefined.json @@ -62,5 +62,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/all_off.json b/tests/test_rest_endpoints/services/test_ssh/all_off.json index e1b8510..dd50dc9 100644 --- a/tests/test_rest_endpoints/services/test_ssh/all_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/all_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json index 7b2cf8b..90379a5 100644 --- a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json +++ b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/some_users.json b/tests/test_rest_endpoints/services/test_ssh/some_users.json index 569253a..987c64f 100644 --- a/tests/test_rest_endpoints/services/test_ssh/some_users.json +++ b/tests/test_rest_endpoints/services/test_ssh/some_users.json @@ -67,5 +67,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_off.json b/tests/test_rest_endpoints/services/test_ssh/turned_off.json index b09395b..b73e817 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_off.json @@ -42,5 +42,18 @@ "enable": true, "allowReboot": true }, - "timezone": "Europe/Moscow" + "timezone": "Europe/Moscow", + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_on.json b/tests/test_rest_endpoints/services/test_ssh/turned_on.json index 44b28ce..c9ea835 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_on.json @@ -42,5 +42,18 @@ "enable": true, "allowReboot": true }, - "timezone": "Europe/Moscow" + "timezone": "Europe/Moscow", + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined.json b/tests/test_rest_endpoints/services/test_ssh/undefined.json index a214cc3..edb6a43 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined.json @@ -38,5 +38,18 @@ "enable": true, "allowReboot": true }, - "timezone": "Europe/Moscow" + "timezone": "Europe/Moscow", + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json index 235a220..40feec5 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json @@ -42,5 +42,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/no_values.json b/tests/test_rest_endpoints/test_system/no_values.json index 59e5e71..b903fea 100644 --- a/tests/test_rest_endpoints/test_system/no_values.json +++ b/tests/test_rest_endpoints/test_system/no_values.json @@ -46,5 +46,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/turned_off.json b/tests/test_rest_endpoints/test_system/turned_off.json index f451683..13c7556 100644 --- a/tests/test_rest_endpoints/test_system/turned_off.json +++ b/tests/test_rest_endpoints/test_system/turned_off.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/turned_on.json b/tests/test_rest_endpoints/test_system/turned_on.json index 337e47f..236f89f 100644 --- a/tests/test_rest_endpoints/test_system/turned_on.json +++ b/tests/test_rest_endpoints/test_system/turned_on.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/undefined.json b/tests/test_rest_endpoints/test_system/undefined.json index b67b296..69ff97c 100644 --- a/tests/test_rest_endpoints/test_system/undefined.json +++ b/tests/test_rest_endpoints/test_system/undefined.json @@ -43,5 +43,18 @@ }, "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/no_users.json b/tests/test_rest_endpoints/test_users/no_users.json index e5efe86..f205be3 100644 --- a/tests/test_rest_endpoints/test_users/no_users.json +++ b/tests/test_rest_endpoints/test_users/no_users.json @@ -50,5 +50,18 @@ "ssh-rsa KEY test@pc" ], "users": [ - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/one_user.json b/tests/test_rest_endpoints/test_users/one_user.json index 5df2108..3edaaa3 100644 --- a/tests/test_rest_endpoints/test_users/one_user.json +++ b/tests/test_rest_endpoints/test_users/one_user.json @@ -57,5 +57,18 @@ "ssh-rsa KEY user1@pc" ] } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/some_users.json b/tests/test_rest_endpoints/test_users/some_users.json index 569253a..987c64f 100644 --- a/tests/test_rest_endpoints/test_users/some_users.json +++ b/tests/test_rest_endpoints/test_users/some_users.json @@ -67,5 +67,18 @@ "username": "user3", "hashedPassword": "HASHED_PASSWORD_3" } - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/undefined.json b/tests/test_rest_endpoints/test_users/undefined.json index 7b2cf8b..90379a5 100644 --- a/tests/test_rest_endpoints/test_users/undefined.json +++ b/tests/test_rest_endpoints/test_users/undefined.json @@ -48,5 +48,18 @@ "timezone": "Europe/Moscow", "sshKeys": [ "ssh-rsa KEY test@pc" - ] + ], + "dns": { + "provider": "CLOUDFLARE", + "apiKey": "TOKEN" + }, + "server": { + "provider": "HETZNER" + }, + "backup": { + "provider": "BACKBLAZE", + "accountId": "ID", + "accountKey": "KEY", + "bucket": "bucket" + } } \ No newline at end of file From 589093b853802883babcaadbadea62316a778d78 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 31 Oct 2022 10:13:53 +0000 Subject: [PATCH 11/14] delete old cloudflare field --- tests/test_block_device_utils/no_devices.json | 3 --- tests/test_block_device_utils/only_root.json | 3 --- tests/test_block_device_utils/undefined.json | 3 --- .../services/test_bitwarden/enable_undefined.json | 3 --- .../services/test_bitwarden/turned_off.json | 3 --- .../test_rest_endpoints/services/test_bitwarden/turned_on.json | 3 --- .../test_rest_endpoints/services/test_bitwarden/undefined.json | 3 --- .../services/test_gitea/enable_undefined.json | 3 --- tests/test_rest_endpoints/services/test_gitea/turned_off.json | 3 --- tests/test_rest_endpoints/services/test_gitea/turned_on.json | 3 --- tests/test_rest_endpoints/services/test_gitea/undefined.json | 3 --- .../services/test_nextcloud/enable_undefined.json | 3 --- .../services/test_nextcloud/turned_off.json | 3 --- .../test_rest_endpoints/services/test_nextcloud/turned_on.json | 3 --- .../test_rest_endpoints/services/test_nextcloud/undefined.json | 3 --- .../services/test_ocserv/enable_undefined.json | 3 --- tests/test_rest_endpoints/services/test_ocserv/turned_off.json | 3 --- tests/test_rest_endpoints/services/test_ocserv/turned_on.json | 3 --- tests/test_rest_endpoints/services/test_ocserv/undefined.json | 3 --- .../services/test_pleroma/enable_undefined.json | 3 --- .../test_rest_endpoints/services/test_pleroma/turned_off.json | 3 --- tests/test_rest_endpoints/services/test_pleroma/turned_on.json | 3 --- tests/test_rest_endpoints/services/test_pleroma/undefined.json | 3 --- tests/test_rest_endpoints/services/test_restic/no_values.json | 3 --- .../test_rest_endpoints/services/test_restic/some_values.json | 3 --- tests/test_rest_endpoints/services/test_restic/undefined.json | 3 --- tests/test_rest_endpoints/services/test_ssh/all_off.json | 3 --- .../services/test_ssh/root_and_admin_have_keys.json | 3 --- tests/test_rest_endpoints/services/test_ssh/some_users.json | 3 --- tests/test_rest_endpoints/services/test_ssh/turned_off.json | 3 --- tests/test_rest_endpoints/services/test_ssh/turned_on.json | 3 --- tests/test_rest_endpoints/services/test_ssh/undefined.json | 3 --- .../services/test_ssh/undefined_values.json | 3 --- tests/test_rest_endpoints/test_system/no_values.json | 3 --- tests/test_rest_endpoints/test_system/turned_off.json | 3 --- tests/test_rest_endpoints/test_system/turned_on.json | 3 --- tests/test_rest_endpoints/test_system/undefined.json | 3 --- tests/test_rest_endpoints/test_users/no_users.json | 3 --- tests/test_rest_endpoints/test_users/one_user.json | 3 --- tests/test_rest_endpoints/test_users/some_users.json | 3 --- tests/test_rest_endpoints/test_users/undefined.json | 3 --- 41 files changed, 123 deletions(-) diff --git a/tests/test_block_device_utils/no_devices.json b/tests/test_block_device_utils/no_devices.json index 33280d9..3949584 100644 --- a/tests/test_block_device_utils/no_devices.json +++ b/tests/test_block_device_utils/no_devices.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_block_device_utils/only_root.json b/tests/test_block_device_utils/only_root.json index 7fee5b9..5100fa8 100644 --- a/tests/test_block_device_utils/only_root.json +++ b/tests/test_block_device_utils/only_root.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_block_device_utils/undefined.json b/tests/test_block_device_utils/undefined.json index 9e600e2..426ae52 100644 --- a/tests/test_block_device_utils/undefined.json +++ b/tests/test_block_device_utils/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json index f7a2c9b..63fef0e 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json @@ -10,9 +10,6 @@ }, "bitwarden": { }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json index 90379a5..3d4a8b3 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json index 236f89f..26fc041 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json index 9b5c2df..a2d398a 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json @@ -8,9 +8,6 @@ "token": "TEST_TOKEN", "enableSwagger": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json index 5def931..6dcc74f 100644 --- a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_off.json b/tests/test_rest_endpoints/services/test_gitea/turned_off.json index 90379a5..3d4a8b3 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_off.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_on.json b/tests/test_rest_endpoints/services/test_gitea/turned_on.json index 86690f5..94ba2b9 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_on.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_gitea/undefined.json b/tests/test_rest_endpoints/services/test_gitea/undefined.json index dca3d0d..93fb946 100644 --- a/tests/test_rest_endpoints/services/test_gitea/undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json index 8352918..e9b22e1 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json index f115c1b..4e3114f 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json index 90379a5..3d4a8b3 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json index cd10bca..5b49e74 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json @@ -8,9 +8,6 @@ "token": "TEST_TOKEN", "enableSwagger": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json index bce258b..b5e2108 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json index f03d3de..7bdef4a 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json index f115c1b..4e3114f 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ocserv/undefined.json b/tests/test_rest_endpoints/services/test_ocserv/undefined.json index 7d0d05f..1d64a84 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json index cb06c64..3d88cd4 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json index c74e28d..6a6a18e 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json index f03d3de..7bdef4a 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_pleroma/undefined.json b/tests/test_rest_endpoints/services/test_pleroma/undefined.json index 325f2c4..fe994a0 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_restic/no_values.json b/tests/test_rest_endpoints/services/test_restic/no_values.json index 26a0196..75c0122 100644 --- a/tests/test_rest_endpoints/services/test_restic/no_values.json +++ b/tests/test_rest_endpoints/services/test_restic/no_values.json @@ -8,9 +8,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_restic/some_values.json b/tests/test_rest_endpoints/services/test_restic/some_values.json index 67a235d..1f9042b 100644 --- a/tests/test_rest_endpoints/services/test_restic/some_values.json +++ b/tests/test_rest_endpoints/services/test_restic/some_values.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_restic/undefined.json b/tests/test_rest_endpoints/services/test_restic/undefined.json index 0e26dd7..52ab6bb 100644 --- a/tests/test_rest_endpoints/services/test_restic/undefined.json +++ b/tests/test_rest_endpoints/services/test_restic/undefined.json @@ -6,9 +6,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/all_off.json b/tests/test_rest_endpoints/services/test_ssh/all_off.json index dd50dc9..862270c 100644 --- a/tests/test_rest_endpoints/services/test_ssh/all_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/all_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json index 90379a5..3d4a8b3 100644 --- a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json +++ b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/some_users.json b/tests/test_rest_endpoints/services/test_ssh/some_users.json index 987c64f..62c2919 100644 --- a/tests/test_rest_endpoints/services/test_ssh/some_users.json +++ b/tests/test_rest_endpoints/services/test_ssh/some_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_off.json b/tests/test_rest_endpoints/services/test_ssh/turned_off.json index b73e817..7b5ab1b 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_on.json b/tests/test_rest_endpoints/services/test_ssh/turned_on.json index c9ea835..cb7761c 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined.json b/tests/test_rest_endpoints/services/test_ssh/undefined.json index edb6a43..db3a227 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json index 40feec5..8c36f13 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_system/no_values.json b/tests/test_rest_endpoints/test_system/no_values.json index b903fea..de42ac6 100644 --- a/tests/test_rest_endpoints/test_system/no_values.json +++ b/tests/test_rest_endpoints/test_system/no_values.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_system/turned_off.json b/tests/test_rest_endpoints/test_system/turned_off.json index 13c7556..a8f1d90 100644 --- a/tests/test_rest_endpoints/test_system/turned_off.json +++ b/tests/test_rest_endpoints/test_system/turned_off.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_system/turned_on.json b/tests/test_rest_endpoints/test_system/turned_on.json index 236f89f..26fc041 100644 --- a/tests/test_rest_endpoints/test_system/turned_on.json +++ b/tests/test_rest_endpoints/test_system/turned_on.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_system/undefined.json b/tests/test_rest_endpoints/test_system/undefined.json index 69ff97c..c4d9382 100644 --- a/tests/test_rest_endpoints/test_system/undefined.json +++ b/tests/test_rest_endpoints/test_system/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": true }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_users/no_users.json b/tests/test_rest_endpoints/test_users/no_users.json index f205be3..f52956a 100644 --- a/tests/test_rest_endpoints/test_users/no_users.json +++ b/tests/test_rest_endpoints/test_users/no_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_users/one_user.json b/tests/test_rest_endpoints/test_users/one_user.json index 3edaaa3..98e60f6 100644 --- a/tests/test_rest_endpoints/test_users/one_user.json +++ b/tests/test_rest_endpoints/test_users/one_user.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_users/some_users.json b/tests/test_rest_endpoints/test_users/some_users.json index 987c64f..62c2919 100644 --- a/tests/test_rest_endpoints/test_users/some_users.json +++ b/tests/test_rest_endpoints/test_users/some_users.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", diff --git a/tests/test_rest_endpoints/test_users/undefined.json b/tests/test_rest_endpoints/test_users/undefined.json index 90379a5..3d4a8b3 100644 --- a/tests/test_rest_endpoints/test_users/undefined.json +++ b/tests/test_rest_endpoints/test_users/undefined.json @@ -11,9 +11,6 @@ "bitwarden": { "enable": false }, - "cloudflare": { - "apiKey": "TOKEN" - }, "databasePassword": "PASSWORD", "domain": "test.tld", "hashedMasterPassword": "HASHED_PASSWORD", From a723311b36c0ddb4647f4c412aa9d510b93a83b9 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 31 Oct 2022 10:52:38 +0000 Subject: [PATCH 12/14] reroute system provider query --- selfprivacy_api/graphql/queries/system.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/selfprivacy_api/graphql/queries/system.py b/selfprivacy_api/graphql/queries/system.py index 6e681be..112fa8c 100644 --- a/selfprivacy_api/graphql/queries/system.py +++ b/selfprivacy_api/graphql/queries/system.py @@ -133,7 +133,11 @@ class SystemProviderInfo: def get_system_provider_info() -> SystemProviderInfo: """Get system provider info""" - return SystemProviderInfo(provider=ServerProvider.HETZNER, id="UNKNOWN") + with ReadUserData() as user_data: + return SystemProviderInfo( + provider=user_data["server"]["provider"], + id="UNKNOWN" + ) @strawberry.type From 07af2e59bef34d98cab12f48c8ba509763f72b62 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 31 Oct 2022 10:59:46 +0000 Subject: [PATCH 13/14] tests: fix backblaze bucket --- tests/test_block_device_utils/no_devices.json | 2 +- tests/test_block_device_utils/only_root.json | 2 +- tests/test_block_device_utils/undefined.json | 2 +- tests/test_graphql/test_ssh/some_users.json | 2 +- tests/test_graphql/test_system/no_values.json | 2 +- tests/test_graphql/test_system/turned_off.json | 2 +- tests/test_graphql/test_system/turned_on.json | 2 +- tests/test_graphql/test_system/undefined.json | 2 +- tests/test_graphql/test_users/no_users.json | 2 +- tests/test_graphql/test_users/one_user.json | 2 +- tests/test_graphql/test_users/some_users.json | 2 +- tests/test_graphql/test_users/undefined.json | 2 +- .../services/test_bitwarden/enable_undefined.json | 2 +- .../test_rest_endpoints/services/test_bitwarden/turned_off.json | 2 +- .../test_rest_endpoints/services/test_bitwarden/turned_on.json | 2 +- .../test_rest_endpoints/services/test_bitwarden/undefined.json | 2 +- .../services/test_gitea/enable_undefined.json | 2 +- tests/test_rest_endpoints/services/test_gitea/turned_off.json | 2 +- tests/test_rest_endpoints/services/test_gitea/turned_on.json | 2 +- tests/test_rest_endpoints/services/test_gitea/undefined.json | 2 +- .../services/test_nextcloud/enable_undefined.json | 2 +- .../test_rest_endpoints/services/test_nextcloud/turned_off.json | 2 +- .../test_rest_endpoints/services/test_nextcloud/turned_on.json | 2 +- .../test_rest_endpoints/services/test_nextcloud/undefined.json | 2 +- .../services/test_ocserv/enable_undefined.json | 2 +- tests/test_rest_endpoints/services/test_ocserv/turned_off.json | 2 +- tests/test_rest_endpoints/services/test_ocserv/turned_on.json | 2 +- tests/test_rest_endpoints/services/test_ocserv/undefined.json | 2 +- .../services/test_pleroma/enable_undefined.json | 2 +- tests/test_rest_endpoints/services/test_pleroma/turned_off.json | 2 +- tests/test_rest_endpoints/services/test_pleroma/turned_on.json | 2 +- tests/test_rest_endpoints/services/test_pleroma/undefined.json | 2 +- tests/test_rest_endpoints/services/test_restic/no_values.json | 2 +- tests/test_rest_endpoints/services/test_restic/some_values.json | 2 +- tests/test_rest_endpoints/services/test_restic/undefined.json | 2 +- tests/test_rest_endpoints/services/test_ssh/all_off.json | 2 +- .../services/test_ssh/root_and_admin_have_keys.json | 2 +- tests/test_rest_endpoints/services/test_ssh/some_users.json | 2 +- tests/test_rest_endpoints/services/test_ssh/turned_off.json | 2 +- tests/test_rest_endpoints/services/test_ssh/turned_on.json | 2 +- tests/test_rest_endpoints/services/test_ssh/undefined.json | 2 +- .../test_rest_endpoints/services/test_ssh/undefined_values.json | 2 +- tests/test_rest_endpoints/test_system/no_values.json | 2 +- tests/test_rest_endpoints/test_system/turned_off.json | 2 +- tests/test_rest_endpoints/test_system/turned_on.json | 2 +- tests/test_rest_endpoints/test_system/undefined.json | 2 +- tests/test_rest_endpoints/test_users/no_users.json | 2 +- tests/test_rest_endpoints/test_users/one_user.json | 2 +- tests/test_rest_endpoints/test_users/some_users.json | 2 +- tests/test_rest_endpoints/test_users/undefined.json | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/test_block_device_utils/no_devices.json b/tests/test_block_device_utils/no_devices.json index 3949584..0918cd8 100644 --- a/tests/test_block_device_utils/no_devices.json +++ b/tests/test_block_device_utils/no_devices.json @@ -57,7 +57,7 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" }, "volumes": [ ] diff --git a/tests/test_block_device_utils/only_root.json b/tests/test_block_device_utils/only_root.json index 5100fa8..9c064c0 100644 --- a/tests/test_block_device_utils/only_root.json +++ b/tests/test_block_device_utils/only_root.json @@ -64,6 +64,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_block_device_utils/undefined.json b/tests/test_block_device_utils/undefined.json index 426ae52..e764ebc 100644 --- a/tests/test_block_device_utils/undefined.json +++ b/tests/test_block_device_utils/undefined.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_ssh/some_users.json b/tests/test_graphql/test_ssh/some_users.json index 2126748..6bc3525 100644 --- a/tests/test_graphql/test_ssh/some_users.json +++ b/tests/test_graphql/test_ssh/some_users.json @@ -76,6 +76,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_system/no_values.json b/tests/test_graphql/test_system/no_values.json index e888ae2..110c762 100644 --- a/tests/test_graphql/test_system/no_values.json +++ b/tests/test_graphql/test_system/no_values.json @@ -55,6 +55,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_system/turned_off.json b/tests/test_graphql/test_system/turned_off.json index c490a4c..3fdbb8a 100644 --- a/tests/test_graphql/test_system/turned_off.json +++ b/tests/test_graphql/test_system/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_system/turned_on.json b/tests/test_graphql/test_system/turned_on.json index d2b83b6..ab1723f 100644 --- a/tests/test_graphql/test_system/turned_on.json +++ b/tests/test_graphql/test_system/turned_on.json @@ -60,6 +60,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_system/undefined.json b/tests/test_graphql/test_system/undefined.json index 11dacd7..1720527 100644 --- a/tests/test_graphql/test_system/undefined.json +++ b/tests/test_graphql/test_system/undefined.json @@ -52,6 +52,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_users/no_users.json b/tests/test_graphql/test_users/no_users.json index d37c257..27207fb 100644 --- a/tests/test_graphql/test_users/no_users.json +++ b/tests/test_graphql/test_users/no_users.json @@ -59,6 +59,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_users/one_user.json b/tests/test_graphql/test_users/one_user.json index a083273..bd3efc8 100644 --- a/tests/test_graphql/test_users/one_user.json +++ b/tests/test_graphql/test_users/one_user.json @@ -66,6 +66,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_users/some_users.json b/tests/test_graphql/test_users/some_users.json index 2126748..6bc3525 100644 --- a/tests/test_graphql/test_users/some_users.json +++ b/tests/test_graphql/test_users/some_users.json @@ -76,6 +76,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_graphql/test_users/undefined.json b/tests/test_graphql/test_users/undefined.json index 5bf053c..f0826c4 100644 --- a/tests/test_graphql/test_users/undefined.json +++ b/tests/test_graphql/test_users/undefined.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } diff --git a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json index 63fef0e..e359a16 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json @@ -56,6 +56,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json index 3d4a8b3..fcad1f5 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json index 26fc041..7ad9081 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json index a2d398a..1deab31 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json @@ -54,6 +54,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json index 6dcc74f..fd67d96 100644 --- a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json @@ -56,6 +56,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_off.json b/tests/test_rest_endpoints/services/test_gitea/turned_off.json index 3d4a8b3..fcad1f5 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_off.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_on.json b/tests/test_rest_endpoints/services/test_gitea/turned_on.json index 94ba2b9..50ce50b 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_on.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_gitea/undefined.json b/tests/test_rest_endpoints/services/test_gitea/undefined.json index 93fb946..d6187cc 100644 --- a/tests/test_rest_endpoints/services/test_gitea/undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/undefined.json @@ -54,6 +54,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json index e9b22e1..8f00842 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json @@ -56,6 +56,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json index 4e3114f..8b6f466 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json index 3d4a8b3..fcad1f5 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json index 5b49e74..dd13c56 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json @@ -49,6 +49,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json index b5e2108..a509d77 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json @@ -56,6 +56,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json index 7bdef4a..8542a7c 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json index 4e3114f..8b6f466 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ocserv/undefined.json b/tests/test_rest_endpoints/services/test_ocserv/undefined.json index 1d64a84..7ffae11 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/undefined.json @@ -54,6 +54,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json index 3d88cd4..5d359c2 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json @@ -56,6 +56,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json index 6a6a18e..74bfb7c 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json index 7bdef4a..8542a7c 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_pleroma/undefined.json b/tests/test_rest_endpoints/services/test_pleroma/undefined.json index fe994a0..dcfe1e1 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/undefined.json @@ -54,6 +54,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/no_values.json b/tests/test_rest_endpoints/services/test_restic/no_values.json index 75c0122..0a8a0a0 100644 --- a/tests/test_rest_endpoints/services/test_restic/no_values.json +++ b/tests/test_rest_endpoints/services/test_restic/no_values.json @@ -73,6 +73,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/some_values.json b/tests/test_rest_endpoints/services/test_restic/some_values.json index 1f9042b..aa3a19f 100644 --- a/tests/test_rest_endpoints/services/test_restic/some_values.json +++ b/tests/test_rest_endpoints/services/test_restic/some_values.json @@ -76,6 +76,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/undefined.json b/tests/test_rest_endpoints/services/test_restic/undefined.json index 52ab6bb..df6380a 100644 --- a/tests/test_rest_endpoints/services/test_restic/undefined.json +++ b/tests/test_rest_endpoints/services/test_restic/undefined.json @@ -71,6 +71,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/all_off.json b/tests/test_rest_endpoints/services/test_ssh/all_off.json index 862270c..97d7690 100644 --- a/tests/test_rest_endpoints/services/test_ssh/all_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/all_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json index 3d4a8b3..fcad1f5 100644 --- a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json +++ b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/some_users.json b/tests/test_rest_endpoints/services/test_ssh/some_users.json index 62c2919..0706d9e 100644 --- a/tests/test_rest_endpoints/services/test_ssh/some_users.json +++ b/tests/test_rest_endpoints/services/test_ssh/some_users.json @@ -76,6 +76,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_off.json b/tests/test_rest_endpoints/services/test_ssh/turned_off.json index 7b5ab1b..92b2196 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_off.json @@ -51,6 +51,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_on.json b/tests/test_rest_endpoints/services/test_ssh/turned_on.json index cb7761c..7434d16 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_on.json @@ -51,6 +51,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined.json b/tests/test_rest_endpoints/services/test_ssh/undefined.json index db3a227..290b396 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined.json @@ -47,6 +47,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json index 8c36f13..a570880 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json @@ -51,6 +51,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/no_values.json b/tests/test_rest_endpoints/test_system/no_values.json index de42ac6..442b62d 100644 --- a/tests/test_rest_endpoints/test_system/no_values.json +++ b/tests/test_rest_endpoints/test_system/no_values.json @@ -55,6 +55,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/turned_off.json b/tests/test_rest_endpoints/test_system/turned_off.json index a8f1d90..3a4a238 100644 --- a/tests/test_rest_endpoints/test_system/turned_off.json +++ b/tests/test_rest_endpoints/test_system/turned_off.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/turned_on.json b/tests/test_rest_endpoints/test_system/turned_on.json index 26fc041..7ad9081 100644 --- a/tests/test_rest_endpoints/test_system/turned_on.json +++ b/tests/test_rest_endpoints/test_system/turned_on.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_system/undefined.json b/tests/test_rest_endpoints/test_system/undefined.json index c4d9382..fd1efad 100644 --- a/tests/test_rest_endpoints/test_system/undefined.json +++ b/tests/test_rest_endpoints/test_system/undefined.json @@ -52,6 +52,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/no_users.json b/tests/test_rest_endpoints/test_users/no_users.json index f52956a..dadb584 100644 --- a/tests/test_rest_endpoints/test_users/no_users.json +++ b/tests/test_rest_endpoints/test_users/no_users.json @@ -59,6 +59,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/one_user.json b/tests/test_rest_endpoints/test_users/one_user.json index 98e60f6..71d6338 100644 --- a/tests/test_rest_endpoints/test_users/one_user.json +++ b/tests/test_rest_endpoints/test_users/one_user.json @@ -66,6 +66,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/some_users.json b/tests/test_rest_endpoints/test_users/some_users.json index 62c2919..0706d9e 100644 --- a/tests/test_rest_endpoints/test_users/some_users.json +++ b/tests/test_rest_endpoints/test_users/some_users.json @@ -76,6 +76,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/test_users/undefined.json b/tests/test_rest_endpoints/test_users/undefined.json index 3d4a8b3..fcad1f5 100644 --- a/tests/test_rest_endpoints/test_users/undefined.json +++ b/tests/test_rest_endpoints/test_users/undefined.json @@ -57,6 +57,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "bucket" + "bucket": "selfprivacy" } } \ No newline at end of file From 41e5f89b7b320d21f881bccc2e4b050672ee34d5 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Mon, 31 Oct 2022 13:32:17 +0000 Subject: [PATCH 14/14] migrate backblaze settings to new json format And adjust methods and tests --- selfprivacy_api/rest/services.py | 17 ++++++----- tests/test_block_device_utils/no_devices.json | 5 ---- tests/test_block_device_utils/only_root.json | 5 ---- tests/test_block_device_utils/undefined.json | 5 ---- tests/test_graphql/test_ssh/some_users.json | 5 ---- tests/test_graphql/test_system/no_values.json | 5 ---- .../test_graphql/test_system/turned_off.json | 5 ---- tests/test_graphql/test_system/turned_on.json | 5 ---- tests/test_graphql/test_system/undefined.json | 5 ---- tests/test_graphql/test_users/no_users.json | 5 ---- tests/test_graphql/test_users/one_user.json | 5 ---- tests/test_graphql/test_users/some_users.json | 5 ---- tests/test_graphql/test_users/undefined.json | 5 ---- .../test_bitwarden/enable_undefined.json | 5 ---- .../services/test_bitwarden/turned_off.json | 5 ---- .../services/test_bitwarden/turned_on.json | 5 ---- .../services/test_bitwarden/undefined.json | 5 ---- .../services/test_gitea/enable_undefined.json | 5 ---- .../services/test_gitea/turned_off.json | 5 ---- .../services/test_gitea/turned_on.json | 5 ---- .../services/test_gitea/undefined.json | 5 ---- .../test_nextcloud/enable_undefined.json | 5 ---- .../services/test_nextcloud/turned_off.json | 5 ---- .../services/test_nextcloud/turned_on.json | 5 ---- .../services/test_nextcloud/undefined.json | 5 ---- .../test_ocserv/enable_undefined.json | 5 ---- .../services/test_ocserv/turned_off.json | 5 ---- .../services/test_ocserv/turned_on.json | 5 ---- .../services/test_ocserv/undefined.json | 5 ---- .../test_pleroma/enable_undefined.json | 5 ---- .../services/test_pleroma/turned_off.json | 5 ---- .../services/test_pleroma/turned_on.json | 5 ---- .../services/test_pleroma/undefined.json | 5 ---- .../services/test_restic.py | 29 +++++++++++-------- .../services/test_restic/no_values.json | 6 ---- .../services/test_restic/some_values.json | 9 ++---- .../services/test_restic/undefined.json | 6 ---- .../services/test_ssh/all_off.json | 5 ---- .../test_ssh/root_and_admin_have_keys.json | 5 ---- .../services/test_ssh/some_users.json | 5 ---- .../services/test_ssh/turned_off.json | 5 ---- .../services/test_ssh/turned_on.json | 5 ---- .../services/test_ssh/undefined.json | 5 ---- .../services/test_ssh/undefined_values.json | 5 ---- .../test_system/no_values.json | 5 ---- .../test_system/turned_off.json | 5 ---- .../test_system/turned_on.json | 5 ---- .../test_system/undefined.json | 5 ---- .../test_users/no_users.json | 5 ---- .../test_users/one_user.json | 5 ---- .../test_users/some_users.json | 5 ---- .../test_users/undefined.json | 5 ---- 52 files changed, 28 insertions(+), 274 deletions(-) diff --git a/selfprivacy_api/rest/services.py b/selfprivacy_api/rest/services.py index c9d5ff9..ca2bc9b 100644 --- a/selfprivacy_api/rest/services.py +++ b/selfprivacy_api/rest/services.py @@ -257,24 +257,25 @@ async def restore_restic_backup(backup: BackupRestoreInput): raise HTTPException(status_code=404, detail="Backup not found") -class BackblazeConfigInput(BaseModel): +class BackupConfigInput(BaseModel): accountId: str accountKey: str bucket: str @router.put("/restic/backblaze/config") -async def set_backblaze_config(backblaze_config: BackblazeConfigInput): +async def set_backblaze_config(backup_config: BackupConfigInput): with WriteUserData() as data: - if "backblaze" not in data: - data["backblaze"] = {} - data["backblaze"]["accountId"] = backblaze_config.accountId - data["backblaze"]["accountKey"] = backblaze_config.accountKey - data["backblaze"]["bucket"] = backblaze_config.bucket + if "backup" not in data: + data["backup"] = {} + data["backup"]["provider"] = "BACKBLAZE" + data["backup"]["accountId"] = backup_config.accountId + data["backup"]["accountKey"] = backup_config.accountKey + data["backup"]["bucket"] = backup_config.bucket restic_tasks.update_keys_from_userdata() - return "New Backblaze settings saved" + return "New backup settings saved" @router.post("/ssh/enable") diff --git a/tests/test_block_device_utils/no_devices.json b/tests/test_block_device_utils/no_devices.json index 0918cd8..c395b21 100644 --- a/tests/test_block_device_utils/no_devices.json +++ b/tests/test_block_device_utils/no_devices.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_block_device_utils/only_root.json b/tests/test_block_device_utils/only_root.json index 9c064c0..1026ed0 100644 --- a/tests/test_block_device_utils/only_root.json +++ b/tests/test_block_device_utils/only_root.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_block_device_utils/undefined.json b/tests/test_block_device_utils/undefined.json index e764ebc..f5edda8 100644 --- a/tests/test_block_device_utils/undefined.json +++ b/tests/test_block_device_utils/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_ssh/some_users.json b/tests/test_graphql/test_ssh/some_users.json index 6bc3525..c02d216 100644 --- a/tests/test_graphql/test_ssh/some_users.json +++ b/tests/test_graphql/test_ssh/some_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_system/no_values.json b/tests/test_graphql/test_system/no_values.json index 110c762..779691f 100644 --- a/tests/test_graphql/test_system/no_values.json +++ b/tests/test_graphql/test_system/no_values.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_system/turned_off.json b/tests/test_graphql/test_system/turned_off.json index 3fdbb8a..5fc287c 100644 --- a/tests/test_graphql/test_system/turned_off.json +++ b/tests/test_graphql/test_system/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_system/turned_on.json b/tests/test_graphql/test_system/turned_on.json index ab1723f..c6b758b 100644 --- a/tests/test_graphql/test_system/turned_on.json +++ b/tests/test_graphql/test_system/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_system/undefined.json b/tests/test_graphql/test_system/undefined.json index 1720527..2e31fea 100644 --- a/tests/test_graphql/test_system/undefined.json +++ b/tests/test_graphql/test_system/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_users/no_users.json b/tests/test_graphql/test_users/no_users.json index 27207fb..a40fb88 100644 --- a/tests/test_graphql/test_users/no_users.json +++ b/tests/test_graphql/test_users/no_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_users/one_user.json b/tests/test_graphql/test_users/one_user.json index bd3efc8..7e1cced 100644 --- a/tests/test_graphql/test_users/one_user.json +++ b/tests/test_graphql/test_users/one_user.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_users/some_users.json b/tests/test_graphql/test_users/some_users.json index 6bc3525..c02d216 100644 --- a/tests/test_graphql/test_users/some_users.json +++ b/tests/test_graphql/test_users/some_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_graphql/test_users/undefined.json b/tests/test_graphql/test_users/undefined.json index f0826c4..ae9cd9e 100644 --- a/tests/test_graphql/test_users/undefined.json +++ b/tests/test_graphql/test_users/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json index e359a16..1a95e85 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/enable_undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json index fcad1f5..c1691ea 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json index 7ad9081..42999d8 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json index 1deab31..ee288c2 100644 --- a/tests/test_rest_endpoints/services/test_bitwarden/undefined.json +++ b/tests/test_rest_endpoints/services/test_bitwarden/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json index fd67d96..f9fb878 100644 --- a/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/enable_undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_off.json b/tests/test_rest_endpoints/services/test_gitea/turned_off.json index fcad1f5..c1691ea 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_off.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_gitea/turned_on.json b/tests/test_rest_endpoints/services/test_gitea/turned_on.json index 50ce50b..f9a1eaf 100644 --- a/tests/test_rest_endpoints/services/test_gitea/turned_on.json +++ b/tests/test_rest_endpoints/services/test_gitea/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_gitea/undefined.json b/tests/test_rest_endpoints/services/test_gitea/undefined.json index d6187cc..a50a070 100644 --- a/tests/test_rest_endpoints/services/test_gitea/undefined.json +++ b/tests/test_rest_endpoints/services/test_gitea/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json index 8f00842..19f1f2d 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/enable_undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json index 8b6f466..b80ad9e 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json index fcad1f5..c1691ea 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json index dd13c56..46c09f3 100644 --- a/tests/test_rest_endpoints/services/test_nextcloud/undefined.json +++ b/tests/test_rest_endpoints/services/test_nextcloud/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json index a509d77..e080110 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/enable_undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json index 8542a7c..1c08123 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json index 8b6f466..b80ad9e 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ocserv/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ocserv/undefined.json b/tests/test_rest_endpoints/services/test_ocserv/undefined.json index 7ffae11..12eb73a 100644 --- a/tests/test_rest_endpoints/services/test_ocserv/undefined.json +++ b/tests/test_rest_endpoints/services/test_ocserv/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json index 5d359c2..0903875 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/enable_undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json index 74bfb7c..813c01f 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_off.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json index 8542a7c..1c08123 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/turned_on.json +++ b/tests/test_rest_endpoints/services/test_pleroma/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_pleroma/undefined.json b/tests/test_rest_endpoints/services/test_pleroma/undefined.json index dcfe1e1..77d8ad2 100644 --- a/tests/test_rest_endpoints/services/test_pleroma/undefined.json +++ b/tests/test_rest_endpoints/services/test_pleroma/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_restic.py b/tests/test_rest_endpoints/services/test_restic.py index 9502be5..844ff34 100644 --- a/tests/test_rest_endpoints/services/test_restic.py +++ b/tests/test_rest_endpoints/services/test_restic.py @@ -161,7 +161,7 @@ def mock_restic_tasks(mocker): @pytest.fixture def undefined_settings(mocker, datadir): mocker.patch("selfprivacy_api.utils.USERDATA_FILE", new=datadir / "undefined.json") - assert "backblaze" not in read_json(datadir / "undefined.json") + assert "backup" not in read_json(datadir / "undefined.json") return datadir @@ -170,20 +170,22 @@ def some_settings(mocker, datadir): mocker.patch( "selfprivacy_api.utils.USERDATA_FILE", new=datadir / "some_values.json" ) - assert "backblaze" in read_json(datadir / "some_values.json") - assert read_json(datadir / "some_values.json")["backblaze"]["accountId"] == "ID" - assert read_json(datadir / "some_values.json")["backblaze"]["accountKey"] == "KEY" - assert read_json(datadir / "some_values.json")["backblaze"]["bucket"] == "BUCKET" + assert "backup" in read_json(datadir / "some_values.json") + assert read_json(datadir / "some_values.json")["backup"]["provider"] == "BACKBLAZE" + assert read_json(datadir / "some_values.json")["backup"]["accountId"] == "ID" + assert read_json(datadir / "some_values.json")["backup"]["accountKey"] == "KEY" + assert read_json(datadir / "some_values.json")["backup"]["bucket"] == "BUCKET" return datadir @pytest.fixture def no_values(mocker, datadir): mocker.patch("selfprivacy_api.utils.USERDATA_FILE", new=datadir / "no_values.json") - assert "backblaze" in read_json(datadir / "no_values.json") - assert "accountId" not in read_json(datadir / "no_values.json")["backblaze"] - assert "accountKey" not in read_json(datadir / "no_values.json")["backblaze"] - assert "bucket" not in read_json(datadir / "no_values.json")["backblaze"] + assert "backup" in read_json(datadir / "no_values.json") + assert "provider" not in read_json(datadir / "no_values.json")["backup"] + assert "accountId" not in read_json(datadir / "no_values.json")["backup"] + assert "accountKey" not in read_json(datadir / "no_values.json")["backup"] + assert "bucket" not in read_json(datadir / "no_values.json")["backup"] return datadir @@ -462,7 +464,8 @@ def test_set_backblaze_config( ) assert response.status_code == 200 assert mock_restic_tasks.update_keys_from_userdata.call_count == 1 - assert read_json(some_settings / "some_values.json")["backblaze"] == { + assert read_json(some_settings / "some_values.json")["backup"] == { + "provider": "BACKBLAZE", "accountId": "123", "accountKey": "456", "bucket": "789", @@ -478,7 +481,8 @@ def test_set_backblaze_config_on_undefined( ) assert response.status_code == 200 assert mock_restic_tasks.update_keys_from_userdata.call_count == 1 - assert read_json(undefined_settings / "undefined.json")["backblaze"] == { + assert read_json(undefined_settings / "undefined.json")["backup"] == { + "provider": "BACKBLAZE", "accountId": "123", "accountKey": "456", "bucket": "789", @@ -494,7 +498,8 @@ def test_set_backblaze_config_on_no_values( ) assert response.status_code == 200 assert mock_restic_tasks.update_keys_from_userdata.call_count == 1 - assert read_json(no_values / "no_values.json")["backblaze"] == { + assert read_json(no_values / "no_values.json")["backup"] == { + "provider": "BACKBLAZE", "accountId": "123", "accountKey": "456", "bucket": "789", diff --git a/tests/test_rest_endpoints/services/test_restic/no_values.json b/tests/test_rest_endpoints/services/test_restic/no_values.json index 0a8a0a0..3b4a2f5 100644 --- a/tests/test_rest_endpoints/services/test_restic/no_values.json +++ b/tests/test_rest_endpoints/services/test_restic/no_values.json @@ -1,6 +1,4 @@ { - "backblaze": { - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false @@ -70,9 +68,5 @@ "provider": "HETZNER" }, "backup": { - "provider": "BACKBLAZE", - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_restic/some_values.json b/tests/test_rest_endpoints/services/test_restic/some_values.json index aa3a19f..c003d10 100644 --- a/tests/test_rest_endpoints/services/test_restic/some_values.json +++ b/tests/test_rest_endpoints/services/test_restic/some_values.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "BUCKET" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false @@ -76,6 +71,6 @@ "provider": "BACKBLAZE", "accountId": "ID", "accountKey": "KEY", - "bucket": "selfprivacy" + "bucket": "BUCKET" } -} \ No newline at end of file +} diff --git a/tests/test_rest_endpoints/services/test_restic/undefined.json b/tests/test_rest_endpoints/services/test_restic/undefined.json index df6380a..5bd1220 100644 --- a/tests/test_rest_endpoints/services/test_restic/undefined.json +++ b/tests/test_rest_endpoints/services/test_restic/undefined.json @@ -66,11 +66,5 @@ }, "server": { "provider": "HETZNER" - }, - "backup": { - "provider": "BACKBLAZE", - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" } } \ No newline at end of file diff --git a/tests/test_rest_endpoints/services/test_ssh/all_off.json b/tests/test_rest_endpoints/services/test_ssh/all_off.json index 97d7690..051d364 100644 --- a/tests/test_rest_endpoints/services/test_ssh/all_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/all_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json index fcad1f5..c1691ea 100644 --- a/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json +++ b/tests/test_rest_endpoints/services/test_ssh/root_and_admin_have_keys.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/some_users.json b/tests/test_rest_endpoints/services/test_ssh/some_users.json index 0706d9e..df6380a 100644 --- a/tests/test_rest_endpoints/services/test_ssh/some_users.json +++ b/tests/test_rest_endpoints/services/test_ssh/some_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_off.json b/tests/test_rest_endpoints/services/test_ssh/turned_off.json index 92b2196..3856c80 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_off.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/turned_on.json b/tests/test_rest_endpoints/services/test_ssh/turned_on.json index 7434d16..e60c57f 100644 --- a/tests/test_rest_endpoints/services/test_ssh/turned_on.json +++ b/tests/test_rest_endpoints/services/test_ssh/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined.json b/tests/test_rest_endpoints/services/test_ssh/undefined.json index 290b396..7c9af37 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json index a570880..b7b03d3 100644 --- a/tests/test_rest_endpoints/services/test_ssh/undefined_values.json +++ b/tests/test_rest_endpoints/services/test_ssh/undefined_values.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_system/no_values.json b/tests/test_rest_endpoints/test_system/no_values.json index 442b62d..5c1431e 100644 --- a/tests/test_rest_endpoints/test_system/no_values.json +++ b/tests/test_rest_endpoints/test_system/no_values.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_system/turned_off.json b/tests/test_rest_endpoints/test_system/turned_off.json index 3a4a238..2336f36 100644 --- a/tests/test_rest_endpoints/test_system/turned_off.json +++ b/tests/test_rest_endpoints/test_system/turned_off.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_system/turned_on.json b/tests/test_rest_endpoints/test_system/turned_on.json index 7ad9081..42999d8 100644 --- a/tests/test_rest_endpoints/test_system/turned_on.json +++ b/tests/test_rest_endpoints/test_system/turned_on.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_system/undefined.json b/tests/test_rest_endpoints/test_system/undefined.json index fd1efad..6b9f3fd 100644 --- a/tests/test_rest_endpoints/test_system/undefined.json +++ b/tests/test_rest_endpoints/test_system/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_users/no_users.json b/tests/test_rest_endpoints/test_users/no_users.json index dadb584..5929a79 100644 --- a/tests/test_rest_endpoints/test_users/no_users.json +++ b/tests/test_rest_endpoints/test_users/no_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_users/one_user.json b/tests/test_rest_endpoints/test_users/one_user.json index 71d6338..6c553bc 100644 --- a/tests/test_rest_endpoints/test_users/one_user.json +++ b/tests/test_rest_endpoints/test_users/one_user.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_users/some_users.json b/tests/test_rest_endpoints/test_users/some_users.json index 0706d9e..df6380a 100644 --- a/tests/test_rest_endpoints/test_users/some_users.json +++ b/tests/test_rest_endpoints/test_users/some_users.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false diff --git a/tests/test_rest_endpoints/test_users/undefined.json b/tests/test_rest_endpoints/test_users/undefined.json index fcad1f5..c1691ea 100644 --- a/tests/test_rest_endpoints/test_users/undefined.json +++ b/tests/test_rest_endpoints/test_users/undefined.json @@ -1,9 +1,4 @@ { - "backblaze": { - "accountId": "ID", - "accountKey": "KEY", - "bucket": "selfprivacy" - }, "api": { "token": "TEST_TOKEN", "enableSwagger": false