From bc1095e5966287321cd654364f3c6a48480f6584 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Thu, 13 Sep 2018 13:57:07 +0200
Subject: [PATCH] TT#37257 Add option 'ngcpcfg apply --force-all-services' to
 force all services restart

At the end of installer's 'configuration' section we need
to restart all services were touched during the installation
(otherwise we need to restart the node completely).

The option helps us in this case as etckeeper is
not reliable enough during the installation.

P.S. we pass options from 'apply' to 'services' now,
we should remove 'Unsupported option(s) given: $*' check,
otherwise it is failing as 'apply' requires commit message,
which cause error on 'services' level: 'Unsupported option(s) given'
> 2018-09-13 18:08:33: Error: Unsupported option(s) given: my commit message
> 2018-09-13 18:08:34: Did you mean '--dry-run'?

Change-Id: I5dac44cd87dc1fc90f81e4ac3a14af32c00f825e
---
 scripts/apply    |  2 +-
 scripts/services | 69 ++++++++++++++++++++++++++++++++++++------------
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/scripts/apply b/scripts/apply
index b425fcb5..be3fb2b8 100755
--- a/scripts/apply
+++ b/scripts/apply
@@ -38,7 +38,7 @@ if check_for_outstanding_commits && [ -z "${1:-}" ] ; then
 fi
 
 "${SCRIPTS}"/build
-"${SCRIPTS}"/services
+"${SCRIPTS}"/services "$@"
 "${SCRIPTS}"/commit "$@"
 
 # We "commit" AFTER we "build", therefore the state information is out of date
diff --git a/scripts/services b/scripts/services
index 1a26d8cd..a4bddb98 100755
--- a/scripts/services
+++ b/scripts/services
@@ -102,7 +102,7 @@ systed_daemon_reload_preset() {
 }
 
 is_absolute_path() {
-  local dir=$1
+  local dir="$1"
 
   if [[ ! "${dir}" =~ ^/ ]] ; then
     log_error "${dir} is not an absolute path"
@@ -113,7 +113,7 @@ is_absolute_path() {
 }
 
 is_non_git_folder() {
-  local dir=$1
+  local dir="$1"
 
   if [[ ! -d "${dir}/.git" ]] ; then
     log_info "${dir} has no support of .services"
@@ -123,17 +123,61 @@ is_non_git_folder() {
   return 0
 }
 
+generate_list_to_process() {
+  local dir="$1"
+
+  if ${FORCE_ALL_SERVICES} ; then
+    log_debug "calling function find_all_services()"
+    find_all_services "${dir}"
+  else
+    log_debug "calling function find_all_changed_services()"
+    find_all_changed_services "${dir}"
+  fi
+}
+
+find_all_services() {
+  local dir="$1"
+
+  while read -r file ; do
+    if [ ! -r "${file}" ] ; then
+      log_warn "Cannot read file '${file}'"
+    fi
+    log_debug "Storing ${file} in '${TMPFILE}'"
+    echo "${file}" >> "${TMPFILE}"
+  done < <(find "${SERVICES_POOL_BASE}/${dir}" -name '*.services' | sort -u)
+}
+
+find_all_changed_services() {
+  local dir="$1"
+
+  log_debug "${FUNCNAME[0]}(): Working in ${dir}"
+  pushd "${dir}" >/dev/null
+
+  for file in $(git status --porcelain | sed 's/^...//') ; do
+    if [ -r "$file" ] && [ -r "${SERVICES_POOL_BASE}/${dir}/${file}".services ] ; then
+      log_debug "Storing ${SERVICES_POOL_BASE}/${dir}/${file}.services in '${TMPFILE}'"
+      echo "${SERVICES_POOL_BASE}/${dir}/${file}".services
+    elif [ -r "$file" ] && [ -r "${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")"/ngcpcfg.services ] ; then
+      log_debug "Storing ${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")/ngcpcfg.services in '${TMPFILE}'"
+      echo "${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")/ngcpcfg.services"
+    fi
+  done | sort -u >> "${TMPFILE}"
+
+  popd >/dev/null
+}
+
 # main script
 
 DRYRUN='false'
+FORCE_ALL_SERVICES='false'
+
 if [[ "${1:-}" == "test" ]] || [[ "${1:-}" == "--dry-run" ]]; then
   DRYRUN='true'
-elif [[ -n "${1:-}" ]] ; then
-  log_error "Unsupported option(s) given: $*"
-  log_info  "Did you mean '--dry-run'?"
-  exit 1
+elif [[ "${1:-}" == "--force-all-services" ]] ; then
+  FORCE_ALL_SERVICES='true'
 fi
 log_debug "DRYRUN = $DRYRUN"
+log_debug "FORCE_ALL_SERVICES = $FORCE_ALL_SERVICES"
 
 log_debug "systed_daemon_reload_preset function"
 systed_daemon_reload_preset
@@ -144,17 +188,8 @@ log_debug "TMPFILE = $TMPFILE"
 for dir in ${CONFIG_POOL} ; do
   is_absolute_path "${dir}" || continue
   is_non_git_folder "${dir}" || continue
-  pushd "${dir}" >/dev/null
-  for file in $(git status --porcelain | sed 's/^...//') ; do
-    if [ -r "$file" ] && [ -r "${SERVICES_POOL_BASE}/${dir}/${file}".services ] ; then
-      log_debug "Storing ${SERVICES_POOL_BASE}/${dir}/${file}.services in '${TMPFILE}'"
-      echo "${SERVICES_POOL_BASE}/${dir}/${file}".services
-    elif [ -r "$file" ] && [ -r "${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")"/ngcpcfg.services ] ; then
-      log_debug "Storing ${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")/ngcpcfg.services in '${TMPFILE}'"
-      echo "${SERVICES_POOL_BASE}/${dir}/$(dirname "$file")/ngcpcfg.services"
-    fi
-  done | sort -u >> "${TMPFILE}"
-  popd >/dev/null
+
+  generate_list_to_process "${dir}"
 done
 
 if ! [ -s "$TMPFILE" ] ; then