sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#62763 Fix shellcheck issues

Browse Source 
Add a new example /etc/default/ngcp-api file, so that we can install it
(for NGCP it will be overwritten by the templates equivalent) and gives
an idea of what is expected to be set there, and so that we can use it
for shellcheck to let it understand what variables are set there.

Warned-by: shellcheck
Change-Id: I94b0e4cf7867e390917105e49d0638394841742b
mr13.4
Guillem Jover 8 months ago
parent b67dc2c588
commit 3f75e81bc6
10 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
.shellcheckrc
Unescape View File

@ -0,0 +1,3 @@
external-sources=true
# Used for jdg-tap integration.
source-path=source

1
debian/ngcp-panel.install vendored
Unescape View File

@ -1,3 +1,4 @@
etc/default/ngcp-api etc/default/
etc/logging.conf etc/ngcp-panel/
etc/ngcp_panel.conf etc/ngcp-panel/
lib/NGCP/Panel/I18N/* usr/share/perl5/NGCP/Panel/I18N

10
etc/default/ngcp-api
Unescape View File

@ -0,0 +1,10 @@
# Example NGCP REST API configuration file.
NGCP_API_IP=127.0.0.1
NGCP_API_PORT=1442
NGCP_API_IFACE=lo
NGCP_API_SSLVERIFY=no
NGCP_API_SSLVERIFY_LOOPBACK=no
NGCP_API_READ_TIMEOUT=60
AUTH_SYSTEM_LOGIN=system
AUTH_SYSTEM_PASSWORD=00000000000000000000
AUTH_SYSTEM_ROLES=admin

3
t/api-rest/testrunner
Unescape View File

@ -54,7 +54,8 @@ echo "Finished main setup, now running tests ..."
export CATALYST_SERVER_SUB="https://${SERVER}:443"
export CATALYST_SERVER="https://${SERVER}:1443"
export NGCP_SESSION_ID="$(printf %03d $((RANDOM % 1000)))$(date +%s)"
NGCP_SESSION_ID="$(printf %03d $((RANDOM % 1000)))$(date +%s)"
export NGCP_SESSION_ID
export NGCP_TYPE
RC=0

1
tools/ngcp-api.inc
Unescape View File

@ -23,6 +23,7 @@ importcreds () {
echo "${CREDS} present, checking perms"
if stat "${CREDS}" | grep -q "Access: (${PERMS}" 1>/dev/null ; then
echo "${CREDS} permissions ok"
# shellcheck source=./etc/default/ngcp-api
. "${CREDS}"
else
echo "Error: ${CREDS} must have permissions ${PERMS}" >&2

7
tools_bin/ngcp-api-delete
Unescape View File

@ -19,6 +19,7 @@ EOF
if [ -z "${APIUSER}" ]; then
if [ -f "${TOOLS}" ]; then
# shellcheck source=./tools/ngcp-api.inc
source "${TOOLS}"
importcreds "${USERCREDS}" 0600
@ -34,6 +35,8 @@ if [ -z "${APIUSER}" ]; then
fi
fi
CURL_OPTS=()
while getopts "hv" OPTION
do
case ${OPTION} in
@ -41,7 +44,7 @@ do
usage
;;
v)
VERBOSE="--verbose"
CURL_OPTS+=(--verbose)
;;
?)
usage
@ -56,7 +59,7 @@ if [ -z "${URL}" ] ; then
fi
validateurl "$URL"
${CURL} -i ${VERBOSE} -X DELETE \
${CURL} -i "${CURL_OPTS[@]}" -X DELETE \
"${APIREALM[@]}" \
-H 'Connection: close' \
"${HEADERS}" --user "${APIUSER}" --insecure "${URL}"

7
tools_bin/ngcp-api-get
Unescape View File

@ -19,6 +19,7 @@ EOF
if [ -z "${APIUSER}" ]; then
if [ -f "${TOOLS}" ]; then
# shellcheck source=./tools/ngcp-api.inc
source "${TOOLS}"
importcreds "${USERCREDS}" 0600
@ -34,6 +35,8 @@ if [ -z "${APIUSER}" ]; then
fi
fi
CURL_OPTS=()
while getopts "hv" OPTION
do
case ${OPTION} in
@ -41,7 +44,7 @@ do
usage
;;
v)
VERBOSE="--verbose"
CURL_OPTS+=(--verbose)
;;
?)
usage
@ -56,7 +59,7 @@ if [ -z "${URL}" ]; then
fi
validateurl "$URL"
${CURL} -i ${VERBOSE} -X GET \
${CURL} -i "${CURL_OPTS[@]}" -X GET \
"${APIREALM[@]}" \
-H 'Connection: close' \
--user "${APIUSER}" --insecure "${URL}"

8
tools_bin/ngcp-api-patch
Unescape View File

@ -21,6 +21,7 @@ EOF
if [ -z "${APIUSER}" ]; then
if [ -f "${TOOLS}" ]; then
# shellcheck source=./tools/ngcp-api.inc
source "${TOOLS}"
importcreds "${USERCREDS}" 0600
@ -35,6 +36,7 @@ if [ -z "${APIUSER}" ]; then
exit 1
fi
fi
CURL_OPTS=()
INPUT=(-T -)
CTYPE="application/json-patch+json"
PREFER="representation"
@ -47,7 +49,7 @@ do
;;
f)
INPUT=()
FILE_INPUT=(--data-binary @${OPTARG})
FILE_INPUT=(--data-binary "@${OPTARG}")
if [ ! -f "${OPTARG}" ]; then
echo "No '${OPTARG}' file found"
usage
@ -57,7 +59,7 @@ do
PREFER="minimal"
;;
v)
VERBOSE="--verbose"
CURL_OPTS+=(--verbose)
;;
?)
usage
@ -72,7 +74,7 @@ if [ -z "${URL}" ] ; then
fi
validateurl "$URL"
${CURL} -i ${VERBOSE} -X PATCH \
${CURL} -i "${CURL_OPTS[@]}" -X PATCH \
"${APIREALM[@]}" \
-H 'Connection: close' -H "Prefer: return=${PREFER}" \
-H "Content-Type: ${CTYPE}" \

8
tools_bin/ngcp-api-post
Unescape View File

@ -20,6 +20,7 @@ EOF
if [ -z "${APIUSER}" ]; then
if [ -f "${TOOLS}" ]; then
# shellcheck source=./tools/ngcp-api.inc
source "${TOOLS}"
importcreds "${USERCREDS}" 0600
@ -34,6 +35,7 @@ if [ -z "${APIUSER}" ]; then
exit 1
fi
fi
CURL_OPTS=()
INPUT=(-T -)
while getopts "f:hv" OPTION
@ -44,14 +46,14 @@ do
;;
f)
INPUT=()
FILE_INPUT=(--data-binary @${OPTARG})
FILE_INPUT=(--data-binary "@${OPTARG}")
if [ ! -f "${OPTARG}" ]; then
echo "No '{$OPTARG}' file found"
usage
fi
;;
v)
VERBOSE="--verbose"
CURL_OPTS+=(--verbose)
;;
?)
usage
@ -67,7 +69,7 @@ fi
validateurl "$URL"
CTYPE=${2:-application/json}
${CURL} -i ${VERBOSE} -X POST \
${CURL} -i "${CURL_OPTS[@]}" -X POST \
"${APIREALM[@]}" \
-H 'Connection: close' -H 'Prefer: return=representation' \
-H "Content-Type: ${CTYPE}" \

8
tools_bin/ngcp-api-put
Unescape View File

@ -20,6 +20,7 @@ EOF
if [ -z "${APIUSER}" ]; then
if [ -f "${TOOLS}" ]; then
# shellcheck source=./tools/ngcp-api.inc
source "${TOOLS}"
importcreds "${USERCREDS}" 0600
@ -34,6 +35,7 @@ if [ -z "${APIUSER}" ]; then
exit 1
fi
fi
CURL_OPTS=()
INPUT=(-T -)
while getopts "f:hv" OPTION
@ -44,14 +46,14 @@ do
;;
f)
INPUT=()
FILE_INPUT=(--data-binary @${OPTARG})
FILE_INPUT=(--data-binary "@${OPTARG}")
if [ ! -f "${OPTARG}" ]; then
echo "No '${OPTARG}' file found"
usage
fi
;;
v)
VERBOSE="--verbose"
CURL_OPTS+=(--verbose)
;;
?)
usage
@ -67,7 +69,7 @@ fi
validateurl "$URL"
CTYPE=${2:-application/json}
${CURL} -i ${VERBOSE} -X PUT \
${CURL} -i "${CURL_OPTS[@]}" -X PUT \
"${APIREALM[@]}" \
-H 'Connection: close' -H 'Prefer: return=representation' \
-H "Content-Type: ${CTYPE}" \

Write Preview
Loading…
Cancel
Save