heroku 10.14.0 → 10.15.0

package/lib/commands/telemetry/add.d.ts

@@ -13,4 +13,5 @@ export default class Add extends Command {
     };
     static example: string;
     run(): Promise<void>;
+    private getExporterType;
 }

package/lib/commands/telemetry/add.js

@@ -9,6 +9,13 @@ class Add extends command_1.Command {
         const { flags, args } = await this.parse(Add);
         const { app, headers, space, signals, transport } = flags;
         const { endpoint } = args;
+        // Allow splunk, but do not show splunk in error message until splunk transport is accepted as a feature
+        // When splunk transport is accepted as a feature, and options are added for the transport flag, this section should be removed
+        const publicTransports = ['http', 'grpc'];
+        const validTransports = [...publicTransports, 'splunk'];
+        if (!validTransports.includes(transport)) {
+            throw new Error(`Expected --transport=${transport} to be one of: ${publicTransports.join(', ')}`);
+        }
         let id;
         if (app) {
             const { body: herokuApp } = await this.heroku.get(`/apps/${app}`, {
@@ -29,7 +36,7 @@ class Add extends command_1.Command {
             signals: (0, util_1.validateAndFormatSignals)(signals),
             exporter: {
                 endpoint,
-                type: (transport === 'grpc') ? 'otlp' : 'otlphttp',
+                type: this.getExporterType(transport),
                 headers: JSON.parse(exporterHeaders),
             },
         };
@@ -41,6 +48,16 @@ class Add extends command_1.Command {
         });
         core_1.ux.log(`successfully added drain ${drain.exporter.endpoint}`);
     }
+    getExporterType(transport) {
+        switch (transport) {
+            case 'grpc':
+                return 'otlp';
+            case 'splunk':
+                return 'splunk';
+            default:
+                return 'otlphttp';
+        }
+    }
 }
 exports.default = Add;
 Add.description = 'Add and configure a new telemetry drain. Defaults to collecting all telemetry unless otherwise specified.';
@@ -49,7 +66,8 @@ Add.flags = {
     headers: command_1.flags.string({ description: 'custom headers to configure the drain in json format' }),
     space: command_1.flags.string({ char: 's', description: 'space to add a drain to' }),
     signals: command_1.flags.string({ default: 'all', description: 'comma-delimited list of signals to collect (traces, metrics, logs). Use "all" to collect all signals.' }),
-    transport: command_1.flags.string({ default: 'http', options: ['http', 'grpc'], description: 'transport protocol for the drain' }),
+    // If splunk transport is accepted as a feature, this should have options: ['http', 'grpc', 'splunk']
+    transport: command_1.flags.string({ default: 'http', description: 'transport protocol for the drain' }),
 };
 Add.args = {
     endpoint: core_1.Args.string({ required: true, description: 'drain url' }),

package/oclif.manifest.json

@@ -2102,49 +2102,47 @@
         "unlock.js"
       ]
     },
-    "autocomplete:create": {
-      "aliases": [],
+    "auth:login": {
+      "aliases": [
+        "login"
+      ],
       "args": {},
-      "description": "create autocomplete setup scripts and completion functions",
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hidden": true,
-      "hiddenAliases": [],
-      "id": "autocomplete:create",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "autocomplete",
-        "create.js"
-      ]
-    },
-    "autocomplete:doctor": {
-      "aliases": [],
-      "args": {
-        "shell": {
-          "description": "shell type",
-          "name": "shell",
-          "required": false
-        }
-      },
-      "description": "autocomplete diagnostic",
+      "description": "login with your Heroku credentials",
       "flags": {
-        "verbose": {
-          "description": "list completable commands",
-          "name": "verbose",
+        "browser": {
+          "description": "browser to open SSO with (example: \"firefox\", \"safari\")",
+          "name": "browser",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sso": {
+          "char": "s",
+          "description": "login for enterprise users under SSO",
+          "hidden": true,
+          "name": "sso",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "interactive": {
+          "char": "i",
+          "description": "login with username/password",
+          "name": "interactive",
           "allowNo": false,
           "type": "boolean"
+        },
+        "expires-in": {
+          "char": "e",
+          "description": "duration of token in seconds (default 30 days)",
+          "name": "expires-in",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
-      "hidden": true,
       "hiddenAliases": [],
-      "id": "autocomplete:doctor",
+      "id": "auth:login",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -2153,38 +2151,20 @@
       "relativePath": [
         "lib",
         "commands",
-        "autocomplete",
-        "doctor.js"
+        "auth",
+        "login.js"
       ]
     },
-    "autocomplete": {
-      "aliases": [],
-      "args": {
-        "shell": {
-          "description": "shell type",
-          "name": "shell",
-          "required": false
-        }
-      },
-      "description": "display autocomplete installation instructions",
-      "examples": [
-        "$ heroku autocomplete",
-        "$ heroku autocomplete bash",
-        "$ heroku autocomplete zsh",
-        "$ heroku autocomplete --refresh-cache"
+    "auth:logout": {
+      "aliases": [
+        "logout"
       ],
-      "flags": {
-        "refresh-cache": {
-          "char": "r",
-          "description": "refresh cache only (ignores displaying instructions)",
-          "name": "refresh-cache",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
+      "args": {},
+      "description": "clears local login credentials and invalidates API session",
+      "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "autocomplete",
+      "id": "auth:logout",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -2193,34 +2173,26 @@
       "relativePath": [
         "lib",
         "commands",
-        "autocomplete",
-        "index.js"
+        "auth",
+        "logout.js"
       ]
     },
-    "autocomplete:options": {
+    "auth:token": {
       "aliases": [],
-      "args": {
-        "completion": {
-          "name": "completion"
-        }
-      },
-      "description": "display arg or flag completion options (used internally by completion functions)",
+      "args": {},
+      "description": "outputs current CLI authentication token.\nBy default, the CLI auth token is only valid for 1 year. To generate a long-lived token, use heroku authorizations:create",
       "flags": {
-        "app": {
-          "char": "a",
-          "description": "app to run command against",
-          "hidden": true,
-          "name": "app",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "help": {
+          "char": "h",
+          "description": "Show CLI help.",
+          "name": "help",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
-      "hidden": true,
       "hiddenAliases": [],
-      "id": "autocomplete:options",
+      "id": "auth:token",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -2229,25 +2201,20 @@
       "relativePath": [
         "lib",
         "commands",
-        "autocomplete",
-        "options.js"
+        "auth",
+        "token.js"
       ]
     },
-    "autocomplete:script": {
-      "aliases": [],
-      "args": {
-        "shell": {
-          "description": "shell type",
-          "name": "shell",
-          "required": false
-        }
-      },
-      "description": "display autocomplete setup script for shell",
+    "auth:whoami": {
+      "aliases": [
+        "whoami"
+      ],
+      "args": {},
+      "description": "display the current logged in user",
       "flags": {},
       "hasDynamicHelp": false,
-      "hidden": true,
       "hiddenAliases": [],
-      "id": "autocomplete:script",
+      "id": "auth:whoami",
       "pluginAlias": "heroku",
       "pluginName": "heroku",
       "pluginType": "core",
@@ -2256,8 +2223,8 @@
       "relativePath": [
         "lib",
         "commands",
-        "autocomplete",
-        "script.js"
+        "auth",
+        "whoami.js"
       ]
     },
     "authorizations:create": {
@@ -2500,6 +2467,164 @@
         "update.js"
       ]
     },
+    "autocomplete:create": {
+      "aliases": [],
+      "args": {},
+      "description": "create autocomplete setup scripts and completion functions",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "autocomplete:create",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "autocomplete",
+        "create.js"
+      ]
+    },
+    "autocomplete:doctor": {
+      "aliases": [],
+      "args": {
+        "shell": {
+          "description": "shell type",
+          "name": "shell",
+          "required": false
+        }
+      },
+      "description": "autocomplete diagnostic",
+      "flags": {
+        "verbose": {
+          "description": "list completable commands",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "autocomplete:doctor",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "autocomplete",
+        "doctor.js"
+      ]
+    },
+    "autocomplete": {
+      "aliases": [],
+      "args": {
+        "shell": {
+          "description": "shell type",
+          "name": "shell",
+          "required": false
+        }
+      },
+      "description": "display autocomplete installation instructions",
+      "examples": [
+        "$ heroku autocomplete",
+        "$ heroku autocomplete bash",
+        "$ heroku autocomplete zsh",
+        "$ heroku autocomplete --refresh-cache"
+      ],
+      "flags": {
+        "refresh-cache": {
+          "char": "r",
+          "description": "refresh cache only (ignores displaying instructions)",
+          "name": "refresh-cache",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "autocomplete",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "autocomplete",
+        "index.js"
+      ]
+    },
+    "autocomplete:options": {
+      "aliases": [],
+      "args": {
+        "completion": {
+          "name": "completion"
+        }
+      },
+      "description": "display arg or flag completion options (used internally by completion functions)",
+      "flags": {
+        "app": {
+          "char": "a",
+          "description": "app to run command against",
+          "hidden": true,
+          "name": "app",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "autocomplete:options",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "autocomplete",
+        "options.js"
+      ]
+    },
+    "autocomplete:script": {
+      "aliases": [],
+      "args": {
+        "shell": {
+          "description": "shell type",
+          "name": "shell",
+          "required": false
+        }
+      },
+      "description": "display autocomplete setup script for shell",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "autocomplete:script",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "autocomplete",
+        "script.js"
+      ]
+    },
     "buildpacks:add": {
       "aliases": [],
       "args": {
@@ -2829,131 +2954,6 @@
         "versions.js"
       ]
     },
-    "auth:login": {
-      "aliases": [
-        "login"
-      ],
-      "args": {},
-      "description": "login with your Heroku credentials",
-      "flags": {
-        "browser": {
-          "description": "browser to open SSO with (example: \"firefox\", \"safari\")",
-          "name": "browser",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sso": {
-          "char": "s",
-          "description": "login for enterprise users under SSO",
-          "hidden": true,
-          "name": "sso",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "interactive": {
-          "char": "i",
-          "description": "login with username/password",
-          "name": "interactive",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "expires-in": {
-          "char": "e",
-          "description": "duration of token in seconds (default 30 days)",
-          "name": "expires-in",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "auth:login",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "auth",
-        "login.js"
-      ]
-    },
-    "auth:logout": {
-      "aliases": [
-        "logout"
-      ],
-      "args": {},
-      "description": "clears local login credentials and invalidates API session",
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "auth:logout",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "auth",
-        "logout.js"
-      ]
-    },
-    "auth:token": {
-      "aliases": [],
-      "args": {},
-      "description": "outputs current CLI authentication token.\nBy default, the CLI auth token is only valid for 1 year. To generate a long-lived token, use heroku authorizations:create",
-      "flags": {
-        "help": {
-          "char": "h",
-          "description": "Show CLI help.",
-          "name": "help",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "auth:token",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "auth",
-        "token.js"
-      ]
-    },
-    "auth:whoami": {
-      "aliases": [
-        "whoami"
-      ],
-      "args": {},
-      "description": "display the current logged in user",
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "auth:whoami",
-      "pluginAlias": "heroku",
-      "pluginName": "heroku",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "commands",
-        "auth",
-        "whoami.js"
-      ]
-    },
     "certs:add": {
       "aliases": [],
       "args": {
@@ -10232,10 +10232,6 @@
           "default": "http",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "http",
-            "grpc"
-          ],
           "type": "option"
         }
       },
@@ -15019,5 +15015,5 @@
       ]
     }
   },
-  "version": "10.14.0"
+  "version": "10.15.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.14.0",
+  "version": "10.15.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -398,5 +398,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "c0d7800f947ef8f1a1836a8d735a0cd05795eac4"
+  "gitHead": "4bb523cfac62a21ed79b4cbd1016d1699827ae76"
 }