@naturalcycles/backend-lib 4.22.0 → 4.23.1

package/dist/bin/undeploy-gae.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin/undeploy-gae.js

@@ -0,0 +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 () => {
+    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/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

@@ -3,3 +3,8 @@ import { DeployPrepareOptions } from './deployPrepare';
 export interface DeployGaeOptions extends DeployPrepareOptions, DeployHealthCheckOptions {
 }
 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(branch: string): Promise<void>;

package/dist/deploy/deployGae.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployGae = void 0;
+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 = {}) {
@@ -57,6 +59,22 @@ async function deployGae(opt = {}) {
     }
 }
 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(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 (branch: ${branch}): not removing prod version (safety check)`);
+        return;
+    }
+    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;
 function logs(gaeProject, gaeService, gaeVersion) {
     try {
         (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.22.0",
+  "version": "4.23.1",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -60,6 +60,7 @@
   ],
   "bin": {
     "deploy-gae": "dist/bin/deploy-gae.js",
+    "undeploy-gae": "dist/bin/undeploy-gae.js",
     "deploy-prepare": "dist/bin/deploy-prepare.js",
     "deploy-health-check": "dist/bin/deploy-health-check.js"
   },

package/src/bin/undeploy-gae.ts

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+import { runScript } from '@naturalcycles/nodejs-lib'
+import yargs from 'yargs'
+import { undeployGae } from '../deploy/deployGae'
+
+runScript(async () => {
+  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/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'
 
@@ -79,6 +81,32 @@ 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(branch: string): Promise<void> {
+  const projectDir = '.'
+  const backendCfg = getBackendCfg(projectDir)
+
+  const { gaeProject, gaeService, gaeVersion, prod } = await createDeployInfo(backendCfg, branch)
+
+  if (prod) {
+    console.log(`undeployGae (branch: ${branch}): not removing prod version (safety check)`)
+    return
+  }
+
+  console.log(
+    `undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`,
+  )
+
+  execVoidCommandSync(
+    `gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`,
+    [],
+    { shell: true },
+  )
+}
+
 function logs(gaeProject: string, gaeService: string, gaeVersion: string): void {
   try {
     execVoidCommandSync(