Skip to content

backport owls-99865 to release/3.4 branch #3202

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
merged 3 commits into from
Jun 24, 2022
Merged

backport owls-99865 to release/3.4 branch #3202

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08e6a7a
validate that domainUID is a valid WebLogic domain name
alai8 Jun 21, 2022
04708c5
add comment to validateDomainUid method
alai8 Jun 22, 2022
8a0c543
backport from main
alai8 Jun 22, 2022
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
29 changes: 27 additions & 2 deletions kubernetes/samples/scripts/common/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,28 @@ function validateLowerCase {
fi
}

#
# Function to check if a value is a valid WLS domain name.
# must include only alphanumeric characters, hyphens (-)
# or underscore characters (_) and contain at least one letter
# but must start with an alphanumeric or underscore character.
#
# $1 - name of object being checked
# $2 - value to check
validateWlsDomainName() {
echo "validateWlsDomainName called with $2"
if ! [[ "$2" =~ ^[a-z_][a-z0-9_.-]*$ ]] ; then
validationError "$1 with value of $2 is not a valid WebLogic domain name. "\
"A valid WebLogic domain name must include only alphanumeric characters, hyphens (-) "\
"or underscore characters (_) but must start with an alphanumeric or underscore character."
else
if ! [[ "$2" =~ ^.*[a-z0-9].*$ ]] ; then
validationError "$1 with value of $2 is not a valid WebLogic domain name. "\
"A valid WebLogic domain name must contain at least one alphanumeric character."
fi
fi
}

#
# Function to check if a value is lowercase and legal DNS name
# $1 - name of object being checked
Expand Down Expand Up @@ -112,10 +134,13 @@ function validateVersion {

#
# Function to ensure the domain uid is a legal DNS name
# Because the domain uid is also used as a WebLogic domain
# name, it must also be a valid WebLogic domain name.
#
function validateDomainUid {
validateLowerCase "domainUID" ${domainUID}
validateDNS1123LegalName domainUID ${domainUID}
validateLowerCase "domainUID" "${domainUID}"
validateDNS1123LegalName "domainUID" "${domainUID}"
validateWlsDomainName "domainUID" "${domainUID}"
}

#
Expand Down