Remove [storage] type = "sqlite" everywhere

This is the default (see StorageConfig in config.h)
cajun-rat · Oct 17, 2021 · 399bbd5 · 399bbd5
1 parent bbbc55d
commit 399bbd5
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 20 deletions.
diff --git a/config/posix-secondary.toml b/config/posix-secondary.toml
@@ -2,7 +2,6 @@
 ecu_hardware_id = "local-fake-secondary"
 
 [storage]
-type = "sqlite"
 path = "storage"
 sqldb_path = "secondary.db"
 

diff --git a/config/sota-device-cred-hsm.toml b/config/sota-device-cred-hsm.toml
@@ -13,9 +13,6 @@ tls_pkey_id = "02"
 [uptane]
 key_source = "pkcs11"
 
-[storage]
-type = "sqlite"
-
 [import]
 base_path = "/var/sota/import"
 tls_cacert_path = "root.crt"
diff --git a/config/sota-device-cred.toml b/config/sota-device-cred.toml
@@ -1,9 +1,6 @@
 [tls]
 server_url_path = "/var/sota/import/gateway.url"
 
-[storage]
-type = "sqlite"
-
 [import]
 base_path = "/var/sota/import"
 tls_cacert_path = "root.crt"

diff --git a/config/sota-secondary.toml b/config/sota-secondary.toml
@@ -1,3 +1,2 @@
 [storage]
-type = "sqlite"
 sqldb_path = "/var/sota/secondary.db"
diff --git a/config/sota-shared-cred.toml b/config/sota-shared-cred.toml
@@ -1,5 +1,2 @@
 [provision]
 provision_path = "/var/sota/sota_provisioning_credentials.zip"
-
-[storage]
-type = "sqlite"
diff --git a/src/uptane_generator/run/create_repo.sh b/src/uptane_generator/run/create_repo.sh
@@ -80,7 +80,6 @@ provision_path = "${repo_dir}/credentials.zip"
 primary_ecu_hardware_id = "desktop"
 
 [storage]
-type = "sqlite"
 path = "${repo_dir}/var_sota"
 sqldb_path = "${repo_dir}/var_sota/sql.db"
 

diff --git a/tests/config/aktualizr_secondary.toml b/tests/config/aktualizr_secondary.toml
@@ -1,9 +1,6 @@
 [network]
 port = 9031
 
-[storage]
-type = "sqlite"
-
 [pacman]
 os = "testos"
 sysroot = "testsysroot"

diff --git a/tests/device_cred_prov_hsm_test.py b/tests/device_cred_prov_hsm_test.py
@@ -47,7 +47,6 @@ def main():
 key_source = "pkcs11"
 
 [storage]
-type = "sqlite"
 path = "{tmp_dir}"
 
 [import]

diff --git a/tests/device_cred_prov_test.py b/tests/device_cred_prov_test.py
@@ -31,7 +31,6 @@ def main():
 
 [storage]
 path = "{tmp_dir}"
-type = "sqlite"
 
 [import]
 base_path = "{tmp_dir}/import"

diff --git a/tests/shared_cred_prov_test.py b/tests/shared_cred_prov_test.py
@@ -32,7 +32,6 @@ def main():
 
 [storage]
 path = "{tmp_dir}"
-type = "sqlite"
 sqldb_path = "{db}"
 '''
 

diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
@@ -92,7 +92,6 @@ def __init__(self, aktualizr_primary_exe, aktualizr_info_exe, id,
 
     [storage]
     path = "{storage_dir}"
-    type = "sqlite"
     sqldb_path = "{db_path}"
 
     [pacman]
@@ -352,7 +351,6 @@ def __init__(self, id, aktualizr_secondary_exe='src/aktualizr_secondary/aktualiz
     primary_port = {primary_port}
 
     [storage]
-    type = "sqlite"
     path = "{storage_dir}"
     sqldb_path = "{db_path}"