Skip to content

Commit

Permalink
chore: changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Meissner committed Feb 19, 2025
1 parent 5d5ca77 commit 1cd869b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
5 changes: 1 addition & 4 deletions parts/linux/cloud-init/artifacts/secure-tls-bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ logs_to_events() {
local endTime=$(date +"%F %T.%3N")

msg_string=$(jq -n --arg Status "Succeeded" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "bootstrap" ]; then
if [ "$ret" != "0" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" --arg LogTail "$(tail -n 20 $LOG_FILE_PATH)" '{Status: $Status, Hostname: $Hostname, LogTail: $LogTail}')
fi
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "download" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
fi

json_string=$( jq -n \
--arg Timestamp "${startTime}" \
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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

- path: /etc/systemd/system/secure-tls-bootstrap.service
permissions: "0644"
Expand Down
5 changes: 1 addition & 4 deletions pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ logs_to_events() {
local endTime=$(date +"%F %T.%3N")

msg_string=$(jq -n --arg Status "Succeeded" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "bootstrap" ]; then
if [ "$ret" != "0" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" --arg LogTail "$(tail -n 20 $LOG_FILE_PATH)" '{Status: $Status, Hostname: $Hostname, LogTail: $LogTail}')
fi
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "download" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
fi

json_string=$( jq -n \
--arg Timestamp "${startTime}" \
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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

- path: /etc/systemd/system/secure-tls-bootstrap.service
permissions: "0644"
Expand Down
5 changes: 1 addition & 4 deletions pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line105.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ logs_to_events() {
local endTime=$(date +"%F %T.%3N")

msg_string=$(jq -n --arg Status "Succeeded" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "bootstrap" ]; then
if [ "$ret" != "0" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" --arg LogTail "$(tail -n 20 $LOG_FILE_PATH)" '{Status: $Status, Hostname: $Hostname, LogTail: $LogTail}')
fi
if [ "$ret" != "0" ] && [ "${SUB_COMMAND,,}" == "download" ]; then
msg_string=$(jq -n --arg Status "Failed" --arg Hostname "$(uname -n)" '{Status: $Status, Hostname: $Hostname}')
fi

json_string=$( jq -n \
--arg Timestamp "${startTime}" \
Expand Down

0 comments on commit 1cd869b

Please sign in to comment.