chore: merge main into v11 (#3466)

* chore(deps): bump qs from 6.14.0 to 6.14.1 (#3444)

Bumps [qs](https://github.com/ljharb/qs) from 6.14.0 to 6.14.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.14.0...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: adding json flag to config:get command (#3464)

adding json flag and applicable tests to handle null and empty string config

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: michaelmalave

package-lock.json

@@ -1,38 +1,58 @@
+import {hux} from '@heroku/heroku-cli-util'
 import {Command, flags} from '@heroku-cli/command'
 import * as Heroku from '@heroku-cli/schema'
 import {Args, ux} from '@oclif/core'
 
 import {quote} from '../../lib/config/quote.js'
 
 export class ConfigGet extends Command {
-  static usage = 'config:get KEY...'
+  static args = {
+    KEY: Args.string({description: 'key name of the config var value', required: true}),
+  }
 
   static description = 'display a single config value for an app'
 
   static example = `$ heroku config:get RAILS_ENV
 production`
 
-  static strict = false
-
-  static args = {
-    KEY: Args.string({required: true, description: 'key name of the config var value'}),
-  }
-
   static flags = {
     app: flags.app({required: true}),
+    json: flags.boolean({char: 'j', description: 'output in json format'}),
     remote: flags.remote(),
     shell: flags.boolean({char: 's', description: 'output config vars in shell format'}),
   }
 
+  static strict = false
+
+  static usage = 'config:get KEY...'
+
   async run() {
-    const {flags, argv} = await this.parse(ConfigGet)
+    const {argv, flags} = await this.parse(ConfigGet)
     const {body: config} = await this.heroku.get<Heroku.ConfigVars>(`/apps/${flags.app}/config-vars`)
-    for (const key of (argv as string[])) {
-      const v = config[key]
-      if (flags.shell) {
-        ux.stdout(`${key}=${quote(v || '')}`)
+
+    if (flags.json) {
+      const results = (argv as string[]).map(key => {
+        const exists = key in config
+        return {
+          key,
+          value: exists ? config[key] : null,
+        }
+      })
+
+      if (results.length === 1) {
+        hux.styledJSON(results[0])
       } else {
-        ux.stdout(v || '')
+        hux.styledJSON(results)
+      }
+    } else if (flags.shell) {
+      for (const key of (argv as string[])) {
+        const v = config[key]
+        this.log(`${key}=${quote(v || '')}`)
+      }
+    } else {
+      for (const key of (argv as string[])) {
+        const v = config[key]
+        this.log(v || '')
       }
     }
   }

packages/cli/src/commands/config/get.ts

@@ -43,4 +43,48 @@ describe('config', function () {
 
     expect(stdout).to.equal('\n')
   })
+
+  it('--json with unset var', async function () {
+    api
+      .get('/apps/myapp/config-vars')
+      .reply(200, {EMPTY_VAR: '', RACK_ENV: 'production'})
+
+    const {stdout} = await runCommand(['config:get', '--app=myapp', '--json', 'MISSING'])
+
+    expect(JSON.parse(stdout)).to.deep.equal({key: 'MISSING', value: null})
+  })
+
+  it('--json with empty string var', async function () {
+    api
+      .get('/apps/myapp/config-vars')
+      .reply(200, {EMPTY_VAR: '', RACK_ENV: 'production'})
+
+    const {stdout} = await runCommand(['config:get', '--app=myapp', '--json', 'EMPTY_VAR'])
+
+    expect(JSON.parse(stdout)).to.deep.equal({key: 'EMPTY_VAR', value: ''})
+  })
+
+  it('--json with normal var', async function () {
+    api
+      .get('/apps/myapp/config-vars')
+      .reply(200, {LANG: 'en_US.UTF-8', RACK_ENV: 'production'})
+
+    const {stdout} = await runCommand(['config:get', '--app=myapp', '--json', 'RACK_ENV'])
+
+    expect(JSON.parse(stdout)).to.deep.equal({key: 'RACK_ENV', value: 'production'})
+  })
+
+  it('--json with multiple vars', async function () {
+    api
+      .get('/apps/myapp/config-vars')
+      .reply(200, {EMPTY_VAR: '', RACK_ENV: 'production'})
+
+    const {stdout} = await runCommand(['config:get', '--app=myapp', '--json', 'MISSING', 'EMPTY_VAR', 'RACK_ENV'])
+
+    expect(JSON.parse(stdout)).to.deep.equal([
+      {key: 'MISSING', value: null},
+      {key: 'EMPTY_VAR', value: ''},
+      {key: 'RACK_ENV', value: 'production'},
+    ])
+  })
 })