Skip to content

Commit 70a54bf

Browse files
committed
Debug. Fix missing anchors
1 parent 51b4db7 commit 70a54bf

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public void run() {
8484
#!/usr/bin/env bash
8585
set -o verbose
8686
set -o pipefail
87+
set -o nullglob
8788
set -e
8889
8990
#fix this when we no longer need to run as root
@@ -146,18 +147,15 @@ public void run() {
146147
echo "PATH:$PATH"
147148
148149
update-ca-trust
149-
ls -lR /etc/pki || true
150-
151-
if [ -d /etc/pki/ca-trust/source/anchors ]; then
152-
# Go through certificates and insert them into the cacerts
153-
for cert in /etc/pki/ca-trust/source/anchors/*; do
154-
echo "inserting $cert into java cacerts"
155-
keytool -import -alias $(basename $cert)-ca \\
156-
-file $cert \\
157-
-keystore /etc/pki/java/cacerts \\
158-
-storepass changeit --noprompt
159-
done
160-
fi
150+
151+
# Go through certificates and insert them into the cacerts
152+
for cert in /etc/pki/ca-trust/source/anchors/*; do
153+
echo "Inserting $cert into java cacerts"
154+
keytool -import -alias $(basename $cert)-ca \\
155+
-file $cert \\
156+
-keystore /etc/pki/java/cacerts \\
157+
-storepass changeit --noprompt
158+
done
161159
162160
# End of generic build script
163161

java-components/driver/src/main/java/com/redhat/hacbs/driver/Driver.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public class Driver {
4242
@RestClient
4343
IndyService indyService;
4444

45-
// TODO: Could use KubernetesClient or OpenShiftClient
4645
@Inject
4746
KubernetesClient client;
4847

@@ -67,8 +66,6 @@ public void create(BuildRequest buildRequest) {
6766
tokenResponseDTO = indyService.getAuthToken(
6867
new IndyTokenRequestDTO(buildRequest.getRepositoryBuildContentId()),
6968
"Bearer " + getFreshAccessToken());
70-
logger.debug("### new access token: {}", tokenResponseDTO.getToken()); // TODO: REMOVE
71-
7269
}
7370

7471
Map<String, String> templateProperties = new HashMap<>();
@@ -127,9 +124,6 @@ public void create(BuildRequest buildRequest) {
127124
* @return fresh access token
128125
*/
129126
public String getFreshAccessToken() {
130-
var result = oidcClient.getTokens().await().indefinitely().getAccessToken();
131-
logger.debug("### access token: {}", result); // TODO: REMOVE
132-
return result;
127+
return oidcClient.getTokens().await().indefinitely().getAccessToken();
133128
}
134-
135129
}

0 commit comments

Comments
 (0)