@naturalcycles/backend-lib 4.23.0 → 4.23.2

package/dist/bin/undeploy-gae.js

@@ -1,8 +1,17 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+const yargs_1 = tslib_1.__importDefault(require("yargs"));
 const deployGae_1 = require("../deploy/deployGae");
 (0, nodejs_lib_1.runScript)(async () => {
-    await (0, deployGae_1.undeployGae)();
+    const { branch } = yargs_1.default.options({
+        branch: {
+            type: 'string',
+            demandOption: true,
+            desc: `Because Github Actions delete event happens after the branch is already deleted - you need to pass it manually`,
+        },
+    }).argv;
+    await (0, deployGae_1.undeployGae)(branch);
 });

package/dist/deploy/backend.cfg.util.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendCfg = void 0;
-const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const paths_cnst_1 = require("../paths.cnst");
 const backendCfgSchema = nodejs_lib_1.AjvSchema.readJsonSync(`${paths_cnst_1.resourcesDir}/backendCfg.schema.json`, {
     objectName: 'backend.cfg.yaml',
@@ -13,7 +11,7 @@ function getBackendCfg(projectDir = '.') {
     (0, nodejs_lib_1.requireFileToExist)(backendCfgYamlPath);
     const backendCfg = {
         serviceWithBranchName: true,
-        ...js_yaml_1.default.load((0, nodejs_lib_1._readFileSync)(backendCfgYamlPath)),
+        ...nodejs_lib_1.fs2.readYaml(backendCfgYamlPath),
     };
     backendCfgSchema.validate(backendCfg);
     return backendCfg;

package/dist/deploy/deploy.util.d.ts

@@ -1,7 +1,7 @@
 import { BackendCfg } from './backend.cfg.util';
 import { AppYaml, DeployInfo } from './deploy.model';
 export declare function createAndSaveDeployInfo(backendCfg: BackendCfg, targetDir: string): Promise<DeployInfo>;
-export declare function createDeployInfo(backendCfg: BackendCfg): Promise<DeployInfo>;
+export declare function createDeployInfo(backendCfg: BackendCfg, overrideBranch?: string): Promise<DeployInfo>;
 export declare function createAndSaveAppYaml(backendCfg: BackendCfg, deployInfo: DeployInfo, projectDir: string, targetDir: string, appYamlPassEnv?: string): AppYaml;
 export declare function createAppYaml(backendCfg: BackendCfg, deployInfo: DeployInfo, projectDir: string, appYamlPassEnv?: string): AppYaml;
 export declare function validateGAEServiceName(serviceName: string): string;

package/dist/deploy/deploy.util.js

@@ -32,11 +32,11 @@ async function createAndSaveDeployInfo(backendCfg, targetDir) {
     return deployInfo;
 }
 exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
-async function createDeployInfo(backendCfg) {
+async function createDeployInfo(backendCfg, overrideBranch) {
     const simpleGit = require('simple-git'); // lazy load
     const git = simpleGit('.');
     const now = (0, js_lib_1.localTimeNow)();
-    const gitBranch = (await git.status()).current;
+    const gitBranch = overrideBranch || (await git.status()).current;
     const gitRev = (await git.revparse(['HEAD'])).slice(0, 7);
     let { gaeProject, gaeProjectByBranch = {}, gaeService, gaeServiceByBranch = {}, serviceWithBranchName, prodBranch, branchesWithTimestampVersions = [], } = backendCfg;
     gaeProject = gaeProjectByBranch[gitBranch] || gaeProject;

package/dist/deploy/deployGae.d.ts

@@ -7,4 +7,4 @@ export declare function deployGae(opt?: DeployGaeOptions): Promise<void>;
  * Undeploys/removes the GAE service/version, using the same rules as deployGae.
  * Detects the service/version by the same criteria: branch name, backend.cfg.yaml, etc.
  */
-export declare function undeployGae(): Promise<void>;
+export declare function undeployGae(branch: string): Promise<void>;

package/dist/deploy/deployGae.js

@@ -4,6 +4,8 @@ exports.undeployGae = exports.deployGae = void 0;
 const dev_lib_1 = require("@naturalcycles/dev-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+const backend_cfg_util_1 = require("./backend.cfg.util");
+const deploy_util_1 = require("./deploy.util");
 const deployHealthCheck_1 = require("./deployHealthCheck");
 const deployPrepare_1 = require("./deployPrepare");
 async function deployGae(opt = {}) {
@@ -61,13 +63,15 @@ exports.deployGae = deployGae;
  * Undeploys/removes the GAE service/version, using the same rules as deployGae.
  * Detects the service/version by the same criteria: branch name, backend.cfg.yaml, etc.
  */
-async function undeployGae() {
-    const { gaeProject, gaeService, gaeVersion, prod } = await (0, deployPrepare_1.deployPrepare)();
+async function undeployGae(branch) {
+    const projectDir = '.';
+    const backendCfg = (0, backend_cfg_util_1.getBackendCfg)(projectDir);
+    const { gaeProject, gaeService, gaeVersion, prod } = await (0, deploy_util_1.createDeployInfo)(backendCfg, branch);
     if (prod) {
-        console.log('undeployGae: not removing prod version (safety check)');
+        console.log(`undeployGae (branch: ${branch}): not removing prod version (safety check)`);
         return;
     }
-    console.log(`undeployGae: going to remove ${gaeProject}/${gaeService}/${gaeVersion}`);
+    console.log(`undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`);
     (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`, [], { shell: true });
 }
 exports.undeployGae = undeployGae;

package/dist/deploy/deployPrepare.js

@@ -58,7 +58,7 @@ async function deployPrepare(opt = {}) {
     const appYamlPassEnv = opt.appYamlPassEnv || backendCfg.appYamlPassEnv;
     console.log(`1. Copy files to ${(0, nodejs_lib_1.dimGrey)(targetDir)}`);
     // Clean targetDir
-    (0, nodejs_lib_1._emptyDirSync)(targetDir);
+    nodejs_lib_1.fs2.emptyDir(targetDir);
     (0, nodejs_lib_1.kpySync)({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
@@ -74,7 +74,7 @@ async function deployPrepare(opt = {}) {
     if (NPM_TOKEN && createNpmrc) {
         const npmrcPath = `${targetDir}/.npmrc`;
         const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`;
-        (0, nodejs_lib_1._writeFileSync)(npmrcPath, npmrc);
+        nodejs_lib_1.fs2.writeFile(npmrcPath, npmrc);
     }
     console.log(`2. Generate ${(0, nodejs_lib_1.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_1.dimGrey)('app.yaml')} in targetDir`);
     const deployInfo = await (0, deploy_util_1.createAndSaveDeployInfo)(backendCfg, targetDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.23.0",
+  "version": "4.23.2",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -31,7 +31,6 @@
     "express-promise-router": "^4.0.0",
     "firebase-admin": "^12.0.0",
     "helmet": "^7.0.0",
-    "js-yaml": "^4.0.0",
     "on-finished": "^2.3.0",
     "simple-git": "^3.0.3",
     "yargs": "^17.0.0"
@@ -41,7 +40,6 @@
     "@naturalcycles/dev-lib": "^13.0.0",
     "@sentry/node": "^7.0.0",
     "@types/ejs": "^3.0.0",
-    "@types/js-yaml": "^4.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",
     "fastify": "^4.0.0",

package/src/bin/undeploy-gae.ts

@@ -1,8 +1,17 @@
 #!/usr/bin/env node
 
 import { runScript } from '@naturalcycles/nodejs-lib'
+import yargs from 'yargs'
 import { undeployGae } from '../deploy/deployGae'
 
 runScript(async () => {
-  await undeployGae()
+  const { branch } = yargs.options({
+    branch: {
+      type: 'string',
+      demandOption: true,
+      desc: `Because Github Actions delete event happens after the branch is already deleted - you need to pass it manually`,
+    },
+  }).argv
+
+  await undeployGae(branch)
 })

package/src/db/httpDBRequestHandler.ts

@@ -75,7 +75,7 @@ export function httpDBRequestHandler(db: CommonDB): BackendRouter {
 
   // getTableSchema
   router.get('/:table/schema', async (req, res) => {
-    res.json(await db.getTableSchema(req.params['table']!))
+    res.json(await db.getTableSchema(req.params['table']))
   })
 
   // todo: createTable

package/src/deploy/backend.cfg.util.ts

@@ -1,6 +1,5 @@
 import { StringMap } from '@naturalcycles/js-lib'
-import { _readFileSync, AjvSchema, requireFileToExist } from '@naturalcycles/nodejs-lib'
-import yaml from 'js-yaml'
+import { AjvSchema, fs2, requireFileToExist } from '@naturalcycles/nodejs-lib'
 import { resourcesDir } from '../paths.cnst'
 
 export interface BackendCfg {
@@ -63,7 +62,7 @@ export function getBackendCfg(projectDir: string = '.'): BackendCfg {
 
   const backendCfg: BackendCfg = {
     serviceWithBranchName: true,
-    ...(yaml.load(_readFileSync(backendCfgYamlPath)) as any),
+    ...fs2.readYaml(backendCfgYamlPath),
   }
 
   backendCfgSchema.validate(backendCfg)

package/src/deploy/deploy.util.ts

@@ -38,12 +38,15 @@ export async function createAndSaveDeployInfo(
   return deployInfo
 }
 
-export async function createDeployInfo(backendCfg: BackendCfg): Promise<DeployInfo> {
+export async function createDeployInfo(
+  backendCfg: BackendCfg,
+  overrideBranch?: string,
+): Promise<DeployInfo> {
   const simpleGit = require('simple-git') // lazy load
   const git = simpleGit('.')
 
   const now = localTimeNow()
-  const gitBranch = (await git.status()).current!
+  const gitBranch = overrideBranch || (await git.status()).current!
   const gitRev = (await git.revparse(['HEAD'])).slice(0, 7)
 
   let {

package/src/deploy/deployGae.ts

@@ -1,6 +1,8 @@
 import { buildProdCommand } from '@naturalcycles/dev-lib'
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
 import { appendToGithubSummary, execVoidCommandSync } from '@naturalcycles/nodejs-lib'
+import { getBackendCfg } from './backend.cfg.util'
+import { createDeployInfo } from './deploy.util'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare, DeployPrepareOptions } from './deployPrepare'
 
@@ -83,15 +85,20 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
  * Undeploys/removes the GAE service/version, using the same rules as deployGae.
  * Detects the service/version by the same criteria: branch name, backend.cfg.yaml, etc.
  */
-export async function undeployGae(): Promise<void> {
-  const { gaeProject, gaeService, gaeVersion, prod } = await deployPrepare()
+export async function undeployGae(branch: string): Promise<void> {
+  const projectDir = '.'
+  const backendCfg = getBackendCfg(projectDir)
+
+  const { gaeProject, gaeService, gaeVersion, prod } = await createDeployInfo(backendCfg, branch)
 
   if (prod) {
-    console.log('undeployGae: not removing prod version (safety check)')
+    console.log(`undeployGae (branch: ${branch}): not removing prod version (safety check)`)
     return
   }
 
-  console.log(`undeployGae: going to remove ${gaeProject}/${gaeService}/${gaeVersion}`)
+  console.log(
+    `undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`,
+  )
 
   execVoidCommandSync(
     `gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`,

package/src/deploy/deployPrepare.ts

@@ -1,4 +1,4 @@
-import { _emptyDirSync, _writeFileSync, dimGrey, kpySync } from '@naturalcycles/nodejs-lib'
+import { dimGrey, fs2, kpySync } from '@naturalcycles/nodejs-lib'
 import { srcDir } from '../paths.cnst'
 import { getBackendCfg } from './backend.cfg.util'
 import { DeployInfo } from './deploy.model'
@@ -75,7 +75,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   console.log(`1. Copy files to ${dimGrey(targetDir)}`)
 
   // Clean targetDir
-  _emptyDirSync(targetDir)
+  fs2.emptyDir(targetDir)
 
   kpySync({
     baseDir: defaultFilesDir,
@@ -94,7 +94,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   if (NPM_TOKEN && createNpmrc) {
     const npmrcPath = `${targetDir}/.npmrc`
     const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`
-    _writeFileSync(npmrcPath, npmrc)
+    fs2.writeFile(npmrcPath, npmrc)
   }
 
   console.log(`2. Generate ${dimGrey('deployInfo.json')} and ${dimGrey('app.yaml')} in targetDir`)