Skip to content

Commit 99d2a4e

Browse files
authored
Add to the invalid instance names (#1978)
Add `DEVICE`, `DEVICES`, `STORAGE`, `STORAGE2`, `STORAGE3`, and `STORAGE4` to the list of invalid application instance names.
1 parent c17ac8c commit 99d2a4e

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.scripts/appname_is_valid.sh

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,30 @@ appname_is_valid() {
1010
AppName="${AppName#:*}"
1111
fi
1212
if [[ ${AppName} =~ ^[a-zA-Z][a-zA-Z0-9]*(__[a-zA-Z0-9]+)?$ ]]; then
13-
local InvalidInstanceNames="CONTAINER|ENABLED|ENVIRONMENT|HOSTNAME|PORT|NETWORK|RESTART|TAG"
13+
local -a InvalidInstanceNames=(
14+
CONTAINER
15+
DEVICE
16+
DEVICES
17+
ENABLED
18+
ENVIRONMENT
19+
HOSTNAME
20+
PORT
21+
NETWORK
22+
RESTART
23+
STORAGE
24+
STORAGE2
25+
STORAGE3
26+
STORAGE4
27+
TAG
28+
)
29+
local InvalidInstanceNamesRegex
30+
{
31+
IFS='|'
32+
InvalidInstanceNamesRegex="${InvalidInstanceNames[*]}"
33+
}
1434
local InstanceName
1535
InstanceName="$(run_script 'appname_to_instancename' "${AppName}")"
16-
[[ ! ${InstanceName^^} =~ ${InvalidInstanceNames} ]]
36+
[[ ! ${InstanceName^^} =~ ${InvalidInstanceNamesRegex} ]]
1737
return
1838
fi
1939
false

0 commit comments

Comments
 (0)