From 399bbd5d635382db64daa7fce8fc43cc19a06dfc Mon Sep 17 00:00:00 2001
From: Phil Wise <phil@phil-wise.com>
Date: Mon, 11 Oct 2021 21:08:45 +0100
Subject: [PATCH] Remove [storage] type = "sqlite" everywhere

This is the default (see StorageConfig in config.h)
---
 config/posix-secondary.toml             | 1 -
 config/sota-device-cred-hsm.toml        | 3 ---
 config/sota-device-cred.toml            | 3 ---
 config/sota-secondary.toml              | 1 -
 config/sota-shared-cred.toml            | 3 ---
 src/uptane_generator/run/create_repo.sh | 1 -
 tests/config/aktualizr_secondary.toml   | 3 ---
 tests/device_cred_prov_hsm_test.py      | 1 -
 tests/device_cred_prov_test.py          | 1 -
 tests/shared_cred_prov_test.py          | 1 -
 tests/test_fixtures.py                  | 2 --
 11 files changed, 20 deletions(-)

diff --git a/config/posix-secondary.toml b/config/posix-secondary.toml
index 5221f32ee7..153a3d37db 100644
--- 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
index 1efc6170cb..ce556e0d46 100644
--- 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
index f527cf5699..82ff8dad67 100644
--- 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
index f723537081..6c95a7b807 100644
--- 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
index 7db1f3fd68..cadb1ad273 100644
--- 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
index 635824094f..95e9db047a 100755
--- 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
index 845061faa1..dffb42bb57 100644
--- 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
index 38285a9598..c1d48de273 100755
--- 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
index 7b3ac0964c..45a1303f43 100755
--- 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
index 1ed99b07d7..6b98e39bd7 100755
--- 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
index b35dec6b09..3774c5119f 100644
--- 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}"