set env vars when creating project; add (bypassable) prompt when deleting project

Author: gregsadetsky

package.json

@@ -1,7 +1,7 @@
 {
     "name": "disco",
     "description": "deploy and manage your web projects",
-    "version": "0.5.44",
+    "version": "0.5.45",
     "author": "The Disco Team",
     "bin": {
         "disco": "./bin/run.js"

src/commands/env/set.ts

@@ -36,6 +36,7 @@ export default class EnvSet extends Command {
     const body: EnvVarRequestBody = {
       envVariables: [],
     }
+    // de-dupe this code as it also exists in projects:add
     for (const variable of argv) {
       const parts = (variable as string).split('=')
       const varName = parts[0]

src/commands/projects/add.ts

@@ -1,11 +1,25 @@
-import {Command, Flags} from '@oclif/core'
+import {Args, Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request, readEventSource} from '../../auth-request.js'
 
 export default class ProjectsAdd extends Command {
-  static description = 'add a project'
+  static override args = {
+    variables: Args.string({description: 'environment variables to set'}),
+  }
+
+  // set to be able to receive variable number of arguments
+  static strict = false
+
+  static description = `add a project to an existing disco instance
 
-  static examples = ['<%= config.bin %> <%= command.id %>']
+this will deploy the project. from that point on, every "git push" to the project's repo will automatically trigger a new deployment.
+
+for most projects, you will need to pass a name, a domain name and a github repo. you can optionally pass environment variables as well.`
+
+  static examples = [
+    '<%= config.bin %> <%= command.id %> --name myblog --domain blog.example.com --github myuser/myblog',
+    '<%= config.bin %> <%= command.id %> --name myblog --domain blog.example.com --github myuser/myblog API_KEY=09asf07gaq0 OTHER_ENV_VAR=true',
+  ]
 
   static flags = {
     name: Flags.string({required: true, description: 'project name'}),
@@ -31,7 +45,7 @@ export default class ProjectsAdd extends Command {
   }
 
   public async run(): Promise<void> {
-    const {flags} = await this.parse(ProjectsAdd)
+    const {argv, flags} = await this.parse(ProjectsAdd)
 
     if (flags.github !== undefined && !/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(flags.github)) {
       this.error('Invalid Github repository format, expected "user/repo"')
@@ -48,11 +62,14 @@ or edit your GitHub repo permissions by running "disco github:apps:manage <your
 
     const url = `https://${discoConfig.host}/api/projects`
 
+    const envVariables = extractEnvVars(argv as string[])
+
     const body = {
       name: flags.name,
       githubRepo: flags.github,
       domain: flags.domain,
       branch: flags.branch,
+      envVariables,
     }
 
     const res = await request({method: 'POST', url, discoConfig, body, expectedStatuses: [201]})
@@ -74,6 +91,26 @@ or edit your GitHub repo permissions by running "disco github:apps:manage <your
   }
 }
 
+// based on code in env/set.ts
+function extractEnvVars(argv: string[]): {name: string; value: string}[] {
+  const envVars: {name: string; value: string}[] = []
+  for (const variable of argv) {
+    const parts = (variable as string).split('=')
+    const name = parts[0]
+    let value = parts.slice(1).join('=')
+    if (value[0] === value.slice(-1) && ['"', "'"].includes(value[0])) {
+      value = value.slice(1, -1)
+    }
+
+    envVars.push({
+      name,
+      value,
+    })
+  }
+
+  return envVars
+}
+
 async function isGithubRepoAuthorized(discoConfig: any, repoBeingChecked: string) {
   // check if the user has access to the github repo
   const url = `https://${discoConfig.host}/api/github-app-repos`

src/commands/projects/remove.ts

@@ -1,6 +1,7 @@
 import {Args, Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request} from '../../auth-request.js'
+import {confirm} from '@inquirer/prompts'
 
 export default class ProjectsRemove extends Command {
   static args = {
@@ -12,6 +13,7 @@ export default class ProjectsRemove extends Command {
   static examples = ['<%= config.bin %> <%= command.id %> project-name']
 
   static flags = {
+    'no-input': Flags.boolean({default: false, description: 'do not ask for confirmation'}),
     disco: Flags.string({required: false}),
   }
 
@@ -20,6 +22,17 @@ export default class ProjectsRemove extends Command {
 
     const discoConfig = getDisco(flags.disco || null)
 
+    if (!flags['no-input']) {
+      const response = await confirm({
+        message: `Are you sure you want to remove the project "${args.project}"? This action cannot be undone.`,
+        default: false,
+      })
+      if (!response) {
+        this.log('Not doing anything.')
+        return
+      }
+    }
+
     const url = `https://${discoConfig.host}/api/projects/${args.project}`
     try {
       await request({method: 'DELETE', url, discoConfig, expectedStatuses: [200, 204]})

tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/auth-request.ts","./src/config.ts","./src/index.ts","./src/commands/deploy.ts","./src/commands/init.ts","./src/commands/logs.ts","./src/commands/run.ts","./src/commands/apikeys/list.ts","./src/commands/apikeys/remove.ts","./src/commands/deploy/cancel.ts","./src/commands/deploy/list.ts","./src/commands/deploy/output.ts","./src/commands/discos/list.ts","./src/commands/domains/add.ts","./src/commands/domains/list.ts","./src/commands/domains/remove.ts","./src/commands/env/get.ts","./src/commands/env/list.ts","./src/commands/env/remove.ts","./src/commands/env/set.ts","./src/commands/github/apps/add.ts","./src/commands/github/apps/list.ts","./src/commands/github/apps/manage.ts","./src/commands/github/apps/prune.ts","./src/commands/github/repos/list.ts","./src/commands/invite/accept.ts","./src/commands/invite/create.ts","./src/commands/meta/host.ts","./src/commands/meta/info.ts","./src/commands/meta/stats.ts","./src/commands/meta/upgrade.ts","./src/commands/nodes/add.ts","./src/commands/nodes/list.ts","./src/commands/nodes/remove.ts","./src/commands/postgres/create.ts","./src/commands/postgres/tunnel.ts","./src/commands/postgres/addon/install.ts","./src/commands/postgres/addon/remove.ts","./src/commands/postgres/addon/update.ts","./src/commands/postgres/databases/add.ts","./src/commands/postgres/databases/attach.ts","./src/commands/postgres/databases/detach.ts","./src/commands/postgres/databases/list.ts","./src/commands/postgres/databases/remove.ts","./src/commands/postgres/instances/add.ts","./src/commands/postgres/instances/list.ts","./src/commands/postgres/instances/remove.ts","./src/commands/projects/add.ts","./src/commands/projects/list.ts","./src/commands/projects/move.ts","./src/commands/projects/remove.ts","./src/commands/registry/addon/install.ts","./src/commands/registry/addon/remove.ts","./src/commands/registry/addon/update.ts","./src/commands/scale/get.ts","./src/commands/scale/set.ts","./src/commands/syslog/add.ts","./src/commands/syslog/list.ts","./src/commands/syslog/remove.ts","./src/commands/volumes/export.ts","./src/commands/volumes/import.ts","./src/commands/volumes/list.ts"],"errors":true,"version":"5.8.2"}
+{"root":["./src/auth-request.ts","./src/config.ts","./src/index.ts","./src/commands/deploy.ts","./src/commands/init.ts","./src/commands/logs.ts","./src/commands/run.ts","./src/commands/apikeys/list.ts","./src/commands/apikeys/remove.ts","./src/commands/deploy/cancel.ts","./src/commands/deploy/list.ts","./src/commands/deploy/output.ts","./src/commands/discos/list.ts","./src/commands/domains/add.ts","./src/commands/domains/list.ts","./src/commands/domains/remove.ts","./src/commands/env/get.ts","./src/commands/env/list.ts","./src/commands/env/remove.ts","./src/commands/env/set.ts","./src/commands/github/apps/add.ts","./src/commands/github/apps/list.ts","./src/commands/github/apps/manage.ts","./src/commands/github/apps/prune.ts","./src/commands/github/repos/list.ts","./src/commands/invite/accept.ts","./src/commands/invite/create.ts","./src/commands/meta/host.ts","./src/commands/meta/info.ts","./src/commands/meta/stats.ts","./src/commands/meta/upgrade.ts","./src/commands/nodes/add.ts","./src/commands/nodes/list.ts","./src/commands/nodes/remove.ts","./src/commands/postgres/create.ts","./src/commands/postgres/tunnel.ts","./src/commands/postgres/addon/install.ts","./src/commands/postgres/addon/remove.ts","./src/commands/postgres/addon/update.ts","./src/commands/postgres/databases/add.ts","./src/commands/postgres/databases/attach.ts","./src/commands/postgres/databases/detach.ts","./src/commands/postgres/databases/list.ts","./src/commands/postgres/databases/remove.ts","./src/commands/postgres/instances/add.ts","./src/commands/postgres/instances/list.ts","./src/commands/postgres/instances/remove.ts","./src/commands/projects/add.ts","./src/commands/projects/list.ts","./src/commands/projects/move.ts","./src/commands/projects/remove.ts","./src/commands/registry/addon/install.ts","./src/commands/registry/addon/remove.ts","./src/commands/registry/addon/update.ts","./src/commands/scale/get.ts","./src/commands/scale/set.ts","./src/commands/syslog/add.ts","./src/commands/syslog/list.ts","./src/commands/syslog/remove.ts","./src/commands/volumes/export.ts","./src/commands/volumes/import.ts","./src/commands/volumes/list.ts"],"version":"5.8.2"}