Remote settings storage directory handling fixes

- Fixed code in `components/remote_settings/src/storage.rs` that creates
  the remote settings data directory.  The old code was mixing up the
  path with the parent directory.
- Create the `.cli_data` dir in the remote-settings example CLI code.
  The remote settings service expects consumers to create at least the
  parent directory of the the data directory.

Author: bendk

components/remote_settings/src/storage.rs

@@ -42,9 +42,7 @@ impl Storage {
     fn transaction(&mut self) -> Result<Transaction<'_>> {
         match &self.conn {
             ConnectionCell::Uninitialized => {
-                if self.path != ":memory:" && std::fs::exists(&self.path)? {
-                    std::fs::create_dir(&self.path)?;
-                }
+                self.ensure_dir()?;
                 self.conn = ConnectionCell::Initialized(open_database_with_flags(
                     &self.path,
                     OpenFlags::default(),
@@ -60,6 +58,19 @@ impl Storage {
         }
     }
 
+    pub fn ensure_dir(&self) -> Result<()> {
+        if self.path == ":memory:" {
+            return Ok(());
+        }
+        let Some(dir) = self.path.parent() else {
+            return Ok(());
+        };
+        if !std::fs::exists(dir)? {
+            std::fs::create_dir(dir)?;
+        }
+        Ok(())
+    }
+
     pub fn close(&mut self) {
         self.conn = ConnectionCell::Closed;
     }

examples/cli-support/src/lib.rs

@@ -34,6 +34,13 @@ pub fn cli_data_dir() -> String {
     data_path(None).to_string_lossy().to_string()
 }
 
+pub fn ensure_cli_data_dir_exists() {
+    let dir = data_path(None);
+    if !dir.exists() {
+        std::fs::create_dir(&dir).unwrap_or_else(|_| panic!("Error creating dir: {dir:?}"))
+    }
+}
+
 pub fn cli_data_subdir(relative_path: &str) -> String {
     data_path(Some(relative_path)).to_string_lossy().to_string()
 }

examples/remote-settings-cli/src/main.rs

@@ -118,6 +118,7 @@ fn build_service(cli: &Cli) -> Result<RemoteSettingsService> {
         bucket_name: cli.bucket.clone(),
         app_context: None,
     };
+    cli_support::ensure_cli_data_dir_exists();
     let storage_dir = cli
         .storage_dir
         .clone()