@dbos-inc/dbos-cloud 1.0.2 → 1.1.5-preview

package/dist/register.js

@@ -0,0 +1,86 @@
+import axios from "axios";
+import { handleAPIErrors, getCloudCredentials, getLogger, isCloudAPIErrorResponse, credentialsExist, writeCredentials, deleteCredentials } from "./cloudutils.js";
+import readline from 'readline';
+import { authenticate } from "./login.js";
+import * as validator from 'validator';
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+function isValidUsername(username) {
+    if (username.length < 3 || username.length > 30) {
+        return false;
+    }
+    return validator.matches(username, "^[a-z0-9_]+$");
+}
+export async function registerUser(username, host) {
+    const logger = getLogger();
+    let givenName = "";
+    let familyName = "";
+    let company = "";
+    if (!isValidUsername(username)) {
+        logger.error("Invalid username. Usernames must be between 3 and 30 characters long and contain only lowercase letters, underscores, and numbers.");
+        return 1;
+    }
+    if (!credentialsExist()) {
+        logger.info("Welcome to DBOS Cloud!");
+        logger.info("Before creating an account, please tell us a bit about yourself!");
+        const prompt = (query) => new Promise((resolve) => rl.question(query, resolve));
+        givenName = await prompt("Enter First/Given Name: ");
+        familyName = await prompt("Enter Last/Family Name: ");
+        company = await prompt("Enter Company: ");
+        const bearerToken = await authenticate(logger);
+        if (bearerToken === null) {
+            return 1;
+        }
+        const credentials = {
+            token: bearerToken,
+            userName: username,
+        };
+        writeCredentials(credentials);
+    }
+    else {
+        const userCredentials = getCloudCredentials();
+        if (userCredentials.userName !== username) {
+            logger.error(`You are trying to register ${username}, but are currently authenticated as ${userCredentials.userName}. Please run "npx dbos-cloud logout".`);
+            return 1;
+        }
+        else {
+            logger.info(`You are currently authenticated as ${userCredentials.userName}.  Registering ${userCredentials.userName} with DBOS Cloud...`);
+        }
+    }
+    const userCredentials = getCloudCredentials();
+    const bearerToken = "Bearer " + userCredentials.token;
+    const loginName = userCredentials.userName;
+    try {
+        // Register the user in DBOS Cloud
+        await axios.put(`https://${host}/v1alpha1/user`, {
+            name: loginName,
+            given_name: givenName,
+            family_name: familyName,
+            company: company,
+        }, {
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: bearerToken,
+            },
+        });
+        logger.info(`${username} successfully registered!`);
+    }
+    catch (e) {
+        const errorLabel = `Failed to register user ${loginName}`;
+        const axiosError = e;
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
+        }
+        else {
+            logger.error(`${errorLabel}: ${e.message}`);
+        }
+        if (credentialsExist()) {
+            deleteCredentials();
+        }
+        return 1;
+    }
+    return 0;
+}
+//# sourceMappingURL=register.js.map

package/dist/register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../register.ts"],"names":[],"mappings":"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"}

package/dist/userdb.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"userdb.d.ts","sourceRoot":"","sources":["../userdb.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,kBAwC3H;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAwB9D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,kBAyB1E;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,kBAwC3D;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAYzF;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kBA0B3F"}

package/dist/{packages/dbos-cloud/userdb.js → userdb.js}

@@ -1,18 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetDBCredentials = exports.getUserDBInfo = exports.listUserDB = exports.getUserDb = exports.deleteUserDb = exports.createUserDb = void 0;
-const axios_1 = __importDefault(require("axios"));
-const cloudutils_1 = require("./cloudutils");
-const utils_1 = require("../../src/utils");
-async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync) {
-    const logger = (0, cloudutils_1.getLogger)();
-    const userCredentials = (0, cloudutils_1.getCloudCredentials)();
+import axios from "axios";
+import { isCloudAPIErrorResponse, handleAPIErrors, getCloudCredentials, getLogger, sleep } from "./cloudutils.js";
+export async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync) {
+    const logger = getLogger();
+    const userCredentials = getCloudCredentials();
     const bearerToken = "Bearer " + userCredentials.token;
     try {
-        await axios_1.default.post(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb`, { Name: dbName, AdminName: appDBUsername, AdminPassword: appDBPassword }, {
+        await axios.post(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb`, { Name: dbName, AdminName: appDBUsername, AdminPassword: appDBPassword }, {
             headers: {
                 "Content-Type": "application/json",
                 Authorization: bearerToken,
@@ -22,7 +15,7 @@ async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync) {
         if (sync) {
             let status = "";
             while (status != "available" && status != "backing-up") {
-                await (0, utils_1.sleep)(30000);
+                await sleep(30000);
                 const userDBInfo = await getUserDBInfo(host, dbName);
                 logger.info(userDBInfo);
                 status = userDBInfo.Status;
@@ -34,8 +27,8 @@ async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync) {
     catch (e) {
         const errorLabel = `Failed to create database ${dbName}`;
         const axiosError = e;
-        if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
-            (0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
         }
         else {
             logger.error(`${errorLabel}: ${e.message}`);
@@ -43,13 +36,12 @@ async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync) {
         return 1;
     }
 }
-exports.createUserDb = createUserDb;
-async function deleteUserDb(host, dbName) {
-    const logger = (0, cloudutils_1.getLogger)();
-    const userCredentials = (0, cloudutils_1.getCloudCredentials)();
+export async function deleteUserDb(host, dbName) {
+    const logger = getLogger();
+    const userCredentials = getCloudCredentials();
     const bearerToken = "Bearer " + userCredentials.token;
     try {
-        await axios_1.default.delete(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/${dbName}`, {
+        await axios.delete(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/${dbName}`, {
             headers: {
                 "Content-Type": "application/json",
                 Authorization: bearerToken,
@@ -61,8 +53,8 @@ async function deleteUserDb(host, dbName) {
     catch (e) {
         const errorLabel = `Failed to delete database ${dbName}`;
         const axiosError = e;
-        if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
-            (0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
         }
         else {
             logger.error(`${errorLabel}: ${e.message}`);
@@ -70,9 +62,8 @@ async function deleteUserDb(host, dbName) {
         return 1;
     }
 }
-exports.deleteUserDb = deleteUserDb;
-async function getUserDb(host, dbName, json) {
-    const logger = (0, cloudutils_1.getLogger)();
+export async function getUserDb(host, dbName, json) {
+    const logger = getLogger();
     try {
         const userDBInfo = await getUserDBInfo(host, dbName);
         if (json) {
@@ -90,8 +81,8 @@ async function getUserDb(host, dbName, json) {
     catch (e) {
         const errorLabel = `Failed to retrieve database record ${dbName}`;
         const axiosError = e;
-        if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
-            (0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
         }
         else {
             logger.error(`${errorLabel}: ${e.message}`);
@@ -99,13 +90,12 @@ async function getUserDb(host, dbName, json) {
         return 1;
     }
 }
-exports.getUserDb = getUserDb;
-async function listUserDB(host, json) {
-    const logger = (0, cloudutils_1.getLogger)();
+export async function listUserDB(host, json) {
+    const logger = getLogger();
     try {
-        const userCredentials = (0, cloudutils_1.getCloudCredentials)();
+        const userCredentials = getCloudCredentials();
         const bearerToken = "Bearer " + userCredentials.token;
-        const res = await axios_1.default.get(`https://${host}/v1alpha1/${userCredentials.userName}/databases`, {
+        const res = await axios.get(`https://${host}/v1alpha1/${userCredentials.userName}/databases`, {
             headers: {
                 "Content-Type": "application/json",
                 Authorization: bearerToken,
@@ -132,8 +122,8 @@ async function listUserDB(host, json) {
     catch (e) {
         const errorLabel = `Failed to retrieve info`;
         const axiosError = e;
-        if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
-            (0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
         }
         else {
             logger.error(`${errorLabel}: ${e.message}`);
@@ -141,11 +131,10 @@ async function listUserDB(host, json) {
         return 1;
     }
 }
-exports.listUserDB = listUserDB;
-async function getUserDBInfo(host, dbName) {
-    const userCredentials = (0, cloudutils_1.getCloudCredentials)();
+export async function getUserDBInfo(host, dbName) {
+    const userCredentials = getCloudCredentials();
     const bearerToken = "Bearer " + userCredentials.token;
-    const res = await axios_1.default.get(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/info/${dbName}`, {
+    const res = await axios.get(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/info/${dbName}`, {
         headers: {
             "Content-Type": "application/json",
             Authorization: bearerToken,
@@ -153,13 +142,12 @@ async function getUserDBInfo(host, dbName) {
     });
     return res.data;
 }
-exports.getUserDBInfo = getUserDBInfo;
-async function resetDBCredentials(host, dbName, appDBPassword) {
-    const logger = (0, cloudutils_1.getLogger)();
-    const userCredentials = (0, cloudutils_1.getCloudCredentials)();
+export async function resetDBCredentials(host, dbName, appDBPassword) {
+    const logger = getLogger();
+    const userCredentials = getCloudCredentials();
     const bearerToken = "Bearer " + userCredentials.token;
     try {
-        await axios_1.default.post(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/${dbName}/credentials`, { Name: dbName, Password: appDBPassword }, {
+        await axios.post(`https://${host}/v1alpha1/${userCredentials.userName}/databases/userdb/${dbName}/credentials`, { Name: dbName, Password: appDBPassword }, {
             headers: {
                 "Content-Type": "application/json",
                 Authorization: bearerToken,
@@ -171,8 +159,8 @@ async function resetDBCredentials(host, dbName, appDBPassword) {
     catch (e) {
         const errorLabel = `Failed to reset user password for database ${dbName}`;
         const axiosError = e;
-        if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
-            (0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
+        if (isCloudAPIErrorResponse(axiosError.response?.data)) {
+            handleAPIErrors(errorLabel, axiosError);
         }
         else {
             logger.error(`${errorLabel}: ${e.message}`);
@@ -180,5 +168,4 @@ async function resetDBCredentials(host, dbName, appDBPassword) {
         return 1;
     }
 }
-exports.resetDBCredentials = resetDBCredentials;
 //# sourceMappingURL=userdb.js.map

package/dist/userdb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"userdb.js","sourceRoot":"","sources":["../userdb.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dbos-inc/dbos-cloud",
-  "version": "1.0.2",
+  "version": "1.1.5-preview",
   "description": "Tool for performing application deployment to DBOS cloud",
   "license": "MIT",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/dbos-inc/dbos-ts",
     "directory": "packages/dbos-cloud"
   },
-  "main": "cli.ts",
   "homepage": "https://docs.dbos.dev/",
   "scripts": {
     "build": "tsc --project tsconfig.json",
@@ -16,11 +16,12 @@
     "setversion": "grunt setversion"
   },
   "bin": {
-    "dbos-cloud": "./dist/packages/dbos-cloud/cli.js"
+    "dbos-cloud": "./dist/cli.js"
   },
   "devDependencies": {
     "@types/node": "^20.6.3",
     "@types/prompt-sync": "^4.2.3",
+    "@types/update-notifier": "^6.0.8",
     "@types/validator": "^13.11.9",
     "grunt": "^1.6.1",
     "nerdbank-gitversioning": "^3.6.133",
@@ -28,12 +29,15 @@
   },
   "dependencies": {
     "axios": "^1.6.7",
+    "chalk": "4.1.2",
     "commander": "^12.0.0",
     "fast-glob": "^3.3.2",
     "jsonwebtoken": "^9.0.2",
     "jszip": "^3.10.1",
     "jwks-rsa": "^3.1.0",
+    "open": "^10.1.0",
     "prompt-sync": "^4.2.0",
+    "update-notifier": "^7.0.0",
     "validator": "^13.11.0",
     "winston": "^3.12.0",
     "winston-transport": "^4.7.0"

package/Gruntfile.js

@@ -1,9 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-var nbgv = require('nerdbank-gitversioning')
-
-module.exports = function (grunt) {
-    grunt.registerTask('setversion', function () {
-        var done = this.async();
-        nbgv.setPackageVersion().then(() => done());
-    });
-};

package/applications/delete-app.ts

@@ -1,35 +0,0 @@
-import axios, { AxiosError } from "axios";
-import { isCloudAPIErrorResponse, handleAPIErrors, getCloudCredentials, getLogger, retrieveApplicationName } from "../cloudutils";
-
-export async function deleteApp(host: string, appName?: string): Promise<number> {
-  const logger = getLogger()
-  const userCredentials = getCloudCredentials();
-  const bearerToken = "Bearer " + userCredentials.token;
-
-  appName = appName ?? retrieveApplicationName(logger);
-  if (!appName) {
-    return 1;
-  }
-  logger.info(`Deleting application: ${appName}`)
-
-  try {
-    await axios.delete(`https://${host}/v1alpha1/${userCredentials.userName}/applications/${appName}`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: bearerToken,
-      },
-    });
-
-    logger.info(`Successfully deleted application: ${appName}`);
-    return 0;
-  } catch (e) {
-    const errorLabel = `Failed to delete application ${appName}`;
-    const axiosError = e as AxiosError;
-    if (isCloudAPIErrorResponse(axiosError.response?.data)) {
-      handleAPIErrors(errorLabel, axiosError);
-    } else {
-      logger.error(`${errorLabel}: ${(e as Error).message}`);
-    }
-    return 1;
-  }
-}

package/applications/deploy-app-code.ts

@@ -1,126 +0,0 @@
-import axios, { AxiosError } from "axios";
-import { existsSync, readFileSync } from 'fs';
-import { handleAPIErrors, dbosConfigFilePath, getCloudCredentials, getLogger, checkReadFile, sleep, isCloudAPIErrorResponse, retrieveApplicationName, dbosEnvPath } from "../cloudutils";
-import path from "path";
-import { Application } from "./types";
-import JSZip from "jszip";
-import fg from 'fast-glob';
-
-type DeployOutput = {
-  ApplicationName: string;
-  ApplicationVersion: string;
-}
-
-async function createZipData(): Promise<string> {
-    const zip = new JSZip();
-
-    const files = await fg(`${process.cwd()}/**/*`, { dot: true, onlyFiles: true, ignore: [`**/${dbosEnvPath}/**`, '**/node_modules/**', '**/dist/**', `**/${dbosConfigFilePath}`] });
-
-    files.forEach(file => {
-        const relativePath = file.replace(`${process.cwd()}/`, '');
-        const fileData = readFileSync(file);
-        zip.file(relativePath, fileData, { binary: true });
-    });
-
-    // Add the interpolated config file at package root
-    const interpolatedConfig = readInterpolatedConfig(dbosConfigFilePath)
-    zip.file(dbosConfigFilePath, interpolatedConfig, { binary: true });
-
-    // Generate ZIP file as a Buffer
-    const buffer = await zip.generateAsync({ type: 'nodebuffer' });
-    return buffer.toString('base64');
-}
-
-
-export async function deployAppCode(host: string): Promise<number> {
-  const logger = getLogger()
-  const userCredentials = getCloudCredentials();
-  const bearerToken = "Bearer " + userCredentials.token;
-
-  const appName = retrieveApplicationName(logger);
-  if (!appName) {
-    return 1;
-  }
-
-  // Verify that package-lock.json exists
-  if (!existsSync(path.join(process.cwd(), 'package-lock.json'))) {
-    logger.error("package-lock.json not found. Please run 'npm install' before deploying.")
-    return 1;
-  }
-
-  try {
-    const zipData = await createZipData();
-
-    // Submit the deploy request
-    logger.info(`Submitting deploy request for ${appName}`)
-    const response = await axios.post(
-      `https://${host}/v1alpha1/${userCredentials.userName}/applications/${appName}`,
-      {
-        application_archive: zipData,
-      },
-      {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: bearerToken,
-        },
-      }
-    );
-    const deployOutput = response.data as DeployOutput;
-    logger.info(`Submitted deploy request for ${appName}. Assigned version: ${deployOutput.ApplicationVersion}`);
-
-    // Wait for the application to become available
-    let count = 0
-    let applicationAvailable = false
-    while (!applicationAvailable) {
-      count += 1
-      if (count % 5 === 0) {
-        logger.info(`Waiting for ${appName} with version ${deployOutput.ApplicationVersion} to be available`);
-        if (count > 20) {
-          logger.info(`If ${appName} takes too long to become available, check its logs with 'npx dbos-cloud applications logs'`);
-        }
-      }
-      if (count > 180) {
-        logger.error("Application taking too long to become available")
-        return 1;
-      }
-
-      // Retrieve the application status, check if it is "AVAILABLE"
-      const list = await axios.get(
-        `https://${host}/v1alpha1/${userCredentials.userName}/applications`,
-        {
-          headers: {
-            Authorization: bearerToken,
-          },
-        }
-      );
-      const applications: Application[] = list.data as Application[];
-      for (const application of applications) {
-        if (application.Name === appName && application.Status === "AVAILABLE") {
-          applicationAvailable = true
-        }
-      }
-      await sleep(1000);
-    }
-    await sleep(5000); // Leave time for route cache updates
-    logger.info(`Successfully deployed ${appName}!`)
-    logger.info(`Access your application at https://${userCredentials.userName}-${appName}.${host}/`)
-    return 0;
-  } catch (e) {
-    const errorLabel = `Failed to deploy application ${appName}`;
-    const axiosError = e as AxiosError;
-    if (isCloudAPIErrorResponse(axiosError.response?.data)) {
-      handleAPIErrors(errorLabel, axiosError);
-    } else {
-      logger.error(`${errorLabel}: ${(e as Error).message}`);
-    }
-    return 1;
-  }
-}
-
-function readInterpolatedConfig(configFilePath: string): string {
-  const configFileContent = checkReadFile(configFilePath) as string;
-  const regex = /\${([^}]+)}/g;  // Regex to match ${VAR_NAME} style placeholders
-  return configFileContent.replace(regex, (_, g1: string) => {
-    return process.env[g1] || "";  // If the env variable is not set, return an empty string.
-});
-}

package/applications/get-app-info.ts

@@ -1,42 +0,0 @@
-import axios , { AxiosError } from "axios";
-import { handleAPIErrors, getCloudCredentials, getLogger, isCloudAPIErrorResponse, retrieveApplicationName } from "../cloudutils";
-import { Application, prettyPrintApplication } from "./types";
-
-export async function getAppInfo(host: string, json: boolean, appName?: string): Promise<number> {
-  const logger = getLogger();
-  const userCredentials = getCloudCredentials();
-  const bearerToken = "Bearer " + userCredentials.token;
-
-  appName = appName ?? retrieveApplicationName(logger, json);
-  if (!appName) {
-    return 1;
-  }
-  if (!json) {
-    logger.info(`Retrieving info for application: ${appName}`)
-  }
-
-  try {
-    const res = await axios.get(`https://${host}/v1alpha1/${userCredentials.userName}/applications/${appName}`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: bearerToken,
-      }
-    });
-    const app = res.data as Application
-    if (json) {
-      console.log(JSON.stringify(app));
-    } else {
-      prettyPrintApplication(app);
-    }
-    return 0;
-  } catch (e) {
-    const errorLabel = `Failed to retrieve info for application ${appName}`;
-    const axiosError = e as AxiosError;
-    if (isCloudAPIErrorResponse(axiosError.response?.data)) {
-      handleAPIErrors(errorLabel, axiosError);
-    } else {
-      logger.error(`${errorLabel}: ${(e as Error).message}`);
-    }
-    return 1;
-  }
-}

package/applications/get-app-logs.ts

@@ -1,45 +0,0 @@
-import axios , { AxiosError } from "axios";
-import { handleAPIErrors, getCloudCredentials, getLogger, isCloudAPIErrorResponse, retrieveApplicationName } from "../cloudutils";
-
-export async function getAppLogs(host: string, last: number): Promise<number> {
-  if (last != undefined && (isNaN(last) || last <= 0)) {
-    throw new Error('The --last parmameter must be an integer greater than 0');
-  }
-  if (last == undefined) {
-    last = 0      //internally, 0 means "get all the logs." This is the default.
-  }
-  const logger = getLogger();
-  const userCredentials = getCloudCredentials();
-  const bearerToken = "Bearer " + userCredentials.token;
-
-  const appName = retrieveApplicationName(logger);
-  if (!appName) {
-    return 1;
-  }
-  logger.info(`Retrieving logs for application: ${appName}`)
-
-  try {
-    const res = await axios.get(`https://${host}/v1alpha1/${userCredentials.userName}/logs/applications/${appName}?last=${last}`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: bearerToken,
-      }
-    });
-    if (res.data == "") {
-      logger.info(`No logs found for the specified parameters`);
-    } else {
-      logger.info(`Successfully retrieved logs of application: ${appName}`);
-      logger.info(res.data)
-    }
-    return 0;
-  } catch (e) {
-    const errorLabel = `Failed to retrieve logs of application ${appName}`;
-    const axiosError = e as AxiosError;
-    if (isCloudAPIErrorResponse(axiosError.response?.data)) {
-      handleAPIErrors(errorLabel, axiosError);
-    } else {
-      logger.error(`${errorLabel}: ${(e as Error).message}`);
-    }
-    return 1;
-  }
-}

package/applications/index.ts

@@ -1,7 +0,0 @@
-export { registerApp } from './register-app';
-export { listApps } from './list-apps';
-export { deleteApp } from './delete-app';
-export { deployAppCode } from './deploy-app-code';
-export { getAppLogs } from './get-app-logs';
-export { updateApp } from './update-app';
-

package/applications/list-apps.ts

@@ -1,42 +0,0 @@
-import axios, { AxiosError } from "axios";
-import { handleAPIErrors, getCloudCredentials, getLogger, isCloudAPIErrorResponse } from "../cloudutils";
-import { Application, prettyPrintApplication } from "./types";
-
-export async function listApps(host: string, json: boolean): Promise<number> {
-  const logger = getLogger();
-  const userCredentials = getCloudCredentials();
-  const bearerToken = "Bearer " + userCredentials.token;
-
-  try {
-    const list = await axios.get(
-      `https://${host}/v1alpha1/${userCredentials.userName}/applications`,
-      {
-        headers: {
-          Authorization: bearerToken,
-        },
-      }
-    );
-    const applications: Application[] = list.data as Application[];
-    if (json) {
-      console.log(JSON.stringify(applications));
-    } else {
-      if (applications.length === 0) {
-        logger.info("No applications found");
-      }
-      applications.forEach(app => {
-        prettyPrintApplication(app);
-        console.log('-------------------------');
-      });
-    }
-    return 0;
-  } catch (e) {
-    const errorLabel = 'Failed to list applications';
-    const axiosError = e as AxiosError;
-    if (isCloudAPIErrorResponse(axiosError.response?.data)) {
-      handleAPIErrors(errorLabel, axiosError);
-    } else {
-      logger.error(`${errorLabel}: ${(e as Error).message}`);
-    }
-    return 1;
-  }
-}