Skip to content

Commit fffe593

Browse files
edewataclaude
edewata
and
claude
committed
Simplify and standardize TOMCAT_FLAVOR tests
Streamline TOMCAT_FLAVOR conditional logic: - Replace expected/expected_new_tomcat10 with expected_old/expected_new - Replace if/else conditionals with direct diff expected_$TOMCAT_FLAVOR output - Remove "Detected Tomcat flavor:" debug print statements - Change echo >> $GITHUB_ENV to echo | tee -a $GITHUB_ENV - Simplify computation into one-liner test command This reduces code duplication, eliminates output noise, improves readability, and simplifies test maintenance across all workflow files. Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>
1 parent de3a926 commit fffe593

31 files changed

Lines changed: 589 additions & 1739 deletions

‎.github/workflows/acme-basic-test.yml‎

Lines changed: 28 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,10 @@ jobs:
134134
sed -n '/^DEBUG: Command:/p' stderr | tee output
135135
wc -l output
136136
137-
- name: Calculate Tomcat flavor
138-
run: |
139-
TOMCAT_FLAVOR=$(docker exec pki bash -c '
140-
if [ -f /usr/libexec/tomcat/tomcat-run.sh ]; then
141-
printf "new"
142-
else
143-
printf "old"
144-
fi
145-
')
146-
echo "TOMCAT_FLAVOR=$TOMCAT_FLAVOR" >> $GITHUB_ENV
147-
echo "Detected Tomcat flavor: $TOMCAT_FLAVOR"
137+
- name: Get Tomcat flavor
138+
run: |
139+
TOMCAT_FLAVOR=$(docker exec pki test -f /usr/libexec/tomcat/tomcat-run.sh && echo "new" || echo "old")
140+
echo "TOMCAT_FLAVOR=$TOMCAT_FLAVOR" | tee -a $GITHUB_ENV
148141
149142
- name: Check PKI server base dir after installation
150143
run: |
@@ -156,7 +149,7 @@ jobs:
156149
| tee output
157150
158151
# TODO: review permissions
159-
cat > expected << EOF
152+
cat > expected_old << EOF
160153
drwxrwx--- pkiuser pkiuser acme
161154
lrwxrwxrwx pkiuser pkiuser alias -> /var/lib/pki/pki-tomcat/conf/alias
162155
lrwxrwxrwx pkiuser pkiuser bin -> /usr/share/tomcat/bin
@@ -170,7 +163,7 @@ jobs:
170163
drwxrwx--- pkiuser pkiuser work
171164
EOF
172165
173-
cat > expected_new_tomcat10 << EOF
166+
cat > expected_new << EOF
174167
drwxrwx--- pkiuser pkiuser acme
175168
lrwxrwxrwx pkiuser pkiuser alias -> /var/lib/pki/pki-tomcat/conf/alias
176169
lrwxrwxrwx pkiuser pkiuser bin -> /usr/share/tomcat/bin
@@ -184,13 +177,7 @@ jobs:
184177
drwxrwx--- pkiuser pkiuser work
185178
EOF
186179
187-
if [ $TOMCAT_FLAVOR == 'new' ]; then
188-
echo "New tomcat 10!"
189-
diff expected_new_tomcat10 output
190-
else
191-
echo "Old tomcat 10!"
192-
diff expected output
193-
fi
180+
diff expected_$TOMCAT_FLAVOR output
194181
195182
- name: Check PKI server conf dir after installation
196183
run: |
@@ -202,7 +189,7 @@ jobs:
202189
| tee output
203190
204191
# TODO: review permissions
205-
cat > expected << EOF
192+
cat > expected_old << EOF
206193
drwxrwx--- pkiuser pkiuser Catalina
207194
drwxrwx--- pkiuser pkiuser acme
208195
drwxrwx--- pkiuser pkiuser alias
@@ -219,7 +206,7 @@ jobs:
219206
lrwxrwxrwx pkiuser pkiuser web.xml -> /etc/tomcat/web.xml
220207
EOF
221208
222-
cat > expected_new_tomcat10 << EOF
209+
cat > expected_new << EOF
223210
drwxrwx--- pkiuser pkiuser Catalina
224211
drwxrwx--- pkiuser pkiuser acme
225212
drwxrwx--- pkiuser pkiuser alias
@@ -236,13 +223,7 @@ jobs:
236223
lrwxrwxrwx pkiuser pkiuser web.xml -> /etc/tomcat/web.xml
237224
EOF
238225
239-
if [ $TOMCAT_FLAVOR == 'new' ]; then
240-
echo "New tomcat 10!"
241-
diff expected_new_tomcat10 output
242-
else
243-
echo "Old tomcat 10!"
244-
diff expected output
245-
fi
226+
diff expected_$TOMCAT_FLAVOR output
246227
247228
- name: Check PKI server conf/alias dir after installation
248229
run: |
@@ -320,27 +301,21 @@ jobs:
320301
DATE=$(date +'%Y-%m-%d')
321302
322303
# TODO: review permissions
323-
cat > expected << EOF
304+
cat > expected_old << EOF
324305
drwxrwx--- pkiuser pkiuser acme
325306
drwxrwx--- pkiuser pkiuser backup
326307
drwxrwx--- pkiuser pkiuser ca
327308
-rw-r--r-- pkiuser pkiuser localhost_access_log.$DATE.txt
328309
EOF
329310
330-
cat > expected_new_tomcat10 << EOF
311+
cat > expected_new << EOF
331312
drwxrwx--- pkiuser pkiuser acme
332313
drwxrwx--- pkiuser pkiuser backup
333314
drwxrwx--- pkiuser pkiuser ca
334315
-rw-r----- pkiuser pkiuser localhost_access_log.$DATE.txt
335316
EOF
336317
337-
if [ $TOMCAT_FLAVOR == 'new' ]; then
338-
echo "New tomcat 10!"
339-
diff expected_new_tomcat10 output
340-
else
341-
echo "Old tomcat 10!"
342-
diff expected output
343-
fi
318+
diff expected_$TOMCAT_FLAVOR output
344319
345320
- name: Check ACME base dir
346321
if: always()
@@ -352,23 +327,17 @@ jobs:
352327
| tee output
353328
354329
# TODO: review permissions
355-
cat > expected << EOF
330+
cat > expected_old << EOF
356331
lrwxrwxrwx pkiuser pkiuser conf -> /var/lib/pki/pki-tomcat/conf/acme
357332
lrwxrwxrwx pkiuser pkiuser logs -> /var/lib/pki/pki-tomcat/logs/acme
358333
EOF
359334
360-
cat > expected_new_tomcat10 << EOF
335+
cat > expected_new << EOF
361336
lrwxrwxrwx pkiuser pkiuser conf -> /var/lib/pki/pki-tomcat/conf/acme
362337
lrwxrwxrwx pkiuser pkiuser logs -> /var/lib/pki/pki-tomcat/logs/acme
363338
EOF
364339
365-
if [ $TOMCAT_FLAVOR == 'new' ]; then
366-
echo "New tomcat 10!"
367-
diff expected_new_tomcat10 output
368-
else
369-
echo "Old tomcat 10!"
370-
diff expected output
371-
fi
340+
diff expected_$TOMCAT_FLAVOR output
372341
373342
- name: Check ACME conf dir
374343
run: |
@@ -380,25 +349,19 @@ jobs:
380349
| tee output
381350
382351
# TODO: review permissions
383-
cat > expected << EOF
352+
cat > expected_old << EOF
384353
-rw-rw---- pkiuser pkiuser database.conf
385354
-rw-rw---- pkiuser pkiuser issuer.conf
386355
-rw-rw---- pkiuser pkiuser realm.conf
387356
EOF
388357
389-
cat > expected_new_tomcat10 << EOF
358+
cat > expected_new << EOF
390359
-rw-rw---- pkiuser pkiuser database.conf
391360
-rw-rw---- pkiuser pkiuser issuer.conf
392361
-rw-rw---- pkiuser pkiuser realm.conf
393362
EOF
394363
395-
if [ $TOMCAT_FLAVOR == 'new' ]; then
396-
echo "New tomcat 10!"
397-
diff expected_new_tomcat10 output
398-
else
399-
echo "Old tomcat 10!"
400-
diff expected output
401-
fi
364+
diff expected_$TOMCAT_FLAVOR output
402365
403366
- name: Check ACME database config
404367
if: always()
@@ -984,23 +947,17 @@ jobs:
984947
| tee output
985948
986949
# TODO: review permissions
987-
cat > expected << EOF
950+
cat > expected_old << EOF
988951
lrwxrwxrwx pkiuser pkiuser conf -> /etc/pki/pki-tomcat
989952
lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
990953
EOF
991954
992-
cat > expected_new_tomcat10 << EOF
955+
cat > expected_new << EOF
993956
lrwxrwxrwx pkiuser pkiuser conf -> /etc/pki/pki-tomcat
994957
lrwxrwxrwx pkiuser pkiuser logs -> /var/log/pki/pki-tomcat
995958
EOF
996959
997-
if [ $TOMCAT_FLAVOR == 'new' ]; then
998-
echo "New tomcat 10!"
999-
diff expected_new_tomcat10 output
1000-
else
1001-
echo "Old tomcat 10!"
1002-
diff expected output
1003-
fi
960+
diff expected_$TOMCAT_FLAVOR output
1004961
1005962
- name: Check PKI server conf dir after removal
1006963
run: |
@@ -1012,7 +969,7 @@ jobs:
1012969
| tee output
1013970
1014971
# TODO: review permissions
1015-
cat > expected << EOF
972+
cat > expected_old << EOF
1016973
drwxrwx--- pkiuser pkiuser Catalina
1017974
drwxrwx--- pkiuser pkiuser acme
1018975
drwxrwx--- pkiuser pkiuser alias
@@ -1029,7 +986,7 @@ jobs:
1029986
lrwxrwxrwx pkiuser pkiuser web.xml -> /etc/tomcat/web.xml
1030987
EOF
1031988
1032-
cat > expected_new_tomcat10 << EOF
989+
cat > expected_new << EOF
1033990
drwxrwx--- pkiuser pkiuser Catalina
1034991
drwxrwx--- pkiuser pkiuser acme
1035992
drwxrwx--- pkiuser pkiuser alias
@@ -1046,13 +1003,7 @@ jobs:
10461003
lrwxrwxrwx pkiuser pkiuser web.xml -> /etc/tomcat/web.xml
10471004
EOF
10481005
1049-
if [ $TOMCAT_FLAVOR == 'new' ]; then
1050-
echo "New tomcat 10!"
1051-
diff expected_new_tomcat10 output
1052-
else
1053-
echo "Old tomcat 10!"
1054-
diff expected output
1055-
fi
1006+
diff expected_$TOMCAT_FLAVOR output
10561007
10571008
- name: Check PKI server logs dir after removal
10581009
if: ${{ fromJSON(env.FEDORA_VERSION) < 43 }}
@@ -1091,27 +1042,21 @@ jobs:
10911042
DATE=$(date +'%Y-%m-%d')
10921043
10931044
# TODO: review permissions
1094-
cat > expected << EOF
1045+
cat > expected_old << EOF
10951046
drwxrwx--- pkiuser pkiuser acme
10961047
drwxrwx--- pkiuser pkiuser backup
10971048
drwxrwx--- pkiuser pkiuser ca
10981049
-rw-r--r-- pkiuser pkiuser localhost_access_log.$DATE.txt
10991050
EOF
11001051
1101-
cat > expected_new_tomcat10 << EOF
1052+
cat > expected_new << EOF
11021053
drwxrwx--- pkiuser pkiuser acme
11031054
drwxrwx--- pkiuser pkiuser backup
11041055
drwxrwx--- pkiuser pkiuser ca
11051056
-rw-r----- pkiuser pkiuser localhost_access_log.$DATE.txt
11061057
EOF
11071058
1108-
if [ $TOMCAT_FLAVOR == 'new' ]; then
1109-
echo "New tomcat 10!"
1110-
diff expected_new_tomcat10 output
1111-
else
1112-
echo "Old tomcat 10!"
1113-
diff expected output
1114-
fi
1059+
diff expected_$TOMCAT_FLAVOR output
11151060
11161061
- name: Check DS server systemd journal
11171062
if: always()

‎.github/workflows/acme-container-basic-test.yml‎

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,10 @@ jobs:
8989
FEDORA_VERSION=$(docker exec acme sed -n 's/^VERSION_ID=//p' /etc/os-release)
9090
echo "FEDORA_VERSION=$FEDORA_VERSION" | tee -a $GITHUB_ENV
9191
92-
- name: Calculate Tomcat flavor
92+
- name: Get Tomcat flavor
9393
run: |
94-
TOMCAT_FLAVOR=$(docker exec acme bash -c '
95-
if [ -f /usr/libexec/tomcat/tomcat-run.sh ]; then
96-
printf "new"
97-
else
98-
printf "old"
99-
fi
100-
')
101-
echo "TOMCAT_FLAVOR=$TOMCAT_FLAVOR" >> $GITHUB_ENV
102-
echo "Detected Tomcat flavor: $TOMCAT_FLAVOR"
94+
TOMCAT_FLAVOR=$(docker exec acme test -f /usr/libexec/tomcat/tomcat-run.sh && echo "new" || echo "old")
95+
echo "TOMCAT_FLAVOR=$TOMCAT_FLAVOR" | tee -a $GITHUB_ENV
10396
10497
- name: Check conf dir
10598
if: always()
@@ -112,7 +105,7 @@ jobs:
112105
113106
# everything should be owned by root group (GID=0)
114107
# TODO: review owners/permissions
115-
cat > expected << EOF
108+
cat > expected_old << EOF
116109
drwxrwxrwx root Catalina
117110
drwxrwxrwx root acme
118111
drwxrwxrwx root alias
@@ -128,7 +121,7 @@ jobs:
128121
lrwxrwxrwx root web.xml -> /etc/tomcat/web.xml
129122
EOF
130123
131-
cat > expected_new_tomcat10 << EOF
124+
cat > expected_new << EOF
132125
drwxrwxrwx root Catalina
133126
drwxrwxrwx root acme
134127
drwxrwxrwx root alias
@@ -144,13 +137,7 @@ jobs:
144137
lrwxrwxrwx root web.xml -> /etc/tomcat/web.xml
145138
EOF
146139
147-
if [ $TOMCAT_FLAVOR == 'new' ]; then
148-
echo "New tomcat 10!"
149-
diff expected_new_tomcat10 output
150-
else
151-
echo "Old tomcat 10!"
152-
diff expected output
153-
fi
140+
diff expected_$TOMCAT_FLAVOR output
154141
155142
- name: Check conf/acme dir
156143
if: always()
@@ -163,25 +150,19 @@ jobs:
163150
164151
# everything should be owned by root group (GID=0)
165152
# TODO: review owners/permissions
166-
cat > expected << EOF
153+
cat > expected_old << EOF
167154
-rw-rw-rw- root database.conf
168155
-rw-rw-rw- root issuer.conf
169156
-rw-rw-rw- root realm.conf
170157
EOF
171158
172-
cat > expected_new_tomcat10 << EOF
159+
cat > expected_new << EOF
173160
-rw-rw-rw- root database.conf
174161
-rw-rw-rw- root issuer.conf
175162
-rw-rw-rw- root realm.conf
176163
EOF
177164
178-
if [ $TOMCAT_FLAVOR == 'new' ]; then
179-
echo "New tomcat 10!"
180-
diff expected_new_tomcat10 output
181-
else
182-
echo "Old tomcat 10!"
183-
diff expected output
184-
fi
165+
diff expected_$TOMCAT_FLAVOR output
185166
186167
- name: Check logs dir
187168
if: ${{ fromJSON(env.FEDORA_VERSION) < 43 }}
@@ -217,21 +198,15 @@ jobs:
217198
218199
# everything should be owned by root group (GID=0)
219200
# TODO: review owners/permissions
220-
cat > expected << EOF
201+
cat > expected_old << EOF
221202
-rw-rw-rw- root localhost_access_log.$DATE.txt
222203
EOF
223204
224-
cat > expected_new_tomcat10 << EOF
205+
cat > expected_new << EOF
225206
-rw-rw-rw- root localhost_access_log.$DATE.txt
226207
EOF
227208
228-
if [ $TOMCAT_FLAVOR == 'new' ]; then
229-
echo "New tomcat 10!"
230-
diff expected_new_tomcat10 output
231-
else
232-
echo "Old tomcat 10!"
233-
diff expected output
234-
fi
209+
diff expected_$TOMCAT_FLAVOR output
235210
236211
- name: Install CA signing cert
237212
run: |

0 commit comments

Comments
 (0)