nebulous/optimiser-controller
Code Issues Proposed changes

Make app name safe for use as unquoted filename

Browse Source 
... DeployApplicaiton endpoint requirement now documented after seeing
mysterious deployment failures

Change-Id: I27a162ae3c50f2cfdd8ab46a95880b9ca692e246
This commit is contained in:
Rudi Schlatte 2024-04-08 10:11:48 +02:00
parent a6901aa327
commit bcfa236c55
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
View File

@ -162,6 +162,10 @@ public class NebulousAppDeployer {
public static void deployApplication(NebulousApp app, JsonNode kubevela) {
String appUUID = app.getUUID();
String clusterName = app.getClusterName();
// The application name is typed in by the user, and is used
// internally by SAL as an unquoted filename in a generated shell
// script. It shouldn't be this way but it is what it is.
String safeAppName = app.getName().replaceAll("[^a-zA-Z0-9-_]", "_");
ExnConnector conn = app.getExnConnector();
log.info("Starting initial deployment for application", keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@ -376,7 +380,7 @@ public class NebulousAppDeployer {
// 7. Deploy application
log.info("Calling deployApplication", keyValue("appId", appUUID), keyValue("clusterName", clusterName));
long proActiveJobID = conn.deployApplication(appUUID, clusterName, app.getName(), rewritten_kubevela);
long proActiveJobID = conn.deployApplication(appUUID, clusterName, safeAppName, rewritten_kubevela);
log.info("deployApplication returned ProActive Job ID {}", proActiveJobID,
keyValue("appId", appUUID), keyValue("clusterName", clusterName));
if (proActiveJobID == 0) {