@speedkit/cli 2.46.0 → 2.47.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [2.47.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.46.0...v2.47.0) (2024-07-24)
+
+
+### Features
+
+* **deploy:** add postDeploymentCheck for deploymentDetection ([d7f60dc](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/d7f60dc68e3f4dab45df347f7d4a9d416e9c6625))
+* **deploy:** change styling of postDeployCheck ([0b37d77](https://gitlab.orestes.info/baqend/speed-kit-cli/commit/0b37d771fea61d9a5b00b6ebd000b61ebecad1d2))
+
 # [2.46.0](https://gitlab.orestes.info/baqend/speed-kit-cli/compare/v2.45.0...v2.46.0) (2024-07-22)
 
 

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.46.0 linux-x64 node-v20.15.1
+@speedkit/cli/2.47.0 linux-x64 node-v20.15.1
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/models/files.js

@@ -22,6 +22,6 @@ exports.INTEGRATION_FILES = {
     },
     DEPRECATED: {
         ASSET_HANDLER: "speedKit.Asset",
-        DEPLOYMENT_DETECTION: "deployment_detection",
+        DEPLOYMENT_DETECTION: "deploymentDetection",
     },
 };

package/dist/services/config-api/client.d.ts

@@ -11,4 +11,5 @@ export declare class Client {
     getModule(moduleName: string): Promise<string>;
     send<T>(url: string, requestExtension?: RequestExtensionInterface): Promise<T>;
     setModule(moduleName: string, moduleCode: string): Promise<string>;
+    deleteModule(moduleName: string): Promise<void>;
 }

package/dist/services/config-api/client.js

@@ -83,5 +83,12 @@ class Client {
         }
         return moduleResponse.data;
     }
+    async deleteModule(moduleName) {
+        const entityManager = await this.getEntityManager();
+        const moduleResponse = await (0, safe_1.safe)(entityManager.code.deleteCode(moduleName, "module"));
+        if (moduleResponse.success !== true) {
+            throw new connection_error_1.ConnectionError(`Could not delete module "${moduleName}" to app "${this.app}" - ${moduleResponse.error}`);
+        }
+    }
 }
 exports.Client = Client;

package/dist/services/config-api/config-api-model.d.ts

@@ -10,3 +10,6 @@ export declare class ConfigApiContext {
     readonly app: string;
     constructor(app: string);
 }
+export interface Entity {
+    delete(): Promise<void>;
+}

package/dist/services/config-api/config-api-service.d.ts

@@ -13,4 +13,5 @@ export declare class ConfigApiService {
     setModule(moduleCode: string, moduleName: string): Promise<string>;
     getServerConfig(): Promise<string>;
     setServerConfig(localServerConfig: string, configurationVersion: string): Promise<void>;
+    deleteModule(moduleName: string): Promise<void>;
 }

package/dist/services/config-api/config-api-service.js

@@ -65,5 +65,8 @@ class ConfigApiService {
             },
         });
     }
+    async deleteModule(moduleName) {
+        await this.client.deleteModule(moduleName);
+    }
 }
 exports.ConfigApiService = ConfigApiService;

package/dist/services/deploy/checks/post-deploy/deprecated-deployment-detection-check.d.ts

@@ -0,0 +1,13 @@
+import { PostDeployCheckInterface } from "../../deploy-service-model";
+import { FileListInterface } from "../../../integration-api";
+import { CliService } from "../../../cli";
+import { ConfigApiService } from "../../../config-api";
+export declare class DeprecatedDeploymentDetectionCheck implements PostDeployCheckInterface {
+    private fileList;
+    private cli;
+    private configApi;
+    private app;
+    constructor(fileList: FileListInterface, cli: CliService, configApi: ConfigApiService, app: string);
+    check(): Promise<void>;
+    private deleteDeploymentJobDefinition;
+}

package/dist/services/deploy/checks/post-deploy/deprecated-deployment-detection-check.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeprecatedDeploymentDetectionCheck = void 0;
+const cli_1 = require("../../../cli");
+const files_1 = require("../../../../models/files");
+const safe_1 = require("../../../../helpers/safe");
+const post_deploy_deployment_detection_error_1 = require("../../error/post-deploy-deployment-detection-error");
+class DeprecatedDeploymentDetectionCheck {
+    fileList;
+    cli;
+    configApi;
+    app;
+    constructor(fileList, cli, configApi, app) {
+        this.fileList = fileList;
+        this.cli = cli;
+        this.configApi = configApi;
+        this.app = app;
+    }
+    async check() {
+        this.cli.startAction("[postDeployCheck] deploymentDetection");
+        const configFile = this.fileList.getByName(files_1.INTEGRATION_FILES.CONFIG.DOCUMENT_HANDLER);
+        const moduleFile = this.fileList.getByName(files_1.INTEGRATION_FILES.DEPRECATED.DEPLOYMENT_DETECTION);
+        // no config_documentHandler or module: deploymentDetection found
+        if (!configFile || moduleFile) {
+            this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+            return;
+        }
+        const content = configFile.getContent();
+        if (!content.includes("executeDeploymentDetection: true") &&
+            !content.includes("executeDeploymentDetection: {")) {
+            this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+            return;
+        }
+        const entityManager = await this.configApi.client.getEntityManager();
+        const deployCheckJob = await entityManager["jobs.Definition"]
+            .find()
+            .eq("id", "/db/jobs.Definition/deployment-check")
+            .singleResult();
+        const moduleResult = await (0, safe_1.safe)(this.configApi.getModule(files_1.INTEGRATION_FILES.DEPRECATED.DEPLOYMENT_DETECTION));
+        this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+        if (deployCheckJob) {
+            this.cli.writeWarning(`Found active Job for ${this.cli.style.bold("deprecated")} deploymentDetection in app: ${this.app}`);
+            if (await this.cli.confirm("Delete job for deploymentDetection?")) {
+                await this.deleteDeploymentJobDefinition(deployCheckJob);
+            }
+        }
+        if (moduleResult.success &&
+            moduleResult.data &&
+            moduleResult.data.length > 0) {
+            this.cli.writeWarning(`Found ${this.cli.style.bold("deprecated")} module deploymentDetection in app: ${this.app}`);
+            if (await this.cli.confirm("Delete module deploymentDetection?")) {
+                this.cli.startAction("Delete module deploymentDetection");
+                await this.configApi.deleteModule(files_1.INTEGRATION_FILES.DEPRECATED.DEPLOYMENT_DETECTION);
+                this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+            }
+        }
+    }
+    async deleteDeploymentJobDefinition(deployCheckJob) {
+        this.cli.startAction("Delete job deploymentDetection-check");
+        const result = await (0, safe_1.safe)(deployCheckJob.delete());
+        if (result.success === true) {
+            this.cli.endAction(cli_1.CliActionStatus.COMPLETED);
+            return;
+        }
+        this.cli.endAction(cli_1.CliActionStatus.FAILED);
+        throw new post_deploy_deployment_detection_error_1.PostDeployDeploymentDetectionError(result.error, [
+            `check https://dashboard.baqend.com/app/${this.app}/db/jobs.Definition`,
+            "delete entry manual",
+        ]);
+    }
+}
+exports.DeprecatedDeploymentDetectionCheck = DeprecatedDeploymentDetectionCheck;

package/dist/services/deploy/deploy-service-factory.js

@@ -16,6 +16,7 @@ const server_config_handler_1 = tslib_1.__importDefault(require("./handler/serve
 const integration_api_1 = require("../integration-api");
 const split_change_check_1 = require("./checks/pre-deploy/split-change-check");
 const config_api_1 = require("../config-api");
+const deprecated_deployment_detection_check_1 = require("./checks/post-deploy/deprecated-deployment-detection-check");
 class DeployServiceFactory {
     context;
     cliConfig;
@@ -64,6 +65,7 @@ class DeployServiceFactory {
         return [
             new save_files_check_1.default(files, cliService),
             new revalidated_module_check_1.default(configApi, cliService, app),
+            new deprecated_deployment_detection_check_1.DeprecatedDeploymentDetectionCheck(files, cliService, configApi, app),
         ];
     }
 }

package/dist/services/deploy/deploy-service.js

@@ -59,9 +59,8 @@ class DeployService {
         }
     }
     async runPostDeployChecks() {
-        for (let iterator = 0; iterator < this.postDeployChecks.length; iterator++) {
-            const check = this.postDeployChecks[iterator];
-            await check.check();
+        for (const postDeployCheck of this.postDeployChecks) {
+            await postDeployCheck.check();
         }
     }
     filterFilesToProcess() {

package/dist/services/deploy/error/post-deploy-deployment-detection-error.d.ts

@@ -0,0 +1,4 @@
+import ApplicationError from "../../error-handling/error/application-error";
+export declare class PostDeployDeploymentDetectionError extends ApplicationError {
+    readonly code = "POST_DEPLOY";
+}

package/dist/services/deploy/error/post-deploy-deployment-detection-error.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PostDeployDeploymentDetectionError = void 0;
+const tslib_1 = require("tslib");
+const application_error_1 = tslib_1.__importDefault(require("../../error-handling/error/application-error"));
+class PostDeployDeploymentDetectionError extends application_error_1.default {
+    code = "POST_DEPLOY";
+}
+exports.PostDeployDeploymentDetectionError = PostDeployDeploymentDetectionError;

package/oclif.manifest.json

@@ -712,5 +712,5 @@
       ]
     }
   },
-  "version": "2.46.0"
+  "version": "2.47.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"