From a22b71446e24bb66016b2df4de46f79aa10ff5c4 Mon Sep 17 00:00:00 2001
From: "Tran, Huy (ht095u)" <ht095u@att.com>
Date: Wed, 23 Mar 2022 11:41:42 -0500
Subject: [PATCH] [DATABASE] Minor change to list local archive files

Minor change to list archive directory with files in sub-directory
as below. Without the change, only the directory name 'quarantine'
is displayed.

All Local Archives
==============================================
mariadb.openstack.all.2022-03-20T18:00:17Z.tar.gz
mariadb.openstack.all.2022-03-21T00:00:16Z.tar.gz
mariadb.openstack.all.2022-03-21T06:00:12Z.tar.gz
mariadb.openstack.all.2022-03-21T12:00:13Z.tar.gz
mariadb.openstack.all.2022-03-21T18:00:11Z.tar.gz
quarantine/mariadb.openstack.all.2022-03-23T00:00:12Z.tar.gz
quarantine/mariadb.openstack.all.2022-03-23T06:00:11Z.tar.gz
quarantine/mariadb.openstack.all.2022-03-23T12:00:14Z.tar.gz
quarantine/mariadb.openstack.all.2022-03-23T14:24:04Z.tar.gz

Change-Id: Ic47a30884b82cdecedbfff8ddf1d85fc00d89acc
---
 helm-toolkit/Chart.yaml                                         | 2 +-
 .../templates/scripts/db-backup-restore/_restore_main.sh.tpl    | 2 +-
 releasenotes/notes/helm-toolkit.yaml                            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index 0daf52ce8..96d4fbfb6 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.37
+version: 0.2.38
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/scripts/db-backup-restore/_restore_main.sh.tpl b/helm-toolkit/templates/scripts/db-backup-restore/_restore_main.sh.tpl
index c2de3aaa6..093dd2cc9 100755
--- a/helm-toolkit/templates/scripts/db-backup-restore/_restore_main.sh.tpl
+++ b/helm-toolkit/templates/scripts/db-backup-restore/_restore_main.sh.tpl
@@ -269,7 +269,7 @@ list_archives() {
       echo "=============================================="
       for archive in $archives
       do
-        echo $archive | cut -d '/' -f 8
+        echo $archive | cut -d '/' -f8-
       done
       clean_and_exit 0 ""
     else
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index 94a6392cd..dce3c20b5 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -44,4 +44,5 @@ helm-toolkit:
   - 0.2.35 Database B/R improvements
   - 0.2.36 Enable taint toleration for Openstack services jobs
   - 0.2.37 Updated chart naming for subchart compatibility
+  - 0.2.38 Minor change to display archive directory with files in sub-directory
 ...