Fix bugs in get-components-json.include.sh and simplify get-services-json.include.sh (#628)

## Overview

`get-components-json.include.sh` was unable to handle the case where a
component was commented out in the `BIRDHOUSE_EXTRA_CONF_DIRS` variable.
Also, it did not display custom components (i.e. those not in one of the
`birhouse/*components/` directories).

This also simplifies the code in both files to make it easier to
maintain:
  
  - removed unnecessary variable declarations
  - simplify component discovery `get-components-json.include.sh`

## Changes

**Non-breaking changes**
- bug fix

**Breaking changes**
- None

## Related Issue / Discussion

## Additional Information

Note that the changes here are fully backwards compatible. 
Even though we no longer source `read-configs.include.sh` the
`read_configs` and/or `read_basic_configs` functions were never called
so even if you had another script that called these scripts without
first reading in the relevant configuration variables, it would already
be failing anyway (since neither script would have loaded the correct
variables).

## CI Operations

<!--
The test suite can be run using a different DACCS config with
``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
To globally skip the test suite regardless of the commit message use
``birdhouse_skip_ci`` set to ``true`` in the PR description.

Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the
commit message will override ``birdhouse_skip_ci`` from the PR
description.
Such commit command can be used to override the PR description behavior
for a specific commit update.
However, a commit message cannot 'force run' a PR which the description
turns off the CI.
To run the CI, the PR should instead be updated with a ``true`` value,
and a running message can be posted in following PR comments to trigger
tests once again.
-->

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false

Author: mishaschwartz

CHANGES.md

@@ -15,7 +15,17 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------
 
-[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+## Fixes
+
+- Fix bugs in `get-components-json.include.sh` and simplify `get-services-json.include.sh`
+
+  `get-components-json.include.sh` was unable to handle the case where a component was commented out in
+  the `BIRDHOUSE_EXTRA_CONF_DIRS` variable.
+
+  This also simplifies the code in both files to make it easier to maintain:
+  
+  - removed unnecessary variable declarations
+  - simplify component discovery `get-components-json.include.sh`
 
 [2.20.2](https://github.com/bird-house/birdhouse-deploy/tree/2.20.2) (2026-01-05)
 ------------------------------------------------------------------------------------------------------------------

birdhouse/scripts/get-components-json.include.sh

@@ -17,59 +17,14 @@
 # }
 #
 
-THIS_FILE="$(readlink -f "$0" || realpath "$0")"
-THIS_DIR="$(dirname "${THIS_FILE}")"
-COMPOSE_DIR="${COMPOSE_DIR:-$(dirname "${THIS_DIR}")}"
-
-if [ -f "${COMPOSE_DIR}/read-configs.include.sh" ]; then
-    . "${COMPOSE_DIR}/read-configs.include.sh"
-fi
-
-# default value in case of error or missing definitions
-export BIRDHOUSE_DEPLOY_COMPONENTS_JSON='{"components": []}'
-if [ -z "${ALL_CONF_DIRS}" ]; then
-  log WARN "No components in BIRDHOUSE_DEFAULT_CONF_DIRS and BIRDHOUSE_EXTRA_CONF_DIRS. Components JSON list will be empty!"
-  return
-fi
-
-# resolve path considering if sourced or executed, and whether from current dir, birdhouse-compose include or another dir
-BIRDHOUSE_DEPLOY_COMPONENTS_ROOT=$(dirname -- "$(realpath "$0")")
-if [ "$(echo "${BIRDHOUSE_DEPLOY_COMPONENTS_ROOT}" | grep -cE "/birdhouse/?\$" 2>/dev/null)" -eq 1 ]; then
-  BIRDHOUSE_DEPLOY_COMPONENTS_ROOT=.
-else
-  BIRDHOUSE_DEPLOY_COMPONENTS_ROOT="${BIRDHOUSE_DEPLOY_COMPONENTS_ROOT}/.."
-fi
-cd "${BIRDHOUSE_DEPLOY_COMPONENTS_ROOT}" || true  # ignore error for now, empty list expected of known components after
-
-# note: no quotes in 'ls' on purpose to expand glob patterns
-BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN="$( \
-  ls -d1 ./*components/*/ 2>/dev/null \
-  | sed -E "s|\./(.*)/|\1|" \
-  | sed -E '/^[[:space:]]*$/d' \
-  | sed -E 's/^|[[:space:]]+/ -e /' \
-)"
-if [ -z "${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN}" ]; then
-  log WARN "" \
-    "Could not resolve known birdhouse-deploy components." \
-    "Aborting to avoid potentially leaking sensible details." \
-    "Components will not be reported on the platform's JSON endpoint."
-  return
-fi
-BIRDHOUSE_DEPLOY_COMPONENTS_LIST_ACTIVE=$( \
-  echo "${ALL_CONF_DIRS}" \
-  | sed '/^[[:space:]]*$/d' \
-)
-
-# create a JSON list using the specified components
-# each component that starts by './' gets replaced with the below birdhouse prefix to provide contextual information
-# other component locations are considered 'custom' and marked as such to provide contextual information
-BIRDHOUSE_DEPLOY_COMPONENTS_BASE="bird-house/birdhouse-deploy:"
-BIRDHOUSE_DEPLOY_COMPONENTS_LIST=$( \
-  echo "${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_ACTIVE}" \
-  | grep ${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN} \
-  | sed -E 's|^\s*([A-Za-z0-9./_-]+)\s*$|"\1",|g' \
-  | sed -E "s|^\"\./(.*)\"|\"${BIRDHOUSE_DEPLOY_COMPONENTS_BASE}\\1\"|g" \
-  | sed '/^\n*$/d' \
-)
-BIRDHOUSE_DEPLOY_COMPONENTS_LIST="${BIRDHOUSE_DEPLOY_COMPONENTS_LIST%?}"  # remove last comma
-export BIRDHOUSE_DEPLOY_COMPONENTS_JSON="{\"components\": [${BIRDHOUSE_DEPLOY_COMPONENTS_LIST}]}"
+for adir in ${ALL_CONF_DIRS}; do
+  [ -d "${adir}" ] || continue
+  real_adir="$(readlink -f "${adir}" || realpath "${adir}")"
+  if [ "${real_adir}" != "${real_adir#${COMPOSE_DIR%/}/*components/}" ]; then
+    # component is in one of the *components directories in COMPOSE_DIR (not custom)
+    # custom components are not included in the /components endpoint
+    component="bird-house/birdhouse-deploy:${real_adir#${COMPOSE_DIR%/}/}"
+    BIRDHOUSE_DEPLOY_COMPONENTS_LIST="${BIRDHOUSE_DEPLOY_COMPONENTS_LIST}\"${component}\","
+  fi
+done
+export BIRDHOUSE_DEPLOY_COMPONENTS_JSON="{\"components\": [${BIRDHOUSE_DEPLOY_COMPONENTS_LIST%,}]}"

birdhouse/scripts/get-services-json.include.sh

@@ -1,13 +1,5 @@
 #!/bin/sh
 
-THIS_FILE="$(readlink -f "$0" || realpath "$0")"
-THIS_DIR="$(dirname "${THIS_FILE}")"
-COMPOSE_DIR="${COMPOSE_DIR:-$(dirname "${THIS_DIR}")}"
-
-if [ -f "${COMPOSE_DIR}/read-configs.include.sh" ]; then
-    . "${COMPOSE_DIR}/read-configs.include.sh"
-fi
-
 # default value in case of error or missing definitions
 
 for adir in ${ALL_CONF_DIRS}; do