@wocker/mongodb-plugin 1.0.4 → 1.0.5

package/lib/controllers/MongodbController.d.ts

@@ -3,7 +3,7 @@ export declare class MongodbController {
     protected readonly mongodbService: MongodbService;
     constructor(mongodbService: MongodbService);
     create(name?: string, username?: string, password?: string, imageName?: string, imageVersion?: string): Promise<void>;
-    upgrade(name?: string, imageName?: string, imageVersion?: string): Promise<void>;
+    upgrade(name?: string, imageName?: string, imageVersion?: string, volume?: string, configVolume?: string): Promise<void>;
     destroy(name: string, yes?: boolean, force?: boolean): Promise<void>;
     use(name: string): Promise<void>;
     start(name?: string, restart?: boolean): Promise<void>;

package/lib/controllers/MongodbController.js

@@ -39,12 +39,14 @@ let MongodbController = class MongodbController {
             });
         });
     }
-    upgrade(name, imageName, imageVersion) {
+    upgrade(name, imageName, imageVersion, volume, configVolume) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.mongodbService.upgrade({
                 name,
                 imageName,
-                imageVersion
+                imageVersion,
+                volume,
+                configVolume
             });
         });
     }
@@ -128,8 +130,18 @@ __decorate([
         alias: "I",
         description: "The image version to start the service with"
     })),
+    __param(3, (0, core_1.Option)("volume", {
+        type: "string",
+        alias: "v",
+        description: "The volume name to start the service with"
+    })),
+    __param(4, (0, core_1.Option)("config-volume", {
+        type: "string",
+        alias: "V",
+        description: "The config volume name to start the service with"
+    })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, String]),
+    __metadata("design:paramtypes", [String, String, String, String, String]),
     __metadata("design:returntype", Promise)
 ], MongodbController.prototype, "upgrade", null);
 __decorate([

package/lib/makes/Database.d.ts

@@ -6,17 +6,24 @@ export type DatabaseProps = ConfigProperties & {
     password: string;
     configStorage?: string;
     storage?: string;
+    volume?: string;
+    configVolume?: string;
 };
 export declare class Database extends Config<DatabaseProps> {
     imageName?: string;
     imageVersion?: string;
     username: string;
     password: string;
-    configStorage: string;
-    storage: string;
+    protected _configVolume?: string;
+    protected _volume?: string;
     constructor(props: DatabaseProps);
     get containerName(): string;
     get image(): string;
+    get volume(): string;
+    set volume(volume: string);
+    get configVolume(): string;
+    set configVolume(configVolume: string);
     get defaultStorage(): string;
     get defaultConfigStorage(): string;
+    toObject(): DatabaseProps;
 }

package/lib/makes/Database.js

@@ -5,26 +5,59 @@ const core_1 = require("@wocker/core");
 class Database extends core_1.Config {
     constructor(props) {
         super(props);
-        const { imageName, imageVersion, username, password, configStorage, storage } = props;
+        const { name, imageName, imageVersion, username, password, configStorage, configVolume, storage, volume } = props;
+        this.name = name;
         this.imageName = imageName;
         this.imageVersion = imageVersion;
         this.username = username;
         this.password = password;
-        this.configStorage = configStorage || this.defaultConfigStorage;
-        this.storage = storage || this.defaultStorage;
+        this._configVolume = configStorage || configVolume;
+        this._volume = storage || volume;
     }
     get containerName() {
         return `mongodb-${this.name}.ws`;
     }
     get image() {
-        const imageName = this.imageName || "mongo", imageVersion = this.imageVersion || "latest";
+        const imageName = this.imageName || "mongo", imageVersion = this.imageVersion;
+        if (!imageVersion) {
+            return imageName;
+        }
         return `${imageName}:${imageVersion}`;
     }
+    get volume() {
+        if (!this._volume) {
+            this._volume = this.defaultStorage;
+        }
+        return this._volume;
+    }
+    set volume(volume) {
+        this._volume = volume;
+    }
+    get configVolume() {
+        if (!this._configVolume) {
+            this._configVolume = this.defaultConfigStorage;
+        }
+        return this._configVolume;
+    }
+    set configVolume(configVolume) {
+        this._configVolume = configVolume;
+    }
     get defaultStorage() {
         return `wocker-mongodb-${this.name}`;
     }
     get defaultConfigStorage() {
         return `wocker-mongodb-config-${this.name}`;
     }
+    toObject() {
+        return {
+            name: this.name,
+            imageName: this.imageName,
+            imageVersion: this.imageVersion,
+            username: this.username,
+            password: this.password,
+            volume: this._volume,
+            configVolume: this._configVolume
+        };
+    }
 }
 exports.Database = Database;

package/lib/services/MongodbService.js

@@ -120,6 +120,14 @@ let MongodbService = class MongodbService {
                 service.imageVersion = props.imageVersion;
                 changed = true;
             }
+            if (props.volume) {
+                service.volume = props.volume;
+                changed = true;
+            }
+            if (props.configVolume) {
+                service.configVolume = props.configVolume;
+                changed = true;
+            }
             if (changed) {
                 this.config.setDatabase(service);
                 this.config.save();
@@ -144,11 +152,11 @@ let MongodbService = class MongodbService {
                     throw new Error("Aborted");
                 }
             }
-            if (database.configStorage === database.defaultConfigStorage && (yield this.dockerService.hasVolume(database.configStorage))) {
-                yield this.dockerService.rmVolume(database.configStorage);
+            if (database.configVolume === database.defaultConfigStorage && (yield this.dockerService.hasVolume(database.configVolume))) {
+                yield this.dockerService.rmVolume(database.configVolume);
             }
-            if (database.storage === database.defaultStorage && (yield this.dockerService.hasVolume(database.storage))) {
-                yield this.dockerService.rmVolume(database.storage);
+            if (database.volume === database.defaultStorage && (yield this.dockerService.hasVolume(database.volume))) {
+                yield this.dockerService.rmVolume(database.volume);
             }
             this.config.removeDatabase(database.name);
             this.config.save();
@@ -174,6 +182,12 @@ let MongodbService = class MongodbService {
                 container = null;
             }
             if (!container) {
+                if (!(yield this.dockerService.hasVolume(database.configVolume))) {
+                    yield this.dockerService.createVolume(database.configVolume);
+                }
+                if (!(yield this.dockerService.hasVolume(database.volume))) {
+                    yield this.dockerService.createVolume(database.volume);
+                }
                 container = yield this.dockerService.createContainer({
                     name: database.containerName,
                     restart: "always",
@@ -185,8 +199,8 @@ let MongodbService = class MongodbService {
                         MONGO_ROOT_PASSWORD: database.password
                     },
                     volumes: [
-                        `${database.configStorage}:/data/configdb`,
-                        `${database.storage}:/data/db`
+                        `${database.configVolume}:/data/configdb`,
+                        `${database.volume}:/data/db`
                     ]
                 });
             }
@@ -271,7 +285,7 @@ let MongodbService = class MongodbService {
                     database.username,
                     database.containerName,
                     database.image,
-                    `${database.configStorage}\n${database.storage}`
+                    `${database.configVolume}\n${database.volume}`
                 ]);
             }
             return table.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/mongodb-plugin",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Mongodb plugin for wocker",
     "license": "MIT",