Eliminates wild-app-fetch
This commit is contained in:
@@ -8,23 +8,23 @@ UPDATE=false
|
||||
# Parse arguments
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case $1 in
|
||||
--update)
|
||||
--force)
|
||||
UPDATE=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
echo "Usage: $0 <app_name> [--update]"
|
||||
echo "Usage: $0 <app_name> [--force]"
|
||||
echo ""
|
||||
echo "Configure an app by applying templates and merging configuration."
|
||||
echo ""
|
||||
echo "Options:"
|
||||
echo " --update Overwrite existing app files without confirmation"
|
||||
echo " --force Overwrite existing app files without confirmation"
|
||||
echo " -h, --help Show this help message"
|
||||
exit 0
|
||||
;;
|
||||
-*)
|
||||
echo "Unknown option $1"
|
||||
echo "Usage: $0 <app_name> [--update]"
|
||||
echo "Usage: $0 <app_name> [--force]"
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
@@ -32,7 +32,7 @@ while [[ $# -gt 0 ]]; do
|
||||
APP_NAME="$1"
|
||||
else
|
||||
echo "Too many arguments"
|
||||
echo "Usage: $0 <app_name> [--update]"
|
||||
echo "Usage: $0 <app_name> [--force]"
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
@@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do
|
||||
done
|
||||
|
||||
if [ -z "${APP_NAME}" ]; then
|
||||
echo "Usage: $0 <app_name> [--update]"
|
||||
echo "Usage: $0 <app_name> [--force]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -71,21 +71,14 @@ if [ ! -f "${SECRETS_FILE}" ]; then
|
||||
echo "" >> "${SECRETS_FILE}"
|
||||
fi
|
||||
|
||||
# Check if app is cached, if not fetch it first
|
||||
CACHE_APP_DIR="${WC_HOME}/.wildcloud/cache/apps/${APP_NAME}"
|
||||
if [ ! -d "${CACHE_APP_DIR}" ]; then
|
||||
echo "Cache directory for app '${APP_NAME}' not found at '${CACHE_APP_DIR}'."
|
||||
echo "Please fetch the app first using 'wild-app-fetch ${APP_NAME}'."
|
||||
# Check if app exists in repository
|
||||
SOURCE_APP_DIR="${WC_ROOT}/apps/${APP_NAME}"
|
||||
if [ ! -d "${SOURCE_APP_DIR}" ]; then
|
||||
echo "Error: App '${APP_NAME}' not found at ${SOURCE_APP_DIR}"
|
||||
echo "Available apps:"
|
||||
ls -1 "${WC_ROOT}/apps" | grep -v README.md | sed 's/^/ - /'
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -d "${CACHE_APP_DIR}" ]; then
|
||||
echo "App '${APP_NAME}' not found in cache, fetching..."
|
||||
if [ "${UPDATE}" = true ]; then
|
||||
./bin/wild-app-fetch "${APP_NAME}" --update
|
||||
else
|
||||
./bin/wild-app-fetch "${APP_NAME}"
|
||||
fi
|
||||
fi
|
||||
|
||||
APPS_DIR="${WC_HOME}/apps"
|
||||
if [ ! -d "${APPS_DIR}" ]; then
|
||||
@@ -113,12 +106,12 @@ else
|
||||
fi
|
||||
mkdir -p "${DEST_APP_DIR}"
|
||||
|
||||
# Step 1: Copy only manifest.yaml from cache first
|
||||
MANIFEST_FILE="${CACHE_APP_DIR}/manifest.yaml"
|
||||
# Step 1: Copy manifest.yaml from repository first
|
||||
MANIFEST_FILE="${SOURCE_APP_DIR}/manifest.yaml"
|
||||
if [ -f "${MANIFEST_FILE}" ]; then
|
||||
# manifest.yaml is allowed to have gomplate variables in the defaultConfig and requiredSecrets sections.
|
||||
# We need to use gomplate to process these variables before using yq.
|
||||
echo "Copying app manifest from cache."
|
||||
echo "Processing app manifest."
|
||||
DEST_MANIFEST="${DEST_APP_DIR}/manifest.yaml"
|
||||
if [ -f "${SECRETS_FILE}" ]; then
|
||||
gomplate_cmd="gomplate -c .=${CONFIG_FILE} -c secrets=${SECRETS_FILE} -f ${MANIFEST_FILE} -o ${DEST_MANIFEST}"
|
||||
@@ -130,7 +123,7 @@ if [ -f "${MANIFEST_FILE}" ]; then
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Warning: App manifest not found in cache."
|
||||
echo "Error: App manifest not found at ${MANIFEST_FILE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -185,10 +178,10 @@ if yq eval '.requiredSecrets' "${DEST_MANIFEST}" | grep -q -v '^null$'; then
|
||||
echo "Required secrets declared in app manifest added to '${SECRETS_FILE}'."
|
||||
fi
|
||||
|
||||
# Step 3: Copy and compile all other files from cache to app directory
|
||||
echo "Copying and compiling remaining files from cache."
|
||||
# Step 3: Copy and compile all files from repository to app directory
|
||||
echo "Copying and compiling app files."
|
||||
|
||||
cp -r "${CACHE_APP_DIR}/." "${DEST_APP_DIR}/"
|
||||
cp -r "${SOURCE_APP_DIR}/." "${DEST_APP_DIR}/"
|
||||
find "${DEST_APP_DIR}" -type f | while read -r dest_file; do
|
||||
rel_path="${dest_file#${DEST_APP_DIR}/}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user