Skip to content

Commit 03970df

Browse files
author
Thanos Ploumis
committed
Unify certificates
1 parent e2f1c6a commit 03970df

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

core/src/main/groovy/noe/workspace/WorkspaceAbstract.groovy

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,34 @@ abstract class WorkspaceAbstract implements IWorkspace {
120120
}
121121

122122
/**
123-
* Copies intermediate, pre-generated certificates from noe core to ${tmpdir}/ssl/proper/generated/ca/intermediate directory.
123+
* Copies self-signed, pre-generated certificates from noe core to ${tmpdir}/ssl/self_signed directory.
124124
*
125125
*/
126126
void copyCertificates() {
127+
// List<String> certificates = ["server.crt", "server.jks", "server.key", "server.p12"]
128+
// String sslStringDir = PathHelper.join(platform.tmpDir, "ssl", "self_signed")
127129
String sslIntermediateDir = PathHelper.join(platform.tmpDir, "ssl", "proper", "generated", "ca", "intermediate")
128-
File sslDir = new File(sslIntermediateDir)
129-
130-
if (!sslDir.exists()) {
131-
JBFile.mkdir(sslDir)
130+
File intermediateTmpDir = new File(sslIntermediateDir)
131+
// File sslDir = new File(sslStringDir)
132+
// String resourcesPath = "ssl/self_signed/" //resources jar path is always separated by /
133+
String intermediatePath = "ssl/proper/generated/ca/intermediate/"
134+
// if (!sslDir.exists()) {
135+
// JBFile.mkdir(sslDir)
136+
// }
137+
138+
if (!intermediateDir.exists()) {
139+
JBFile.mkdir(intermediateTmpDir)
132140
}
133141

134-
JBFile.makeAccessible(sslDir)
142+
// JBFile.makeAccessible(sslDir)
143+
JBFile.makeAccessible(intermediateTmpDir)
135144

136-
for (int i = 0; i < 3; i++) {
137-
File sslIntermediateFile = Library.retrieveResourceAsFile("${sslIntermediateDir}")
138-
JBFile.move(sslIntermediateFile, sslDir)
139-
}
145+
// for (String certName : certificates) {
146+
// File certFile = Library.retrieveResourceAsFile("${resourcesPath}${certName}")
147+
// JBFile.move(certFile, sslDir)
148+
// }
149+
File sslIntermediateFile = Library.retrieveResourceAsFile("${intermediatePath}")
150+
JBFile.move(sslIntermediateFile, intermediateTmpDir)
140151
}
141152

142153
void downloadClusterBench() {

testsuite/src/test/groovy/noe/tomcat/BindingsTomcatConfiguratorIT.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import noe.tomcat.configure.ShutdownTomcat
1212
import org.junit.Test
1313

1414
import noe.common.utils.Platform
15+
import noe.common.utils.PathHelper
1516

1617
import static org.junit.Assert.assertEquals
1718
import static org.junit.Assert.assertTrue

0 commit comments

Comments
 (0)