Skip to content

Allow a configurable credentials directory #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devaidendale wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow a configurable credentials directory #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f57c43d
feat: allow a configurable credentials directory.
devaidendale Jul 28, 2026
aed76e5
fix: make Recipe uploads invoke their dependencies reliably.
devaidendale Jul 28, 2026
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ If you're on windows, you may also need to add a zip command to your bash interp

You should execute these scripts from the root of the ihub-partner-? repos

These scripts require that you create a creds folder (by default, in ~/creds - please remember that this will hold credentials, so put it in a safe place. If you override the location of the creds directory, please modify setEnvForUpload.sh to change the **$CREDS_DIR** location), which contains filesets for each of the flow servers you want to interact with:
These scripts require that you create a creds folder (by default, in `~/creds` - please remember that this will hold credentials, so put it in a safe place). Set `IHUB_CREDS_DIR` to override that location without modifying the scripts. The folder contains filesets for each of the flow servers you want to interact with:

### **$ALIAS**.token

Expand Down
2 changes: 1 addition & 1 deletion flowTokens.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function usage() {
[ "$#" -ne "0" ] || usage

command=$1
creds_dir=$HOME/creds
creds_dir="${IHUB_CREDS_DIR:-"$HOME/creds"}"

case $command in

Expand Down
27 changes: 14 additions & 13 deletions setEnvForUpload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ENVIRONMENT=$1

CREDS_DIR=~/creds
CREDS_DIR="${IHUB_CREDS_DIR:-"$HOME/creds"}"

CURL_ARGS="$CURL_ARGS"

Expand All @@ -17,32 +17,33 @@ esac

API_HOST="https://api.$ENVIRONMENT.ucroo.org"
HOST="https://flow.$ENVIRONMENT.ucroo.org"
CURL_LOC=$CREDS_DIR/$ENVIRONMENT.curl
FLOW_LOC=$CREDS_DIR/$ENVIRONMENT.flow
API_LOC=$CREDS_DIR/$ENVIRONMENT.api
FLOW_TOKEN_LOC=$CREDS_DIR/$ENVIRONMENT.token
CURL_LOC="$CREDS_DIR/$ENVIRONMENT.curl"
FLOW_LOC="$CREDS_DIR/$ENVIRONMENT.flow"
API_LOC="$CREDS_DIR/$ENVIRONMENT.api"
FLOW_TOKEN_LOC="$CREDS_DIR/$ENVIRONMENT.token"

if [ -f $CURL_LOC ]
if [ -f "$CURL_LOC" ]
then
echo "overriding curl"
CURL_ARGS="$CURL_ARGS $(cat $CURL_LOC)"
CURL_ARGS="$CURL_ARGS $(cat "$CURL_LOC")"
fi

if [ -f $API_LOC ]
if [ -f "$API_LOC" ]
then
echo "overriding api"
API_HOST="$(cat $API_LOC)"
API_HOST="$(cat "$API_LOC")"
fi

if [ -f $FLOW_LOC ]
if [ -f "$FLOW_LOC" ]
then
echo "overriding flow"
HOST="$(cat $FLOW_LOC)"
HOST="$(cat "$FLOW_LOC")"
fi

if [ -f $FLOW_TOKEN_LOC ]
if [ -f "$FLOW_TOKEN_LOC" ]
then
export FLOW_TOKEN=$(cat $FLOW_TOKEN_LOC)
export FLOW_TOKEN
FLOW_TOKEN=$(cat "$FLOW_TOKEN_LOC")
echo "using token"
else
echo "no available flow token. You must have a $CREDS_DIR/$ENVIRONMENT.token file populated with an active flow access token from the server."
Expand Down
10 changes: 6 additions & 4 deletions uploadRecipe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/sh
#!/usr/bin/env bash

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
FLOW="$1"
ENVIRONMENT="$2"
case $# in
Expand All @@ -10,7 +12,7 @@ case $# in
;;
*)
echo "not enough arguments supplied. You must supply the recipeDirectory to this command."
return 1
exit 1
;;
esac

Expand Down Expand Up @@ -108,15 +110,15 @@ case "$ENVIRONMENT" in
;;
esac

source setEnvForUpload.sh $ENVIRONMENT
source "$SCRIPT_DIR/setEnvForUpload.sh" "$ENVIRONMENT"
[ -e "${FLOW}.zip" ] && rm ${FLOW}.zip
# Zip the staged copy, preserving the same archive layout as `zip -r ${FLOW}.zip $FLOW`.
( cd "$STAGING" && zip -r "${STAGING}/upload.zip" "$FLOW" )
mv "${STAGING}/upload.zip" "${FLOW}.zip"
if [ -z $FLOW_TOKEN ] ;
then
rm -rf "$STAGING"
return 1
exit 1
else
http_response=$(curl $CURL_ARGS -s -o uploadRecipeResponse.txt -w "%{http_code}" -X POST -H "flow-token: $FLOW_TOKEN" -H "Content-Type: application/octet-stream" -H "format: zip" -H "name: ${FLOW}" "$HOST/ihub-viewer/repository/recipes" --data-binary "@${FLOW}.zip")
fi
Expand Down