From 3007010064aeaac84765666145b7c512f90093a5 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Tue, 7 Sep 2021 19:54:39 +0000
Subject: [PATCH] perm: Various fixes (values hash, revert)

The hash used by divingbell-perms to decide whether or not to rerun the
permissions script was being generated incorrectly, using a fixed value
instead of actually looking at the values passed to the chart.

This change updates the hash to reflect conf.divingbell.perms, and will
rerun the script if the hash changes.

Also fixes the logic to revert permissions.

Change-Id: I74f056f69a1b7f0eb9223915b1671e1e18091483
---
 divingbell/templates/bin/_perm.sh.tpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/divingbell/templates/bin/_perm.sh.tpl b/divingbell/templates/bin/_perm.sh.tpl
index d07baf4..1dac5ff 100644
--- a/divingbell/templates/bin/_perm.sh.tpl
+++ b/divingbell/templates/bin/_perm.sh.tpl
@@ -86,7 +86,7 @@ add_single_perm(){
 
 revert_perm(){
 # Revert
-  prev_files="$(find "${backup_path}" -type f ! -name last_run_timestamp)"
+  prev_files="$(find "${backup_path}" -maxdepth 1 -type f)"
   if [ -n "${prev_files}" ]; then
     basename -a ${prev_files} | sort > /tmp/prev_perm
     echo "${applied_perm}" | sort > /tmp/curr_perm
@@ -146,8 +146,7 @@ revert_perm(){
 
 cd "${backup_path}"
 
-{{- $_ := set $.Values "__values_hash" list }}
-{{- $hash := $.Values.__values_hash | toString | sha256sum }}
+{{- $hash := $.Values.conf.perm | toString | sha256sum }}
 
 hash={{ $hash | squote }}
 if [ ! -d "${hash}" ]; then