Skip to content
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

Truenas deploy websocket #6108

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

Truenas deploy websocket #6108

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75b4bb3
Merge pull request #6096 from acmesh-official/dev
Neilpang Nov 14, 2024
413a916
Create truenas_ws.sh
Attackwave Nov 16, 2024
5d6f1bd
Merge pull request #6110 from acmesh-official/dev
Neilpang Nov 23, 2024
1e52efa
Merge branch 'acmesh-official:master' into Truenas-Deploy-Websocket
Attackwave Nov 24, 2024
d7855e8
Update truenas_ws.sh (shfmt and shellcheck)
Attackwave Nov 24, 2024
f2a311b
Update truenas_ws.sh (added return instead exit)
Attackwave Nov 25, 2024
9110375
Update truenas_ws.sh (fixed shfmt)
Attackwave Nov 25, 2024
4424033
Update truenas_ws.sh (Interpreter changed from bash to sh)
Attackwave Nov 25, 2024
ebaf4c9
Update truenas_ws.sh (Output new certificate name)
Attackwave Nov 25, 2024
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
30 changes: 16 additions & 14 deletions deploy/truenas_ws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ _ws_call() {
_ws_response=$(midclt -K "$DEPLOY_TRUENAS_APIKEY" call "$1")
fi
_debug "_ws_response" "$_ws_response"
printf "%s" $_ws_response
printf "%s" "$_ws_response"
return 0
}

Expand Down Expand Up @@ -99,7 +99,7 @@ _ws_get_job_result() {
then
_ws_result="$(printf "%s" "$_ws_response" | jq '.[]."result"')"
_debug "_ws_result" "$_ws_result"
printf "%s" $_ws_result
printf "%s" "$_ws_result"
_ws_error="$(printf "%s" "$_ws_response" | jq '.[]."error"')"
if [ "$_ws_error" != "null" ]
then
Expand Down Expand Up @@ -175,7 +175,7 @@ truenas_ws_deploy() {
then
_err "Error calling system.ready:"
_err "$_ws_response"
exit $_ws_re
exit $_ws_ret
Copy link
Member

Choose a reason for hiding this comment

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

please help remove all the exit. use return instead.

Copy link
Author

Choose a reason for hiding this comment

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

Done

fi

if [ "$_ws_response" != "TRUE" ]
Expand All @@ -196,7 +196,7 @@ truenas_ws_deploy() {
_truenas_version=$(printf "%s" "$_ws_response" | jq -r '."version"' | cut -d '-' -f 3)
_info "TrueNAS system: $_truenas_system"
_info "TrueNAS version: $_truenas_version"
if [ "$_truenas_system" != "SCALE" ] && ["$_truenas_system" != "CORE" ]
if [ "$_truenas_system" != "SCALE" ] && [ "$_truenas_system" != "CORE" ]
then
_err "Cannot gather TrueNAS system. Nor CORE oder SCALE detected."
exit 10
Expand All @@ -210,7 +210,6 @@ truenas_ws_deploy() {
_ui_certificate_name=$(printf "%s" "$_ws_response" | jq -r '."ui_certificate"."name"')
_info "Current WebUI certificate ID: $_ui_certificate_id"
_info "Current WebUI certificate name: $_ui_certificate_name"
_info "WebUI redirect to https: $_ui_http_redirect"

########## Upload new certificate

Expand All @@ -225,9 +224,10 @@ truenas_ws_deploy() {
exit 3
fi
_ws_result=$(_ws_get_job_result "$_ws_jobid")
if [ $? -gt 0 ]
_ws_ret=$?
if [ $_ws_ret -gt 0 ]
then
exit $?
exit $_ws_ret
fi
_debug "_ws_result" "$_ws_result"
_new_certid=$(printf "%s" "$_ws_result" | jq -r '."id"')
Expand All @@ -251,11 +251,11 @@ truenas_ws_deploy() {
then
_info "Replace app certificates..."
_ws_response=$(_ws_call "app.query")
for _app_name in $(printf "%s" $_ws_response | jq -r '.[]."name"')
for _app_name in $(printf "%s" "$_ws_response" | jq -r '.[]."name"')
do
_info "Checking app $_app_name..."
_ws_response=$(_ws_call "app.config" "$_app_name")
if [ "$(printf "%s" $_ws_response | jq -r '."network" | has("certificate_id")')" = "true" ]
if [ "$(printf "%s" "$_ws_response" | jq -r '."network" | has("certificate_id")')" = "true" ]
then
_info "App has certificate option, setup new certificate..."
_info "App will be redeployed after updating the certificate."
Expand All @@ -267,9 +267,10 @@ truenas_ws_deploy() {
exit 3
fi
_ws_result=$(_ws_get_job_result "$_ws_jobid")
if [ $? -gt 0 ]
_ws_ret=$?
if [ $_ws_ret -gt 0 ]
then
exit $?
exit $_ws_ret
fi
_debug "_ws_result" "$_ws_result"
_info "App certificate replaced."
Expand Down Expand Up @@ -305,10 +306,11 @@ truenas_ws_deploy() {
_err "No JobID returned from websocket method."
exit 3
fi
_ws_result=$(_ws_get_job_result $_ws_jobid)
if [ $? -gt 0 ]
_ws_result=$(_ws_get_job_result "$_ws_jobid")
_ws_ret=$?
if [ $_ws_ret -gt 0 ]
then
exit $?
exit $_ws_ret
fi


Expand Down