From fa6cfa67844bdbc2262bf41ba6ba6c75eef503c1 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Mon, 19 Nov 2018 22:06:29 -0800 Subject: [PATCH] DataStore migrated --- app-backend/built/datastore/DataStoreImpl.js | 90 ++++++----- .../built/datastore/DataStoreImpl.js.map | 2 +- app-backend/built/user/DockerRegistry.js | 2 +- app-backend/built/user/DockerRegistry.js.map | 2 +- app-backend/built/user/ServiceManager.js | 2 +- app-backend/built/user/ServiceManager.js.map | 2 +- app-backend/package-lock.json | 5 + app-backend/package.json | 1 + .../{DataStoreImpl.js => DataStoreImpl.ts} | 147 +++++++++--------- app-backend/src/user/DockerRegistry.ts | 4 +- app-backend/src/user/ServiceManager.ts | 2 +- 11 files changed, 132 insertions(+), 127 deletions(-) rename app-backend/src/datastore/{DataStoreImpl.js => DataStoreImpl.ts} (70%) diff --git a/app-backend/built/datastore/DataStoreImpl.js b/app-backend/built/datastore/DataStoreImpl.js index 1a398be..d8dd251 100644 --- a/app-backend/built/datastore/DataStoreImpl.js +++ b/app-backend/built/datastore/DataStoreImpl.js @@ -1,37 +1,35 @@ +"use strict"; /** * Created by kasra on 27/06/17. */ -const Configstore = require('configstore'); -const uuid = require('uuid/v4'); -const isValidPath = require('is-valid-path'); -const fs = require('fs-extra'); -const ApiStatusCodes = require('../api/ApiStatusCodes'); -const CaptainConstants = require('../utils/CaptainConstants'); -const Logger = require('../utils/Logger'); -const Encryptor = require('../utils/Encryptor'); -const AppsDataStore = require('./AppsDataStore'); -const NAMESPACE = 'namespace'; -const HASHED_PASSWORD = 'hashedPassword'; -const CAPTAIN_REGISTRY_AUTH_SECRET_VER = 'captainRegistryAuthSecretVer'; -const CUSTOM_DOMAIN = 'customDomain'; -const HAS_ROOT_SSL = 'hasRootSsl'; -const FORCE_ROOT_SSL = 'forceRootSsl'; -const HAS_REGISTRY_SSL = 'hasRegistrySsl'; -const HAS_LOCAL_REGISTRY = 'hasLocalRegistry'; -const EMAIL_ADDRESS = 'emailAddress'; -const DOCKER_REGISTRIES = 'dockerRegistries'; -const DEFAULT_DOCKER_REGISTRY = 'defaultDockerReg'; -const NET_DATA_INFO = 'netDataInfo'; -const NGINX_BASE_CONFIG = 'NGINX_BASE_CONFIG'; -const NGINX_CAPTAIN_CONFIG = 'NGINX_CAPTAIN_CONFIG'; -const DEFAULT_CAPTAIN_ROOT_DOMAIN = 'captain.localhost'; -const DEFAULT_NGINX_BASE_CONFIG = fs.readFileSync(__dirname + '/../../template/base-nginx-conf.ejs').toString(); -const DEFAULT_NGINX_CAPTAIN_CONFIG = fs.readFileSync(__dirname + '/../../template/root-nginx-conf.ejs').toString(); -const DEFAULT_NGINX_CONFIG_FOR_APP = fs.readFileSync(__dirname + '/../../template/server-block-conf.ejs').toString(); +const Configstore = require("configstore"); +const uuid = require("uuid/v4"); +const fs = require("fs-extra"); +const ApiStatusCodes = require("../api/ApiStatusCodes"); +const CaptainConstants = require("../utils/CaptainConstants"); +const AppsDataStore = require("./AppsDataStore"); +const NAMESPACE = "namespace"; +const HASHED_PASSWORD = "hashedPassword"; +const CAPTAIN_REGISTRY_AUTH_SECRET_VER = "captainRegistryAuthSecretVer"; +const CUSTOM_DOMAIN = "customDomain"; +const HAS_ROOT_SSL = "hasRootSsl"; +const FORCE_ROOT_SSL = "forceRootSsl"; +const HAS_REGISTRY_SSL = "hasRegistrySsl"; +const HAS_LOCAL_REGISTRY = "hasLocalRegistry"; +const EMAIL_ADDRESS = "emailAddress"; +const DOCKER_REGISTRIES = "dockerRegistries"; +const DEFAULT_DOCKER_REGISTRY = "defaultDockerReg"; +const NET_DATA_INFO = "netDataInfo"; +const NGINX_BASE_CONFIG = "NGINX_BASE_CONFIG"; +const NGINX_CAPTAIN_CONFIG = "NGINX_CAPTAIN_CONFIG"; +const DEFAULT_CAPTAIN_ROOT_DOMAIN = "captain.localhost"; +const DEFAULT_NGINX_BASE_CONFIG = fs.readFileSync(__dirname + "/../../template/base-nginx-conf.ejs").toString(); +const DEFAULT_NGINX_CAPTAIN_CONFIG = fs.readFileSync(__dirname + "/../../template/root-nginx-conf.ejs").toString(); +const DEFAULT_NGINX_CONFIG_FOR_APP = fs.readFileSync(__dirname + "/../../template/server-block-conf.ejs").toString(); class DataStore { constructor(namespace) { - let data = new Configstore('captain-store', {}); - data.path = CaptainConstants.captainRootDirectory + '/config.conf'; + const data = new Configstore("captain-store", {}); + data.path = CaptainConstants.captainRootDirectory + "/config.conf"; this.data = data; this.data.set(NAMESPACE, namespace); this.appsDataStore = new AppsDataStore(this.data); @@ -80,7 +78,7 @@ class DataStore { const self = this; return Promise.resolve() .then(function () { - let netDataInfo = self.data.get(NET_DATA_INFO) || {}; + const netDataInfo = self.data.get(NET_DATA_INFO) || {}; netDataInfo.isEnabled = netDataInfo.isEnabled || false; netDataInfo.data = netDataInfo.data || {}; return netDataInfo; @@ -108,23 +106,23 @@ class DataStore { }); } getServiceName(appName) { - return 'srv-' + this.getNameSpace() + '--' + appName; + return "srv-" + this.getNameSpace() + "--" + appName; } getImageName(authObj, appName, version) { - let authPrefix = ''; + let authPrefix = ""; if (authObj) { - authPrefix = authObj.serveraddress + '/' + authObj.username + '/'; + authPrefix = authObj.serveraddress + "/" + authObj.username + "/"; } return authPrefix + this.getImageNameWithoutAuthObj(appName, version); } - getImageNameWithoutAuthObj(appName, version) { - if (version === 0) { - version = '0'; + getImageNameWithoutAuthObj(appName, versionStr) { + if (versionStr === 0) { + versionStr = "0"; } - return this.getImageNameBase() + appName + (version ? (':' + version) : ''); + return this.getImageNameBase() + appName + (versionStr ? (":" + versionStr) : ""); } getImageNameBase() { - return 'img-' + this.getNameSpace() + '--'; + return "img-" + this.getNameSpace() + "--"; } getRootDomain() { return this.data.get(CUSTOM_DOMAIN) || DEFAULT_CAPTAIN_ROOT_DOMAIN; @@ -134,8 +132,8 @@ class DataStore { } getServerList() { const self = this; - let hasRootSsl = null; - let rootDomain = null; + let hasRootSsl; + let rootDomain; return Promise.resolve() .then(function () { return self.getHasRootSsl(); @@ -169,7 +167,7 @@ class DataStore { return Promise.resolve() .then(function () { let found = false; - let registries = self.data.get(DOCKER_REGISTRIES) || []; + const registries = self.data.get(DOCKER_REGISTRIES) || []; for (let i = 0; i < registries.length; i++) { const registry = registries[i]; if (registry.id === registryId) { @@ -178,7 +176,7 @@ class DataStore { } // registryId can be NULL/Empty, meaning that no registry will be the default push registry if (!found && !!registryId) { - throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, 'Registry not found'); + throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, "Registry not found"); } self.data.set(DEFAULT_DOCKER_REGISTRY, registryId); }); @@ -187,8 +185,8 @@ class DataStore { const self = this; return Promise.resolve() .then(function () { - let newReg = []; - let registries = self.data.get(DOCKER_REGISTRIES) || []; + const newReg = []; + const registries = self.data.get(DOCKER_REGISTRIES) || []; for (let i = 0; i < registries.length; i++) { const registry = registries[i]; if (registry.id !== registryId) { @@ -196,7 +194,7 @@ class DataStore { } } if (newReg.length === registries.length) { - throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, 'Registry not found'); + throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, "Registry not found"); } self.data.set(DOCKER_REGISTRIES, newReg); }); @@ -217,7 +215,7 @@ class DataStore { }); }) .then(function (registries) { - let id = null; + let id = uuid(); let isAlreadyTaken = true; while (isAlreadyTaken) { id = uuid(); diff --git a/app-backend/built/datastore/DataStoreImpl.js.map b/app-backend/built/datastore/DataStoreImpl.js.map index f39d0d1..8cf0032 100644 --- a/app-backend/built/datastore/DataStoreImpl.js.map +++ b/app-backend/built/datastore/DataStoreImpl.js.map @@ -1 +1 @@ -{"version":3,"file":"DataStoreImpl.js","sourceRoot":"","sources":["../../src/datastore/DataStoreImpl.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DataStoreImpl.js","sourceRoot":"","sources":["../../src/datastore/DataStoreImpl.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/user/DockerRegistry.js b/app-backend/built/user/DockerRegistry.js index d5a8d27..25bb48d 100644 --- a/app-backend/built/user/DockerRegistry.js +++ b/app-backend/built/user/DockerRegistry.js @@ -153,7 +153,7 @@ class DockerRegistry { updateRegistryAuthHeader(username, password, domain, currentVersion) { const self = this; const dockerApi = this.dockerApi; - let nextVersion = undefined; + let nextVersion; let secretName = undefined; let userEmailAddress = undefined; return Promise.resolve() diff --git a/app-backend/built/user/DockerRegistry.js.map b/app-backend/built/user/DockerRegistry.js.map index 6c42bbb..14510ea 100644 --- a/app-backend/built/user/DockerRegistry.js.map +++ b/app-backend/built/user/DockerRegistry.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerRegistry.js","sourceRoot":"","sources":["../../src/user/DockerRegistry.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DockerRegistry.js","sourceRoot":"","sources":["../../src/user/DockerRegistry.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/built/user/ServiceManager.js b/app-backend/built/user/ServiceManager.js index b41c732..e828557 100644 --- a/app-backend/built/user/ServiceManager.js +++ b/app-backend/built/user/ServiceManager.js @@ -124,7 +124,7 @@ class ServiceManager { createImage(appName, source, gitHash) { Logger.d("Creating image for: " + appName); const self = this; - const imageName = this.dataStore.getImageName(CaptainManager.get().getDockerAuthObject(), appName); + const imageName = this.dataStore.getImageName(CaptainManager.get().getDockerAuthObject(), appName, undefined); const dockerApi = this.dockerApi; const dataStore = this.dataStore; let newVersion; diff --git a/app-backend/built/user/ServiceManager.js.map b/app-backend/built/user/ServiceManager.js.map index f997cc0..364b55d 100644 --- a/app-backend/built/user/ServiceManager.js.map +++ b/app-backend/built/user/ServiceManager.js.map @@ -1 +1 @@ -{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../src/user/ServiceManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-backend/package-lock.json b/app-backend/package-lock.json index 33e3df2..2d4c0bc 100644 --- a/app-backend/package-lock.json +++ b/app-backend/package-lock.json @@ -47,6 +47,11 @@ "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==" }, + "@types/configstore": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/configstore/-/configstore-2.1.1.tgz", + "integrity": "sha1-zR6FU2M60xhcPy8jns/10mQ+krY=" + }, "@types/ejs": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-2.6.0.tgz", diff --git a/app-backend/package.json b/app-backend/package.json index d77a052..8ca9b45 100644 --- a/app-backend/package.json +++ b/app-backend/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@types/bcryptjs": "^2.4.2", + "@types/configstore": "^2.1.1", "@types/ejs": "^2.6.0", "@types/fs-extra": "^5.0.4", "@types/jsonwebtoken": "^8.3.0", diff --git a/app-backend/src/datastore/DataStoreImpl.js b/app-backend/src/datastore/DataStoreImpl.ts similarity index 70% rename from app-backend/src/datastore/DataStoreImpl.js rename to app-backend/src/datastore/DataStoreImpl.ts index 42a00ed..c40b651 100644 --- a/app-backend/src/datastore/DataStoreImpl.js +++ b/app-backend/src/datastore/DataStoreImpl.ts @@ -1,42 +1,43 @@ /** * Created by kasra on 27/06/17. */ -const Configstore = require('configstore'); -const uuid = require('uuid/v4'); -const isValidPath = require('is-valid-path'); -const fs = require('fs-extra'); -const ApiStatusCodes = require('../api/ApiStatusCodes'); -const CaptainConstants = require('../utils/CaptainConstants'); -const Logger = require('../utils/Logger'); -const Encryptor = require('../utils/Encryptor'); -const AppsDataStore = require('./AppsDataStore'); +import Configstore = require("configstore"); +import uuid = require("uuid/v4"); +import fs = require("fs-extra"); +import ApiStatusCodes = require("../api/ApiStatusCodes"); +import CaptainConstants = require("../utils/CaptainConstants"); +import Logger = require("../utils/Logger"); +import Encryptor = require("../utils/Encryptor"); +import AppsDataStore = require("./AppsDataStore"); -const NAMESPACE = 'namespace'; -const HASHED_PASSWORD = 'hashedPassword'; -const CAPTAIN_REGISTRY_AUTH_SECRET_VER = 'captainRegistryAuthSecretVer'; -const CUSTOM_DOMAIN = 'customDomain'; -const HAS_ROOT_SSL = 'hasRootSsl'; -const FORCE_ROOT_SSL = 'forceRootSsl'; -const HAS_REGISTRY_SSL = 'hasRegistrySsl'; -const HAS_LOCAL_REGISTRY = 'hasLocalRegistry'; -const EMAIL_ADDRESS = 'emailAddress'; -const DOCKER_REGISTRIES = 'dockerRegistries'; -const DEFAULT_DOCKER_REGISTRY = 'defaultDockerReg'; -const NET_DATA_INFO = 'netDataInfo'; -const NGINX_BASE_CONFIG = 'NGINX_BASE_CONFIG'; -const NGINX_CAPTAIN_CONFIG = 'NGINX_CAPTAIN_CONFIG'; -const DEFAULT_CAPTAIN_ROOT_DOMAIN = 'captain.localhost'; +const NAMESPACE = "namespace"; +const HASHED_PASSWORD = "hashedPassword"; +const CAPTAIN_REGISTRY_AUTH_SECRET_VER = "captainRegistryAuthSecretVer"; +const CUSTOM_DOMAIN = "customDomain"; +const HAS_ROOT_SSL = "hasRootSsl"; +const FORCE_ROOT_SSL = "forceRootSsl"; +const HAS_REGISTRY_SSL = "hasRegistrySsl"; +const HAS_LOCAL_REGISTRY = "hasLocalRegistry"; +const EMAIL_ADDRESS = "emailAddress"; +const DOCKER_REGISTRIES = "dockerRegistries"; +const DEFAULT_DOCKER_REGISTRY = "defaultDockerReg"; +const NET_DATA_INFO = "netDataInfo"; +const NGINX_BASE_CONFIG = "NGINX_BASE_CONFIG"; +const NGINX_CAPTAIN_CONFIG = "NGINX_CAPTAIN_CONFIG"; +const DEFAULT_CAPTAIN_ROOT_DOMAIN = "captain.localhost"; -const DEFAULT_NGINX_BASE_CONFIG = fs.readFileSync(__dirname + '/../../template/base-nginx-conf.ejs').toString(); -const DEFAULT_NGINX_CAPTAIN_CONFIG = fs.readFileSync(__dirname + '/../../template/root-nginx-conf.ejs').toString(); -const DEFAULT_NGINX_CONFIG_FOR_APP = fs.readFileSync(__dirname + '/../../template/server-block-conf.ejs').toString(); +const DEFAULT_NGINX_BASE_CONFIG = fs.readFileSync(__dirname + "/../../template/base-nginx-conf.ejs").toString(); +const DEFAULT_NGINX_CAPTAIN_CONFIG = fs.readFileSync(__dirname + "/../../template/root-nginx-conf.ejs").toString(); +const DEFAULT_NGINX_CONFIG_FOR_APP = fs.readFileSync(__dirname + "/../../template/server-block-conf.ejs").toString(); class DataStore { - constructor(namespace) { + private data: Configstore; + private appsDataStore: AppsDataStore; + constructor(namespace: string) { - let data = new Configstore('captain-store', {}); - data.path = CaptainConstants.captainRootDirectory + '/config.conf'; + const data = new Configstore("captain-store", {}); + data.path = CaptainConstants.captainRootDirectory + "/config.conf"; this.data = data; this.data.set(NAMESPACE, namespace); @@ -47,11 +48,11 @@ class DataStore { return this.data.get(NAMESPACE); } - setHashedPassword(newHashedPassword) { + setHashedPassword(newHashedPassword: string) { const self = this; return Promise.resolve() .then(function () { - return self.data.set(HASHED_PASSWORD, newHashedPassword) + return self.data.set(HASHED_PASSWORD, newHashedPassword); }); } @@ -59,7 +60,7 @@ class DataStore { const self = this; return Promise.resolve() .then(function () { - return self.data.get(HASHED_PASSWORD) + return self.data.get(HASHED_PASSWORD); }); } @@ -90,26 +91,26 @@ class DataStore { const self = this; return Promise.resolve() .then(function () { - let netDataInfo = self.data.get(NET_DATA_INFO) || {}; + const netDataInfo = self.data.get(NET_DATA_INFO) || {}; netDataInfo.isEnabled = netDataInfo.isEnabled || false; netDataInfo.data = netDataInfo.data || {}; return netDataInfo; }); } - setNetDataInfo(netDataInfo) { + setNetDataInfo(netDataInfo: NetDataInfo) { const self = this; return Promise.resolve() .then(function () { - return self.data.set(NET_DATA_INFO, netDataInfo) + return self.data.set(NET_DATA_INFO, netDataInfo); }); } - setRegistryAuthSecretVersion(ver) { + setRegistryAuthSecretVersion(ver: number) { const self = this; return Promise.resolve() .then(function () { - return self.data.set(CAPTAIN_REGISTRY_AUTH_SECRET_VER, Number(ver)) + return self.data.set(CAPTAIN_REGISTRY_AUTH_SECRET_VER, Number(ver)); }); } @@ -121,32 +122,32 @@ class DataStore { }); } - getServiceName(appName) { - return 'srv-' + this.getNameSpace() + '--' + appName; + getServiceName(appName: string) { + return "srv-" + this.getNameSpace() + "--" + appName; } - getImageName(authObj, appName, version) { + getImageName(authObj: any, appName: string, version: string|undefined|number) { - let authPrefix = ''; + let authPrefix = ""; if (authObj) { - authPrefix = authObj.serveraddress + '/' + authObj.username + '/'; + authPrefix = authObj.serveraddress + "/" + authObj.username + "/"; } return authPrefix + this.getImageNameWithoutAuthObj(appName, version); } - getImageNameWithoutAuthObj(appName, version) { + getImageNameWithoutAuthObj(appName: string, versionStr: string|undefined|number) { - if (version === 0) { - version = '0'; + if (versionStr === 0) { + versionStr = "0"; } - return this.getImageNameBase() + appName + (version ? (':' + version) : ''); + return this.getImageNameBase() + appName + (versionStr ? (":" + versionStr) : ""); } getImageNameBase() { - return 'img-' + this.getNameSpace() + '--'; + return "img-" + this.getNameSpace() + "--"; } getRootDomain() { @@ -161,8 +162,8 @@ class DataStore { const self = this; - let hasRootSsl = null; - let rootDomain = null; + let hasRootSsl: boolean; + let rootDomain: boolean; return Promise.resolve() .then(function () { @@ -170,7 +171,7 @@ class DataStore { return self.getHasRootSsl(); }) - .then(function (val) { + .then(function (val: boolean) { hasRootSsl = val; @@ -210,7 +211,7 @@ class DataStore { } - setDefaultPushRegistry(registryId) { + setDefaultPushRegistry(registryId: string) { const self = this; @@ -218,7 +219,7 @@ class DataStore { .then(function () { let found = false; - let registries = self.data.get(DOCKER_REGISTRIES) || []; + const registries = self.data.get(DOCKER_REGISTRIES) || []; for (let i = 0; i < registries.length; i++) { const registry = registries[i]; if (registry.id === registryId) { @@ -228,7 +229,7 @@ class DataStore { // registryId can be NULL/Empty, meaning that no registry will be the default push registry if (!found && !!registryId) { - throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, 'Registry not found'); + throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, "Registry not found"); } self.data.set(DEFAULT_DOCKER_REGISTRY, registryId); @@ -236,15 +237,15 @@ class DataStore { }); } - deleteRegistry(registryId) { + deleteRegistry(registryId: string) { const self = this; return Promise.resolve() .then(function () { - let newReg = []; - let registries = self.data.get(DOCKER_REGISTRIES) || []; + const newReg = []; + const registries = self.data.get(DOCKER_REGISTRIES) || []; for (let i = 0; i < registries.length; i++) { const registry = registries[i]; if (registry.id !== registryId) { @@ -253,7 +254,7 @@ class DataStore { } if (newReg.length === registries.length) { - throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, 'Registry not found'); + throw ApiStatusCodes.createError(ApiStatusCodes.NOT_FOUND, "Registry not found"); } self.data.set(DOCKER_REGISTRIES, newReg); @@ -273,7 +274,7 @@ class DataStore { }); } - addRegistryToDb(registryUser, registryPasswordEncrypted, registryDomain, registryImagePrefix) { + addRegistryToDb(registryUser: string, registryPasswordEncrypted: string, registryDomain: string, registryImagePrefix: string) { const self = this; @@ -283,11 +284,11 @@ class DataStore { resolve(self.data.get(DOCKER_REGISTRIES) || []); - }) + }); }) - .then(function (registries) { + .then(function (registries: any[]) { - let id = null; + let id: string = uuid(); let isAlreadyTaken = true; while (isAlreadyTaken) { @@ -315,7 +316,7 @@ class DataStore { } - setUserEmailAddress(emailAddress) { + setUserEmailAddress(emailAddress: string) { const self = this; @@ -328,7 +329,7 @@ class DataStore { } - getUserEmailAddress() { + getUserEmailAddress(): Promise { const self = this; @@ -339,7 +340,7 @@ class DataStore { }); } - setHasRootSsl(hasRootSsl) { + setHasRootSsl(hasRootSsl: boolean) { const self = this; @@ -351,7 +352,7 @@ class DataStore { }); } - setForceSsl(forceSsl) { + setForceSsl(forceSsl: boolean) { const self = this; return new Promise(function (resolve, reject) { @@ -362,7 +363,7 @@ class DataStore { }); } - getForceSsl() { + getForceSsl(): Promise { const self = this; @@ -373,7 +374,7 @@ class DataStore { }); } - setHasRegistrySsl(hasRegistrySsl) { + setHasRegistrySsl(hasRegistrySsl: boolean) { const self = this; @@ -414,7 +415,7 @@ class DataStore { }); } - setNginxConfig(baseConfig, captainConfig) { + setNginxConfig(baseConfig: string, captainConfig: string) { const self = this; @@ -425,7 +426,7 @@ class DataStore { }); } - getHasRootSsl() { + getHasRootSsl(): Promise { const self = this; @@ -436,7 +437,7 @@ class DataStore { }); } - setHasLocalRegistry(hasLocalRegistry) { + setHasLocalRegistry(hasLocalRegistry: boolean) { const self = this; @@ -466,7 +467,7 @@ class DataStore { }); } - setCustomDomain(customDomain) { + setCustomDomain(customDomain: string) { const self = this; @@ -480,4 +481,4 @@ class DataStore { } -module.exports = DataStore; \ No newline at end of file +export = DataStore; \ No newline at end of file diff --git a/app-backend/src/user/DockerRegistry.ts b/app-backend/src/user/DockerRegistry.ts index 3600257..0056e87 100644 --- a/app-backend/src/user/DockerRegistry.ts +++ b/app-backend/src/user/DockerRegistry.ts @@ -213,7 +213,7 @@ class DockerRegistry { const self = this; const dockerApi = this.dockerApi; - let nextVersion: number|undefined = undefined; + let nextVersion: number; let secretName: string|undefined = undefined; @@ -256,7 +256,7 @@ class DockerRegistry { username, password, domain, - nextVersion! + nextVersion ); } else { return dockerApi diff --git a/app-backend/src/user/ServiceManager.ts b/app-backend/src/user/ServiceManager.ts index afa2448..abde514 100644 --- a/app-backend/src/user/ServiceManager.ts +++ b/app-backend/src/user/ServiceManager.ts @@ -164,7 +164,7 @@ class ServiceManager { const self = this; - const imageName = this.dataStore.getImageName(CaptainManager.get().getDockerAuthObject(), appName); + const imageName = this.dataStore.getImageName(CaptainManager.get().getDockerAuthObject(), appName, undefined); const dockerApi = this.dockerApi; const dataStore = this.dataStore; let newVersion: number;