Skip to content

Hide keystore logs #618

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

Merged
leochr merged 2 commits into from
Jan 14, 2025
Merged

Hide keystore logs #618

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
afaab41
Hide keystore logs
kabicin Nov 5, 2024
192e040
Revert ga/latest/kernel/Dockerfile changes
kabicin Jan 14, 2025
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
12 changes: 6 additions & 6 deletions ga/latest/kernel/helpers/build/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# (C) Copyright IBM Corporation 2020, 2023.
# (C) Copyright IBM Corporation 2020, 2025.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,9 +20,7 @@ else
FEATURES_INSTALLED=false
fi

if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ibm/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down Expand Up @@ -128,8 +126,10 @@ function main() {
if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then
if [ ! -e $keystorePath ]; then
# Generate the keystore.xml
export KEYSTOREPWD=$(openssl rand -base64 32)
hideLogs
KEYSTOREPWD=$(openssl rand -base64 32)
sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml
showLogs
chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml
fi
fi
Expand Down Expand Up @@ -231,4 +231,4 @@ function parseCommaList() {
done
}

main "$@"
main "$@"
6 changes: 2 additions & 4 deletions ga/latest/kernel/helpers/build/features.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# (C) Copyright IBM Corporation 2023.
# (C) Copyright IBM Corporation 2023, 2025.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,9 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ibm/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
6 changes: 2 additions & 4 deletions ga/latest/kernel/helpers/build/infinispan-client-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# (C) Copyright IBM Corporation 2020.
# (C) Copyright IBM Corporation 2020, 2025.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,9 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ibm/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down
30 changes: 30 additions & 0 deletions ga/latest/kernel/helpers/build/internal/logger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# (C) Copyright IBM Corporation 2025.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

function main() {
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
}

function hideLogs() {
exec 3>&1 >/dev/null 4>&2 2>/dev/null
}

function showLogs() {
exec 1>&3 3>&- 2>&4 4>&-
}

main
6 changes: 2 additions & 4 deletions ga/latest/kernel/helpers/build/populate_scc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# (C) Copyright IBM Corporation 2020, 2024
# (C) Copyright IBM Corporation 2020, 2025.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,9 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
if [ "$VERBOSE" != "true" ]; then
exec >/dev/null
fi
. /opt/ibm/helpers/build/internal/logger.sh

set -Eeox pipefail

Expand Down