Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AUTH_TOKEN to PORTAINER_AUTH_TOKEN

Browse Source
This commit is contained in:
Tortue Torche 2019-08-11 02:19:57 -04:00 committed by Tortue Torche
parent c502679056
commit e373965987
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
psu
View File

@ -8,10 +8,10 @@ set -e
############################
# Main entrypoint #
# Globals: #
# AUTH_TOKEN #
# HTTPIE_VERIFY_SSL #
# PORTAINER_URL #
# PORTAINER_USER #
# PORTAINER_AUTH_TOKEN #
# PORTAINER_PASSWORD #
# PORTAINER_STACK_NAME #
# PORTAINER_SERVICE_NAME #
@ -166,7 +166,7 @@ main() {
--ignore-stdin \
--verify=$HTTPIE_VERIFY_SSL \
"$PORTAINER_URL/api/stacks" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$STACKS"
echo_debug_safe_json "Get stacks response -> $(echo $STACKS | jq -C .)" "$STACKS"
@ -345,6 +345,7 @@ main() {
# ACTION #
# PORTAINER_USER #
# PORTAINER_PASSWORD #
# PORTAINER_AUTH_TOKEN #
# PORTAINER_URL #
# PORTAINER_STACK_NAME #
# PORTAINER_SERVICE_NAME #
@ -370,6 +371,7 @@ set_globals() {
VERSION=${VERSION}
ACTIONS=${ACTIONS}
ACTION=${ACTION}
PORTAINER_AUTH_TOKEN=${PORTAINER_AUTH_TOKEN}
PORTAINER_USER=${PORTAINER_USER}
PORTAINER_PASSWORD=${PORTAINER_PASSWORD}
PORTAINER_URL=${PORTAINER_URL}
@ -395,6 +397,7 @@ set_globals() {
echo_debug "ACTION -> $ACTION"
echo_debug "PORTAINER_USER -> $PORTAINER_USER"
echo_debug "PORTAINER_PASSWORD -> $PORTAINER_PASSWORD"
echo_debug "PORTAINER_AUTH_TOKEN -> $PORTAINER_AUTH_TOKEN"
echo_debug "PORTAINER_URL -> $PORTAINER_URL"
echo_debug "PORTAINER_STACK_NAME -> $PORTAINER_STACK_NAME"
echo_debug "PORTAINER_SERVICE_NAME -> $PORTAINER_SERVICE_NAME"
@ -869,9 +872,9 @@ mask_variables() {
local message="$1"
if [ "$MASKED_VARIABLES" == "true" ] && [ -n "$PORTAINER_PASSWORD" ]; then
# Mask PORTAINER_PASSWORD and AUTH_TOKEN variable values
# Mask PORTAINER_PASSWORD and PORTAINER_AUTH_TOKEN variable values
local auth_token_masked
auth_token_masked="$AUTH_TOKEN"
auth_token_masked="$PORTAINER_AUTH_TOKEN"
if [ -z "$auth_token_masked" ]; then
auth_token_masked="$PORTAINER_PASSWORD"
fi
@ -903,7 +906,7 @@ mask_variables() {
# ENVIRONMENT_VARIABLES_FILE #
# HTTPIE_VERIFY_SSL #
# PORTAINER_ENDPOINT #
# AUTH_TOKEN #
# PORTAINER_AUTH_TOKEN #
# Arguments: #
# None #
# Returns: #
@ -957,7 +960,7 @@ deploy() {
--verify=$HTTPIE_VERIFY_SSL \
--timeout=300 \
"$PORTAINER_URL/api/stacks" \
"Authorization: Bearer $AUTH_TOKEN" \
"Authorization: Bearer $PORTAINER_AUTH_TOKEN" \
type==2 \
method==string \
endpointId==$PORTAINER_ENDPOINT \
@ -987,7 +990,7 @@ deploy() {
--verify=$HTTPIE_VERIFY_SSL \
--timeout=300 \
"$PORTAINER_URL/api/stacks" \
"Authorization: Bearer $AUTH_TOKEN" \
"Authorization: Bearer $PORTAINER_AUTH_TOKEN" \
type==1 \
method==string \
endpointId==$PORTAINER_ENDPOINT \
@ -1028,7 +1031,7 @@ deploy() {
--verify=$HTTPIE_VERIFY_SSL \
--timeout=300 \
PUT "$PORTAINER_URL/api/stacks/$stack_id" \
"Authorization: Bearer $AUTH_TOKEN" \
"Authorization: Bearer $PORTAINER_AUTH_TOKEN" \
endpointId==$PORTAINER_ENDPOINT \
@json.tmp)
check_for_errors $? "$update"
@ -1045,7 +1048,7 @@ deploy() {
# PORTAINER_STACK_NAME #
# PORTAINER_URL #
# HTTPIE_VERIFY_SSL #
# AUTH_TOKEN #
# PORTAINER_AUTH_TOKEN #
# Arguments: #
# None #
# Returns: #
@ -1074,7 +1077,7 @@ undeploy() {
--ignore-stdin \
--verify=$HTTPIE_VERIFY_SSL \
DELETE "$PORTAINER_URL/api/stacks/$stack_id" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$delete"
echo_debug "Delete action response -> $(echo $delete | jq -C .)"
}
@ -1100,7 +1103,7 @@ docker_info() {
--ignore-stdin \
--verify=$HTTPIE_VERIFY_SSL \
"$PORTAINER_URL/api/endpoints/$PORTAINER_ENDPOINT/docker/info" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$docker_info"
echo "$docker_info"
@ -1126,7 +1129,7 @@ tasks() {
--verify=$HTTPIE_VERIFY_SSL \
"$PORTAINER_URL/api/endpoints/$PORTAINER_ENDPOINT/docker/tasks" \
filters=="$filters" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$tasks"
if [ -n "$state" ]; then
local filter_status
@ -1168,7 +1171,7 @@ services() {
--verify=$HTTPIE_VERIFY_SSL \
"$PORTAINER_URL/api/endpoints/$PORTAINER_ENDPOINT/docker/services" \
filters=="{$filter_service}" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$services"
local filter_mode
@ -1198,7 +1201,7 @@ containers() {
--verify=$HTTPIE_VERIFY_SSL \
"$PORTAINER_URL/api/endpoints/$PORTAINER_ENDPOINT/docker/containers/json" \
filters=="$filters" \
"Authorization: Bearer $AUTH_TOKEN")
"Authorization: Bearer $PORTAINER_AUTH_TOKEN")
check_for_errors $? "$containers"
echo "$containers"
}