From 36811c1d0d4f9edcc5407f61522126b1fbd2aebd Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Sat, 2 Feb 2019 19:48:53 -0800 Subject: [PATCH] Added end point capability to edit captain definition path --- src/datastore/AppsDataStore.ts | 6 ++++++ src/routes/apps/AppDefinitionRouter.ts | 3 +++ src/user/ServiceManager.ts | 2 ++ src/utils/MigrateCaptainDuckDuck.ts | 1 + 4 files changed, 12 insertions(+) diff --git a/src/datastore/AppsDataStore.ts b/src/datastore/AppsDataStore.ts index e7e8d4f..ee52262 100644 --- a/src/datastore/AppsDataStore.ts +++ b/src/datastore/AppsDataStore.ts @@ -494,6 +494,7 @@ class AppsDataStore { updateAppDefinitionInDb( appName: string, instanceCount: number, + captainDefinitionRelativeFilePath: string, envVars: IAppEnvVar[], volumes: IAppVolume[], nodeId: string, @@ -564,6 +565,11 @@ class AppsDataStore { appObj.instanceCount = instanceCount } + if (captainDefinitionRelativeFilePath) { + appObj.captainDefinitionRelativeFilePath = + captainDefinitionRelativeFilePath + '' + } + appObj.notExposeAsWebApp = !!notExposeAsWebApp appObj.containerHttpPort = containerHttpPort appObj.forceSsl = !!forceSsl diff --git a/src/routes/apps/AppDefinitionRouter.ts b/src/routes/apps/AppDefinitionRouter.ts index 73ed62f..269047a 100644 --- a/src/routes/apps/AppDefinitionRouter.ts +++ b/src/routes/apps/AppDefinitionRouter.ts @@ -313,6 +313,8 @@ router.post('/update/', function(req, res, next) { let appName = req.body.appName let nodeId = req.body.nodeId + let captainDefinitionRelativeFilePath = + req.body.captainDefinitionRelativeFilePath let notExposeAsWebApp = req.body.notExposeAsWebApp let customNginxConfig = req.body.customNginxConfig let forceSsl = !!req.body.forceSsl @@ -342,6 +344,7 @@ router.post('/update/', function(req, res, next) { .updateAppDefinition( appName, Number(instanceCount), + captainDefinitionRelativeFilePath, envVars, volumes, nodeId, diff --git a/src/user/ServiceManager.ts b/src/user/ServiceManager.ts index c7a8aac..5db0982 100644 --- a/src/user/ServiceManager.ts +++ b/src/user/ServiceManager.ts @@ -421,6 +421,7 @@ class ServiceManager { updateAppDefinition( appName: string, instanceCount: number, + captainDefinitionRelativeFilePath: string, envVars: IAppEnvVar[], volumes: IAppVolume[], nodeId: string, @@ -516,6 +517,7 @@ class ServiceManager { .updateAppDefinitionInDb( appName, instanceCount, + captainDefinitionRelativeFilePath, envVars, volumes, nodeId, diff --git a/src/utils/MigrateCaptainDuckDuck.ts b/src/utils/MigrateCaptainDuckDuck.ts index 87d0c9f..fce562c 100644 --- a/src/utils/MigrateCaptainDuckDuck.ts +++ b/src/utils/MigrateCaptainDuckDuck.ts @@ -321,6 +321,7 @@ export default class MigrateCaptainDuckDuck { return appStore.updateAppDefinitionInDb( appName, Number(app.instanceCount), + CaptainConstants.defaultCaptainDefinitionPath, app.envVars || [], app.volumes || [], app.nodeId || '',