From 34429d89d6869eff668be22335391daa3df03365 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 1 Nov 2021 17:33:15 -0600
Subject: [PATCH] refactor: use data_dir fn

---
 appmgr/src/volume.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/appmgr/src/volume.rs b/appmgr/src/volume.rs
index 1a47ee1b4..88ffec093 100644
--- a/appmgr/src/volume.rs
+++ b/appmgr/src/volume.rs
@@ -210,17 +210,11 @@ impl Volume {
                 volume_id,
                 path,
                 ..
-            } => ctx
-                .datadir
-                .join(PKG_VOLUME_DIR)
-                .join(package_id)
-                .join("data")
-                .join(volume_id)
-                .join(if path.is_absolute() {
-                    path.strip_prefix("/").unwrap()
-                } else {
-                    path.as_ref()
-                }),
+            } => data_dir(&ctx.datadir, package_id, volume_id).join(if path.is_absolute() {
+                path.strip_prefix("/").unwrap()
+            } else {
+                path.as_ref()
+            }),
             Volume::Certificate { interface_id: _ } => {
                 ctx.net_controller.nginx.ssl_directory_for(pkg_id)
             }