Ask to include API key for Postgres commands

src/auth-request.ts

@@ -38,13 +38,15 @@ export function request({
   discoConfig,
   body,
   expectedStatuses = [200],
+  extraHeaders,
   bodyStream,
 }: {
   method: string
   url: string
   discoConfig: DiscoConfig
   body?: unknown
   expectedStatuses?: number[]
+  extraHeaders?: Record<string, string>,
   bodyStream?: Readable
 }) {
   const params: RequestInit = {
@@ -60,9 +62,17 @@ export function request({
       ...params.headers,
       'Content-Type': 'application/json',
     }
+
     params.body = JSON.stringify(body)
   }
 
+  if (extraHeaders !== undefined) {
+    params.headers = {
+      ...params.headers,
+      ...extraHeaders,
+    }
+  }
+
   if (bodyStream) {
     params.body = bodyStream
   }

src/commands/postgres/addon/install.ts

@@ -15,7 +15,7 @@ export default class PostgresAddonInstall extends Command {
     const {flags} = await this.parse(PostgresAddonInstall)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects`
-    const project = 'postgres-addon';
+    const project = 'postgres-addon'
     const body = {
       name: project,
       githubRepo: 'letsdiscodev/disco-addon-postgres',

src/commands/postgres/addon/remove.ts

@@ -14,7 +14,7 @@ export default class PostgresAddonRemove extends Command {
   public async run(): Promise<void> {
     const {flags} = await this.parse(PostgresAddonRemove)
     const discoConfig = getDisco(flags.disco || null)
-    const project = 'postgres-addon';
+    const project = 'postgres-addon'
     const url = `https://${discoConfig.host}/api/projects/${project}`
     try {
       await request({method: 'DELETE', url, discoConfig, expectedStatuses: [200, 204]})

src/commands/postgres/addon/update.ts

@@ -14,7 +14,7 @@ export default class PostgresAddonUpdate extends Command {
   public async run(): Promise<void> {
     const {flags} = await this.parse(PostgresAddonUpdate)
     const discoConfig = getDisco(flags.disco || null)
-    const project = 'postgres-addon';
+    const project = 'postgres-addon'
     const url = `https://${discoConfig.host}/api/projects/${project}/deployments`
     const res = await request({method: 'POST', url, body: {}, discoConfig, expectedStatuses: [201]})
     const data = (await res.json()) as any

src/commands/postgres/databases/add.ts

@@ -21,7 +21,15 @@ export default class PostgresDatabasesAdd extends Command {
     const {flags} = await this.parse(PostgresDatabasesAdd)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}/databases`
-    const res = await request({method: 'POST', url, discoConfig, expectedStatuses: [201]})
+    const res = await request({
+      method: 'POST',
+      url,
+      discoConfig,
+      expectedStatuses: [201],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
     const respBody = (await res.json()) as {database: PostgresDatabase}
     this.log(respBody.database.name)
   }

src/commands/postgres/databases/attach.ts

@@ -20,6 +20,15 @@ export default class PostgresDatabasesAttach extends Command {
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}/databases/${flags.database}/attach`
     const reqBody = {envVar: flags['env-var'], project: flags.project}
-    await request({method: 'POST', url, discoConfig, body: reqBody, expectedStatuses: [200]})
+    await request({
+      method: 'POST',
+      url,
+      discoConfig,
+      body: reqBody,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
   }
 }

src/commands/postgres/databases/detach.ts

@@ -20,6 +20,15 @@ export default class PostgresDatabasesDetach extends Command {
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}/databases/${flags.database}/detach`
     const reqBody = {envVar: flags['env-var'], project: flags.project}
-    await request({method: 'POST', url, discoConfig, body: reqBody, expectedStatuses: [200]})
+    await request({
+      method: 'POST',
+      url,
+      discoConfig,
+      body: reqBody,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
   }
 }

src/commands/postgres/databases/list.ts

@@ -3,8 +3,8 @@ import {getDisco} from '../../../config.js'
 import {request} from '../../../auth-request.js'
 
 type PostgresDatabase = {
-  created: string;
-  name: string;
+  created: string
+  name: string
 }
 
 export default class PostgresDatabasesList extends Command {
@@ -21,7 +21,15 @@ export default class PostgresDatabasesList extends Command {
     const {flags} = await this.parse(PostgresDatabasesList)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}/databases`
-    const res = await request({method: 'GET', url, discoConfig, expectedStatuses: [200]})
+    const res = await request({
+      method: 'GET',
+      url,
+      discoConfig,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
     const respBody = (await res.json()) as {databases: PostgresDatabase[]}
     for (const database of respBody.databases) {
       this.log(database.name)

src/commands/postgres/databases/remove.ts

@@ -17,6 +17,14 @@ export default class PostgresDatabasesRemove extends Command {
     const {flags} = await this.parse(PostgresDatabasesRemove)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}/databases/${flags.database}`
-    await request({method: 'DELETE', url, discoConfig, expectedStatuses: [200]})
+    await request({
+      method: 'DELETE',
+      url,
+      discoConfig,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
   }
 }

src/commands/postgres/instances/add.ts

@@ -15,7 +15,15 @@ export default class PostgresInstancesAdd extends Command {
     const {flags} = await this.parse(PostgresInstancesAdd)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances`
-    const res = await request({method: 'POST', url, discoConfig, expectedStatuses: [201]})
+    const res = await request({
+      method: 'POST',
+      url,
+      discoConfig,
+      expectedStatuses: [201],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
     const respBody = (await res.json()) as {project: {name: string}; deployment: {number: number}}
     this.log(`Added instance ${respBody.project.name}`)
     const deploymentUrl = `https://${discoConfig.host}/api/projects/${respBody.project.name}/deployments/${respBody.deployment.number}/output`

src/commands/postgres/instances/list.ts

@@ -3,7 +3,7 @@ import {getDisco} from '../../../config.js'
 import {request} from '../../../auth-request.js'
 
 type PostgresInstance = {
-  name: string;
+  name: string
 }
 
 export default class PostgresInstancesList extends Command {
@@ -19,7 +19,15 @@ export default class PostgresInstancesList extends Command {
     const {flags} = await this.parse(PostgresInstancesList)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances`
-    const res = await request({method: 'GET', url, discoConfig, expectedStatuses: [200]})
+    const res = await request({
+      method: 'GET',
+      url,
+      discoConfig,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
     const respBody = (await res.json()) as {instances: PostgresInstance[]}
     for (const instance of respBody.instances) {
       this.log(instance.name)

src/commands/postgres/instances/remove.ts

@@ -16,6 +16,14 @@ export default class PostgresInstancesRemove extends Command {
     const {flags} = await this.parse(PostgresInstancesRemove)
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/postgres-addon/cgi/endpoints/instances/${flags.instance}`
-    await request({method: 'DELETE', url, discoConfig, expectedStatuses: [200]})
+    await request({
+      method: 'DELETE',
+      url,
+      discoConfig,
+      expectedStatuses: [200],
+      extraHeaders: {
+        'X-Disco-Include-API-Key': 'true',
+      },
+    })
   }
 }