@naturalcycles/backend-lib 4.21.1 → 4.23.0

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,8 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+const deployGae_1 = require("../deploy/deployGae");
+(0, nodejs_lib_1.runScript)(async () => {
+    await (0, deployGae_1.undeployGae)();
+});

package/dist/deploy/deploy.util.js

@@ -55,6 +55,9 @@ async function createDeployInfo(backendCfg) {
         ].join('-');
     }
     const versionUrl = `https://${[gaeVersion, gaeService, gaeProject].join('-dot-')}.appspot.com`;
+    // Check the 63-char limit
+    const versionUrlString = [gaeVersion, gaeService, gaeProject].join('-dot-');
+    (0, js_lib_1._assert)(versionUrlString.length <= 63, `versionUrl length should be <= 63 characters, but it's ${versionUrlString.length} instead: ${versionUrlString}`);
     const serviceUrl = `https://${[gaeService, gaeProject].join('-dot-')}.appspot.com`;
     const deployInfo = {
         gaeProject,
@@ -138,12 +141,10 @@ function redactedAppYaml(appYaml) {
 }
 function validateGAEServiceName(serviceName) {
     // May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
-    return replaceAll(serviceName, '_', '-')
+    return serviceName
+        .replaceAll('_', '-')
         .toLowerCase()
         .replaceAll(/[^0-9a-z-]/gi, '')
         .slice(0, 40);
 }
 exports.validateGAEServiceName = validateGAEServiceName;
-function replaceAll(str, search, replacement) {
-    return str.split(search).join(replacement);
-}

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(): Promise<void>;

package/dist/deploy/deployGae.js

@@ -1,6 +1,6 @@
 "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");
@@ -57,6 +57,20 @@ 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() {
+    const { gaeProject, gaeService, gaeVersion, prod } = await (0, deployPrepare_1.deployPrepare)();
+    if (prod) {
+        console.log('undeployGae: not removing prod version (safety check)');
+        return;
+    }
+    console.log(`undeployGae: 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.21.1",
+  "version": "4.23.0",
   "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,8 @@
+#!/usr/bin/env node
+
+import { runScript } from '@naturalcycles/nodejs-lib'
+import { undeployGae } from '../deploy/deployGae'
+
+runScript(async () => {
+  await undeployGae()
+})

package/src/deploy/deploy.util.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs'
-import { _mapValues, _merge, _truncate, localTimeNow } from '@naturalcycles/js-lib'
+import { _assert, _mapValues, _merge, _truncate, localTimeNow } from '@naturalcycles/js-lib'
 import { dimGrey, white } from '@naturalcycles/nodejs-lib'
 import yaml from 'js-yaml'
 import { BackendCfg } from './backend.cfg.util'
@@ -79,6 +79,13 @@ export async function createDeployInfo(backendCfg: BackendCfg): Promise<DeployIn
 
   const versionUrl = `https://${[gaeVersion, gaeService, gaeProject].join('-dot-')}.appspot.com`
 
+  // Check the 63-char limit
+  const versionUrlString = [gaeVersion, gaeService, gaeProject].join('-dot-')
+  _assert(
+    versionUrlString.length <= 63,
+    `versionUrl length should be <= 63 characters, but it's ${versionUrlString.length} instead: ${versionUrlString}`,
+  )
+
   const serviceUrl = `https://${[gaeService, gaeProject].join('-dot-')}.appspot.com`
 
   const deployInfo: DeployInfo = {
@@ -198,12 +205,9 @@ function redactedAppYaml(appYaml: AppYaml): AppYaml {
 
 export function validateGAEServiceName(serviceName: string): string {
   // May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
-  return replaceAll(serviceName, '_', '-')
+  return serviceName
+    .replaceAll('_', '-')
     .toLowerCase()
     .replaceAll(/[^0-9a-z-]/gi, '')
     .slice(0, 40)
 }
-
-function replaceAll(str: string, search: string, replacement: string): string {
-  return str.split(search).join(replacement)
-}

package/src/deploy/deployGae.ts

@@ -79,6 +79,27 @@ 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()
+
+  if (prod) {
+    console.log('undeployGae: not removing prod version (safety check)')
+    return
+  }
+
+  console.log(`undeployGae: 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(