platformatic 1.7.1 → 1.8.1

package/lib/deploy.js

@@ -4,6 +4,7 @@ import { isAbsolute, dirname, relative, join } from 'path'
 import { readFile } from 'fs/promises'
 
 import { request } from 'undici'
+import { bold, green } from 'colorette'
 import pino from 'pino'
 import pretty from 'pino-pretty'
 import dotenv from 'dotenv'
@@ -18,6 +19,9 @@ export const DEPLOY_SERVICE_HOST = 'https://deploy.platformatic.cloud'
 const WORKSPACE_TYPES = ['static', 'dynamic']
 const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
 
+const CREATE_NEW_WORKSPACE_CHOICE = Symbol('CREATE_NEW_WORKSPACE_CHOICE')
+const CREATE_NEW_APPLICATION_CHOICE = Symbol('CREATE_NEW_APPLICATION_CHOICE')
+
 const logger = pino(pretty({
   translateTime: 'SYS:HH:MM:ss',
   ignore: 'hostname,pid'
@@ -76,7 +80,7 @@ async function askMissingWorkspaceDetails (
   }
 }
 
-/* c8 ignore next 26 */
+/* c8 ignore next 27 */
 async function askToChooseApplication (applications) {
   const applicationChoices = applications.map((application) => {
     return {
@@ -85,7 +89,11 @@ async function askToChooseApplication (applications) {
     }
   })
   applicationChoices.push({
-    name: 'Deploy to another application',
+    name: bold('Create new application'),
+    value: CREATE_NEW_APPLICATION_CHOICE
+  })
+  applicationChoices.push({
+    name: bold('Deploy to another application'),
     value: null
   })
 
@@ -93,14 +101,11 @@ async function askToChooseApplication (applications) {
     type: 'list',
     name: 'application',
     message: 'Select application to deploy:',
-    choices: applicationChoices
+    choices: applicationChoices,
+    loop: false
   })
 
   const chosenApplication = answer.application
-  if (chosenApplication === null) {
-    return null
-  }
-
   return chosenApplication
 }
 
@@ -113,7 +118,11 @@ async function askToChooseWorkspace (workspaces) {
     }
   })
   workspaceChoices.push({
-    name: 'Deploy to another workspace',
+    name: bold('Create new workspace'),
+    value: CREATE_NEW_WORKSPACE_CHOICE
+  })
+  workspaceChoices.push({
+    name: bold('Deploy to another workspace'),
     value: null
   })
 
@@ -121,15 +130,63 @@ async function askToChooseWorkspace (workspaces) {
     type: 'list',
     name: 'workspace',
     message: 'Select workspace to deploy:',
-    choices: workspaceChoices
+    choices: workspaceChoices,
+    loop: false
   })
 
   const chosenWorkspace = answer.workspace
-  if (chosenWorkspace === null) {
-    return null
+  return chosenWorkspace
+}
+
+/* c8 ignore next 14 */
+async function askToChooseOrg (orgs) {
+  const orgsChoices = orgs.map((org) => {
+    return { name: org.name, value: org.id }
+  })
+
+  const answer = await inquirer.prompt({
+    type: 'list',
+    name: 'orgId',
+    message: 'Select organisation to publish to:',
+    choices: orgsChoices
+  })
+
+  return answer.orgId
+}
+
+/* c8 ignore next 21 */
+async function askNewWorkspaceDetails () {
+  const answer = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'workspaceName',
+      message: 'Enter workspace name:'
+    },
+    {
+      type: 'list',
+      name: 'workspaceType',
+      message: 'Select workspace type:',
+      choices: WORKSPACE_TYPES
+    }
+  ])
+
+  return {
+    workspaceName: answer.workspaceName,
+    workspaceType: answer.workspaceType
   }
+}
 
-  return chosenWorkspace
+/* c8 ignore next 12 */
+async function askNewApplicationDetails () {
+  const answer = await inquirer.prompt({
+    type: 'input',
+    name: 'applicationName',
+    message: 'Enter application name:'
+  })
+
+  return {
+    applicationName: answer.applicationName
+  }
 }
 
 /* c8 ignore next 19 */
@@ -216,6 +273,25 @@ async function getUserApplications (deployServiceHost, userApiKey) {
   return applications
 }
 
+/* c8 ignore next 18 */
+async function getUserOrgs (deployServiceHost, userApiKey) {
+  const url = deployServiceHost + '/organisations'
+  const { statusCode, body } = await request(url, {
+    method: 'GET',
+    headers: {
+      'content-type': 'application/json',
+      'x-platformatic-user-api-key': userApiKey
+    }
+  })
+
+  if (statusCode !== 200) {
+    throw new errors.CouldNotFetchUserOrgsError()
+  }
+
+  const { orgs } = await body.json()
+  return orgs
+}
+
 /* c8 ignore next 18 */
 async function getWorkspaceLabels (deployServiceHost, workspaceId, userApiKey) {
   const { statusCode, body } = await request(`${deployServiceHost}/entrypoints`, {
@@ -236,27 +312,134 @@ async function getWorkspaceLabels (deployServiceHost, workspaceId, userApiKey) {
   return entryPoints.map((entryPoint) => entryPoint.label)
 }
 
-/* c8 ignore next 19 */
-async function getUserWorkspaceDetails (deployServiceHost, userApiKey) {
+/* c8 ignore next 30 */
+async function createWorkspace (
+  deployServiceHost,
+  userApiKey,
+  appId,
+  workspaceName,
+  workspaceType
+) {
+  const { statusCode, body } = await request(`${deployServiceHost}/workspaces`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-platformatic-user-api-key': userApiKey
+    },
+    body: JSON.stringify({
+      appId,
+      name: workspaceName,
+      type: workspaceType
+    })
+  })
+
+  if (statusCode !== 200) {
+    const error = await body.text()
+    console.error(error)
+    throw new errors.CouldNotCreateWorkspaceError()
+  }
+
+  const { id: workspaceId } = await body.json()
+  return workspaceId
+}
+
+/* c8 ignore next 25 */
+async function createApplication (
+  deployServiceHost,
+  userApiKey,
+  orgId,
+  applicationName
+) {
+  const { statusCode, body } = await request(`${deployServiceHost}/applications`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-platformatic-user-api-key': userApiKey
+    },
+    body: JSON.stringify({ orgId, name: applicationName })
+  })
+
+  if (statusCode !== 200) {
+    const error = await body.text()
+    console.error(error)
+    throw new errors.CouldNotCreateApplicationError()
+  }
+
+  const { id: applicationId } = await body.json()
+  return applicationId
+}
+
+/* c8 ignore next 16 */
+async function getUserOrgDetails (deployServiceHost, userApiKey) {
+  const userOrgs = await getUserOrgs(deployServiceHost, userApiKey)
+  if (userOrgs.length === 0) {
+    throw new errors.NoUserOrgsError()
+  }
+
+  let orgId = null
+  if (userOrgs.length === 1) {
+    orgId = userOrgs[0].id
+  } else {
+    orgId = await askToChooseOrg(userOrgs)
+  }
+
+  return { id: orgId }
+}
+
+/* c8 ignore next 26 */
+async function getUserApplicationDetails (deployServiceHost, userApiKey) {
   const applications = await getUserApplications(deployServiceHost, userApiKey)
   if (applications.length === 0) return null
 
   const application = await askToChooseApplication(applications)
   if (application === null) return null
 
-  const workspaces = application.workspaces
-  if (workspaces.length === 0) return null
+  if (application === CREATE_NEW_APPLICATION_CHOICE) {
+    const { id: orgId } = await getUserOrgDetails(deployServiceHost, userApiKey)
+    const { applicationName } = await askNewApplicationDetails()
+    const applicationId = await createApplication(
+      deployServiceHost,
+      userApiKey,
+      orgId,
+      applicationName
+    )
+    return { id: applicationId, name: applicationName, workspaces: [] }
+  }
+  return {
+    id: application.id,
+    name: application.name,
+    workspaces: application.workspaces
+  }
+}
+
+/* c8 ignore next 24 */
+async function getUserWorkspaceDetails (deployServiceHost, userApiKey) {
+  const application = await getUserApplicationDetails(deployServiceHost, userApiKey)
+  if (application === null) return null
 
-  const workspaceDetails = await askToChooseWorkspace(workspaces)
+  const workspaceDetails = await askToChooseWorkspace(application.workspaces)
   if (workspaceDetails === null) return null
 
+  if (workspaceDetails === CREATE_NEW_WORKSPACE_CHOICE) {
+    const { workspaceName, workspaceType } = await askNewWorkspaceDetails()
+    const workspaceId = await createWorkspace(
+      deployServiceHost,
+      userApiKey,
+      application.id,
+      workspaceName,
+      workspaceType
+    )
+    return { workspaceId, workspaceType }
+  }
+
   return {
-    workspaceType: workspaceDetails.type,
-    workspaceId: workspaceDetails.id
+    workspaceId: workspaceDetails.id,
+    workspaceType: workspaceDetails.type
   }
 }
 
 export async function deploy (argv) {
+  console.log('This application will be deployed to ' + bold(green('Platformatic Cloud')) + '. To change the target use the --deploy-service-host flag')
   try {
     const args = parseArgs(argv, {
       alias: {

package/lib/errors.js

@@ -9,7 +9,11 @@ const errors = {
   InvalidWorkspaceIdError: createError(`${ERROR_PREFIX}_INVALID_WORKSPACE_ID`, 'Invalid workspace id provided. Workspace id must be a valid uuid.'),
   CouldNotFindWorkspaceKeysError: createError(`${ERROR_PREFIX}_COULD_NOT_FIND_WORKSPACE_KEYS`, 'Could not find workspace keys in provided file.'),
   CouldNotFetchUserApplicationsError: createError(`${ERROR_PREFIX}_COULD_NOT_FETCH_USER_APPLICATIONS`, 'Could not fetch user applications'),
-  CouldNotFetchDeployLabelsError: createError(`${ERROR_PREFIX}_COULD_NOT_FETCH_DEPLOY_LABELS`, 'Could not fetch deploy labels')
+  CouldNotFetchDeployLabelsError: createError(`${ERROR_PREFIX}_COULD_NOT_FETCH_DEPLOY_LABELS`, 'Could not fetch deploy labels'),
+  CouldNotCreateWorkspaceError: createError(`${ERROR_PREFIX}_COULD_NOT_CREATE_WORKSPACE`, 'Could not create workspace'),
+  CouldNotCreateApplicationError: createError(`${ERROR_PREFIX}_COULD_NOT_CREATE_APPLICATION`, 'Could not create application'),
+  CouldNotFetchUserOrgsError: createError(`${ERROR_PREFIX}_COULD_NOT_FETCH_USER_ORGS`, 'Could not fetch user ogranisations'),
+  NoUserOrgsError: createError(`${ERROR_PREFIX}_NO_USER_ORGS`, 'User does not have any organisations.')
 }
 
 export default errors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformatic",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "description": "Platformatic CLI",
   "main": "cli.js",
   "type": "module",
@@ -49,18 +49,18 @@
     "pino": "^8.15.3",
     "pino-pretty": "^10.2.0",
     "undici": "^5.25.4",
-    "@platformatic/authenticate": "1.7.1",
-    "@platformatic/client-cli": "1.7.1",
-    "@platformatic/composer": "1.7.1",
-    "@platformatic/config": "1.7.1",
-    "@platformatic/db": "1.7.1",
-    "@platformatic/deploy-client": "1.7.1",
-    "@platformatic/frontend-template": "1.7.1",
-    "@platformatic/metaconfig": "1.7.1",
-    "@platformatic/runtime": "1.7.1",
-    "@platformatic/service": "1.7.1",
-    "@platformatic/utils": "^1.7.1",
-    "create-platformatic": "1.7.1"
+    "@platformatic/authenticate": "1.8.1",
+    "@platformatic/composer": "1.8.1",
+    "@platformatic/client-cli": "1.8.1",
+    "@platformatic/config": "1.8.1",
+    "@platformatic/db": "1.8.1",
+    "@platformatic/deploy-client": "1.8.1",
+    "@platformatic/frontend-template": "1.8.1",
+    "@platformatic/runtime": "1.8.1",
+    "@platformatic/metaconfig": "1.8.1",
+    "@platformatic/service": "1.8.1",
+    "@platformatic/utils": "^1.8.1",
+    "create-platformatic": "1.8.1"
   },
   "scripts": {
     "test": "standard | snazzy && c8 node ./test/runner.js",