Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 150 additions & 1 deletion build-tools/cncluster
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,8 @@ function subcmd_debug_shell() {
fi
repo="ghcr.io/digital-asset/decentralized-canton-sync-dev/docker"

local SHELL_COMMAND="${*:-/bin/bash}"

_info "Deploying debug pod on version $VERSION_NUMBER"
kubectl apply --wait -f - <<EOF
apiVersion: v1
Expand All @@ -1479,10 +1481,11 @@ spec:
effect: "NoSchedule"
EOF

# shellcheck disable=SC2086
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's try to remove the shellcheck disable=SC2086 by adding the parentheses (like "$SHELL_COMMAND")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then it would not work. We need this to expand.

( _info "Waiting for debug pod to become ready" && \
kubectl wait --for=condition=Ready pod splice-debug --timeout=30s && \
_info "Opening terminal on debug pod" && \
kubectl exec -it splice-debug -- /bin/bash ) || true
kubectl exec -it splice-debug -- $SHELL_COMMAND ) || true

_info "Deleting debug pod"
kubectl delete pod splice-debug
Expand Down Expand Up @@ -2172,6 +2175,152 @@ EOF
_update_cluster_config "$deployment_config" "operatorDeployment"
}

###

subcommand_whitelist[psql]=""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could we add the ### on top to match with the other methods

function subcmd_psql() {
_cluster_must_exist

if [ $# -ne 2 ]; then
_error "Usage: $SCRIPTNAME psql <namespace> <application>"
exit 1
fi

local NAMESPACE="$1"
local APPLICATION="$2"

_info "Retrieving DB connection info from pod description..."
local DB_INIT_COMMAND
DB_INIT_COMMAND=$(
kubectl describe pod \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: couldn't we use kubectl get pod instead of describe here, would seem less brittle?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it would make it much more reliable. We'd still need to sed the psql command out of a larger script in the "command" field. We'd just exchange a grep -i psql for a more complicated JSON path expression.

--namespace "${NAMESPACE}" \
--selector "app=${APPLICATION}" \
| grep -i psql \
| sed -nE 's/^.*(psql.?*) 2>&1.*$/\1/p'
)

if [ -z "${DB_INIT_COMMAND}" ]; then
_error "Application ${APPLICATION} in namespace ${NAMESPACE} does not have an associated database."
exit 1
fi

eval "set -- $DB_INIT_COMMAND"
while [ $# -gt 0 ]; do
case "$1" in
-h|--host)
local DB_HOST="$2"
shift 2
;;
-h=*|--host=*)
local DB_HOST="${1#*=}"
shift
;;
-p|--port)
local DB_PORT="$2"
shift 2
;;
-p=*|--port=*)
local DB_PORT="${1#*=}"
shift
;;
-U|--username)
local DB_USERNAME="$2"
shift 2
;;
-U=*|--username=*)
local DB_USERNAME="${1#*=}"
shift
;;
-c|--command)
local DB_CREATE_STATEMENT="$2"
shift 2
;;
-c=*|--command=*)
local DB_CREATE_STATEMENT="${1#*=}"
shift
;;
*)
shift
;;
esac
done

if [ -z "${DB_HOST:-}" ]; then
_error "Failed to retrieve DB hostname from pod description."
exit 1
fi

if [ -z "${DB_PORT:-}" ]; then
_error "Failed to retrieve DB port from pod description."
exit 1
fi

if [ -z "${DB_USERNAME:-}" ]; then
_error "Failed to retrieve DB username from pod description."
exit 1
fi

# shellcheck disable=SC2086
set -- $DB_CREATE_STATEMENT
if [ "${1,,}" == "create" ] && [ "${2,,}" == "database" ] && [ -n "$3" ]; then
DB_NAME="$3"
else
_error "Failed to retrieve DB name from pod description."
exit 1
fi

local PASSWORD_REF
PASSWORD_REF=$(
kubectl get deployment \
--namespace "${NAMESPACE}" \
--output 'jsonpath={.spec.template.spec.initContainers[].env[?(@.name == "PGPASSWORD")].valueFrom.secretKeyRef}' \
"${APPLICATION}"
)
local SECRET_NAME
SECRET_NAME=$(jq -r '.name' <<< "$PASSWORD_REF")
local SECRET_KEY
SECRET_KEY=$(jq -r '.key' <<< "$PASSWORD_REF")

_info "Retrieving DB password from secret [${SECRET_NAME}]..."
local DB_PASSWORD
DB_PASSWORD=$(
kubectl get secret \
--namespace "${NAMESPACE}" \
--output "jsonpath={.data.${SECRET_KEY}}" \
"${SECRET_NAME}" \
| base64 --decode
)

if [ -z "${DB_PASSWORD}" ]; then
_error "Failed to retrieve DB password."
exit 1
fi

case "${APPLICATION}" in
participant-*)
local SEARCH_PATH="participant"
;;
sequencer-*)
local SEARCH_PATH="sequencer"
;;
mediator-*)
local SEARCH_PATH="mediator"
;;
*)
local SEARCH_PATH="$DB_NAME"
;;
esac

subcmd_debug_shell /bin/env \
PGPASSWORD="$DB_PASSWORD" \
PGOPTIONS="--search_path=${SEARCH_PATH},public" \
psql \
--host="$DB_HOST" \
--port="$DB_PORT" \
--username="$DB_USERNAME" \
--dbname="$DB_NAME"
}

################################
### Main
################################
Expand Down