From fb7e561e2d30f12ae37826c3a2024177994ddfed Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Thu, 5 Oct 2023 12:24:37 -0400
Subject: [PATCH 1/2] add housekeeper script for artifactory linux packages

---
 .../housekeeper-artifactory-zitipax.bash      | 103 ++++++++++++++++++
 ...{housekeeper.bash => housekeeper-aws.bash} |   0
 2 files changed, 103 insertions(+)
 create mode 100644 zititest/scripts/housekeeper-artifactory-zitipax.bash
 rename zititest/scripts/{housekeeper.bash => housekeeper-aws.bash} (100%)

diff --git a/zititest/scripts/housekeeper-artifactory-zitipax.bash b/zititest/scripts/housekeeper-artifactory-zitipax.bash
new file mode 100644
index 000000000..3fff66961
--- /dev/null
+++ b/zititest/scripts/housekeeper-artifactory-zitipax.bash
@@ -0,0 +1,103 @@
+#!/usr/in/env bash
+
+set -euo pipefail
+
+BASENAME=$(basename "$0")
+typeset -a  ARTIFACTS=() \
+            STAGES=() \
+            KNOWN_ARTIFACTS=(ziti-cli ziti-edge-tunnel) \
+            KNOWN_STAGES=(testing release)
+AGE=30  # days
+export CI=0    # jfrog CLI is interactive and prompts for confirmation by default
+
+while (( $# )); do
+    case ${1} in
+        --artifacts)
+            shift
+            while [[ $# -gt 0 && ! ${1} =~ ^-- ]]; do
+                ARTIFACTS+=("$1")
+                shift
+            done
+            for ARTIFACT in "${ARTIFACTS[@]}"; do
+                for KNOWN in "${KNOWN_ARTIFACTS[@]}"; do
+                    if [[ ${ARTIFACT} == "${KNOWN}" ]]; then
+                        continue 2
+                    fi
+                done
+                echo "ERROR: invalid artifact '${ARTIFACT}', valid artifacts are ${KNOWN_ARTIFACTS[*]}" >&2
+                exit 1
+            done
+            ;;
+        --stages)
+            shift
+            while [[ $# -gt 0 && ! ${1} =~ ^-- ]]; do
+                STAGES+=("$1")
+                shift
+            done
+            for STAGE in "${STAGES[@]}"; do
+                for KNOWN in "${KNOWN_STAGES[@]}"; do
+                    if [[ ${STAGE} == "${KNOWN}" ]]; then
+                        continue 2
+                    fi
+                echo "ERROR: invalid stage '${STAGE}', valid stages are ${KNOWN_STAGES[*]}" >&2
+                exit 1
+                done
+            done
+            echo "INFO: stages are ${STAGES[*]}" >&2
+            ;;
+        --quiet)
+            CI=1  # disable interactive prompts before destructive actions
+            shift
+            ;;
+        --dry-run)
+            CI=0  # re-enable interactive prompts before destructive actions in case parent env has CI=1
+            shift
+            ;;
+        --age)
+            shift
+            if [[ ${1} =~ ^-- ]]; then
+                echo "ERROR: --age requires an argument" >&2
+                exit 1
+            else
+                AGE="$1"
+                shift
+            fi
+            ;;
+        --help|\?|*)
+            echo "Usage: $BASENAME --artifacts ziti-cli ziti-edge-tunnel [--age DAYS|--stages testing release|--dry-run|--quiet]"
+            exit 0
+            ;;
+    esac
+done
+
+if [[ ${#ARTIFACTS[@]} -eq 0 ]]; then
+    echo "ERROR: no artifacts specified, need one or more of ${KNOWN_ARTIFACTS[*]}" >&2
+    exit 1
+else
+    echo "INFO: artifacts are ${ARTIFACTS[*]}" >&2
+fi
+
+if [[ ${#STAGES[@]} -eq 0 ]]; then
+    echo "INFO: default stage is 'testing'" >&2
+    STAGES=(testing)
+fi
+
+(( CI )) && {
+    echo "WARNING: permanently deleting" >&2;
+    sleep 9;
+}
+while read -r REPO; do
+    for STAGE in "${STAGES[@]}"; do
+        for ARTIFACT in "${ARTIFACTS[@]}"; do
+            for META in rpm.metadata.name deb.name; do
+                    echo "INFO: deleting ${REPO}/${STAGE}/${ARTIFACT}" >&2
+                    jf rt search --include 'created;path' --props "${META}=${ARTIFACT}" "${REPO}/*${STAGE}*" \
+                    | jq --arg OLDEST "$(date --date "-${AGE:-30} days" -Is)" '.[]|select(.created < $OLDEST)|.path' \
+                    | xargs -rl jf rt delete
+            done
+        done
+    done
+done < <(
+    jf rt cl -sS /api/repositories \
+    | jq --raw-output '.[]|select(.key|match("zitipax-openziti"))|.key'
+)
diff --git a/zititest/scripts/housekeeper.bash b/zititest/scripts/housekeeper-aws.bash
similarity index 100%
rename from zititest/scripts/housekeeper.bash
rename to zititest/scripts/housekeeper-aws.bash

From 645c6adf4eb529865ac50daeb7215d63e7cbdc48 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Thu, 5 Oct 2023 16:28:07 -0400
Subject: [PATCH 2/2] expand list of known package names

---
 zititest/scripts/housekeeper-artifactory-zitipax.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zititest/scripts/housekeeper-artifactory-zitipax.bash b/zititest/scripts/housekeeper-artifactory-zitipax.bash
index 3fff66961..2c7ce025b 100644
--- a/zititest/scripts/housekeeper-artifactory-zitipax.bash
+++ b/zititest/scripts/housekeeper-artifactory-zitipax.bash
@@ -5,7 +5,7 @@ set -euo pipefail
 BASENAME=$(basename "$0")
 typeset -a  ARTIFACTS=() \
             STAGES=() \
-            KNOWN_ARTIFACTS=(ziti-cli ziti-edge-tunnel) \
+            KNOWN_ARTIFACTS=(openziti openziti-controller openziti-router ziti-cli ziti-edge-tunnel) \
             KNOWN_STAGES=(testing release)
 AGE=30  # days
 export CI=0    # jfrog CLI is interactive and prompts for confirmation by default