@heroku-cli/plugin-data-privatelink 1.3.1 → 1.3.2

package/lib/commands/data/privatelink/wait.js

@@ -1,32 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@heroku-cli/command");
-const cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const base_1 = require("../../../base");
 const fetcher_1 = require("../../../lib/fetcher");
-class EndpointsWait extends base_1.default {
+class Wait extends base_1.default {
     async run() {
-        const { args, flags } = this.parse(EndpointsWait);
-        const database = await fetcher_1.default(this.heroku, args.database, flags.app);
+        const { args, flags } = await this.parse(Wait);
+        const database = await (0, fetcher_1.default)(this.heroku, args.database, flags.app);
         let status;
-        cli_ux_1.cli.action.start('Waiting for the privatelink endpoint to be provisioned');
+        core_1.ux.action.start('Waiting for the privatelink endpoint to be provisioned');
         while (status !== 'Operational') {
-            let { body: res } = await this.shogun.get(`/private-link/v0/databases/${database}`, this.shogun.defaults);
+            const { body: res } = await this.shogun.get(`/private-link/v0/databases/${database}`, this.shogun.defaults);
             status = res.status;
-            await cli_ux_1.cli.wait(3000);
+            await core_1.ux.wait(3000);
         }
-        cli_ux_1.cli.action.stop();
+        core_1.ux.action.stop();
     }
 }
-EndpointsWait.description = 'wait for your privatelink endpoint to be provisioned';
-EndpointsWait.aliases = ['pg:privatelink:wait', 'kafka:privatelink:wait', 'redis:privatelink:wait'];
-EndpointsWait.args = [
-    { name: 'database' }
-];
-EndpointsWait.flags = {
-    app: command_1.flags.app({ required: true })
+exports.default = Wait;
+Wait.description = 'wait for your privatelink endpoint to be provisioned';
+Wait.hiddenAliases = ['pg:privatelink:wait', 'kafka:privatelink:wait', 'redis:privatelink:wait'];
+Wait.args = {
+    database: core_1.Args.string({ required: true }),
+};
+Wait.flags = {
+    app: command_1.flags.app({ required: true }),
+    remote: command_1.flags.remote(),
 };
-EndpointsWait.examples = [
-    '$ heroku data:privatelink:wait postgresql-sushi-12345',
+Wait.examples = [
+    '$ heroku data:privatelink:wait postgresql-sushi-12345 postgresql-sushi-12345 --app my-app',
 ];
-exports.default = EndpointsWait;

package/oclif.manifest.json

@@ -1 +1,314 @@
-{"version":"1.3.1","commands":{"data:privatelink:create":{"id":"data:privatelink:create","description":"create a new privatelink endpoint for your database","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:create","kafka:privatelink:create","redis:privatelink:create"],"examples":["$ heroku data:privatelink:create postgresql-sushi-12345 --aws-account-id 123456789012:user/abc","$ heroku data:privatelink:create postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --account-id 123456789012:user/xyz"],"flags":{"aws-account-id":{"name":"aws-account-id","type":"option","char":"i","description":"AWS account id to use"},"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink:destroy":{"id":"data:privatelink:destroy","description":"destroy a privatelink endpoint for your database","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:destroy","kafka:privatelink:destroy","redis:privatelink:destroy"],"examples":["$ heroku data:privatelink:destroy postgresql-sushi-12345"],"flags":{"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink":{"id":"data:privatelink","description":"list all your privatelink endpoints!","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink","kafka:privatelink","redis:privatelink"],"examples":["$ heroku data:privatelink postgresql-sushi-12345"],"flags":{"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink:wait":{"id":"data:privatelink:wait","description":"wait for your privatelink endpoint to be provisioned","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:wait","kafka:privatelink:wait","redis:privatelink:wait"],"examples":["$ heroku data:privatelink:wait postgresql-sushi-12345"],"flags":{"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink:access:add":{"id":"data:privatelink:access:add","description":"add an allowed account to your privatelink endpoint","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:access:add","kafka:privatelink:access:add","redis:privatelink:access:add"],"examples":["$ heroku data:privatelink:access:add postgresql-sushi-12345 --aws-account-id 123456789012:user/abc","$ heroku data:privatelink:access:add postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --aws-account-id 123456789012:user/xyz"],"flags":{"aws-account-id":{"name":"aws-account-id","type":"option","char":"i","description":"AWS account id to use"},"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink:access":{"id":"data:privatelink:access","description":"list all allowed accounts for your privatelink endpoint","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:access","kafka:privatelink:access","redis:privatelink:access"],"examples":["$ heroku data:privatelink:access postgresql-sushi-12345"],"flags":{"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]},"data:privatelink:access:remove":{"id":"data:privatelink:access:remove","description":"remove an allowed account from your privatelink endpoint","pluginName":"@heroku-cli/plugin-data-privatelink","pluginType":"core","aliases":["pg:privatelink:access:remove","kafka:privatelink:access:remove","redis:privatelink:access:remove"],"examples":["$ heroku data:privatelink:access:remove postgresql-sushi-12345 --aws-account-id 123456789012:user/xyz","$ heroku data:privatelink:access:remove postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --aws-account-id 123456789012:user/xyz"],"flags":{"aws-account-id":{"name":"aws-account-id","type":"option","char":"i","description":"AWS account id to use"},"app":{"name":"app","type":"option","char":"a","description":"app to run command against","required":true}},"args":[{"name":"database"}]}}}
+{
+  "version": "1.3.2",
+  "commands": {
+    "data:privatelink:create": {
+      "id": "data:privatelink:create",
+      "description": "create a new privatelink endpoint for your database",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:create",
+        "kafka:privatelink:create",
+        "redis:privatelink:create"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:create postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --app my-app",
+        "$ heroku data:privatelink:create postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --account-id 123456789012:user/xyz --app my-app"
+      ],
+      "flags": {
+        "aws-account-id": {
+          "name": "aws-account-id",
+          "type": "option",
+          "char": "i",
+          "description": "AWS account id to use",
+          "required": true,
+          "multiple": true
+        },
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      }
+    },
+    "data:privatelink:destroy": {
+      "id": "data:privatelink:destroy",
+      "description": "destroy a privatelink endpoint for your database",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:destroy",
+        "kafka:privatelink:destroy",
+        "redis:privatelink:destroy"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:destroy postgresql-sushi-12345 --app my-app"
+      ],
+      "flags": {
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      }
+    },
+    "data:privatelink": {
+      "id": "data:privatelink",
+      "description": "list all your privatelink endpoints",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink",
+        "kafka:privatelink",
+        "redis:privatelink"
+      ],
+      "examples": [
+        "$ heroku data:privatelink postgresql-sushi-12345 --app my-app"
+      ],
+      "flags": {
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      },
+      "topic": "data:privatelink"
+    },
+    "data:privatelink:wait": {
+      "id": "data:privatelink:wait",
+      "description": "wait for your privatelink endpoint to be provisioned",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:wait",
+        "kafka:privatelink:wait",
+        "redis:privatelink:wait"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:wait postgresql-sushi-12345 postgresql-sushi-12345 --app my-app"
+      ],
+      "flags": {
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      }
+    },
+    "data:privatelink:access:add": {
+      "id": "data:privatelink:access:add",
+      "description": "add one or more allowed AWS accounts to your privatelink endpoint",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:access:add",
+        "kafka:privatelink:access:add",
+        "redis:privatelink:access:add"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:access:add postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --app my-app",
+        "$ heroku data:privatelink:access:add postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --aws-account-id 123456789012:user/xyz --app my-app"
+      ],
+      "flags": {
+        "aws-account-id": {
+          "name": "aws-account-id",
+          "type": "option",
+          "char": "i",
+          "description": "AWS account id to use",
+          "required": true,
+          "multiple": true
+        },
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      }
+    },
+    "data:privatelink:access": {
+      "id": "data:privatelink:access",
+      "description": "list all allowed accounts for your privatelink endpoint",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:access",
+        "kafka:privatelink:access",
+        "redis:privatelink:access"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:access postgresql-sushi-12345 --app my-app"
+      ],
+      "flags": {
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      },
+      "topic": "data:privatelink:access"
+    },
+    "data:privatelink:access:remove": {
+      "id": "data:privatelink:access:remove",
+      "description": "remove an allowed account from your privatelink endpoint",
+      "strict": true,
+      "pluginName": "@heroku-cli/plugin-data-privatelink",
+      "pluginAlias": "@heroku-cli/plugin-data-privatelink",
+      "pluginType": "core",
+      "aliases": [],
+      "hiddenAliases": [
+        "pg:privatelink:access:remove",
+        "kafka:privatelink:access:remove",
+        "redis:privatelink:access:remove"
+      ],
+      "examples": [
+        "$ heroku data:privatelink:access:remove postgresql-sushi-12345 --aws-account-id 123456789012:user/xyz --app my-app",
+        "$ heroku data:privatelink:access:remove postgresql-sushi-12345 --aws-account-id 123456789012:user/abc --aws-account-id 123456789012:user/xyz --app my-app"
+      ],
+      "flags": {
+        "aws-account-id": {
+          "name": "aws-account-id",
+          "type": "option",
+          "char": "i",
+          "description": "AWS account id to use",
+          "required": true,
+          "multiple": true
+        },
+        "app": {
+          "name": "app",
+          "type": "option",
+          "char": "a",
+          "description": "app to run command against",
+          "required": true,
+          "multiple": false
+        },
+        "remote": {
+          "name": "remote",
+          "type": "option",
+          "char": "r",
+          "description": "git remote of app to use",
+          "multiple": false
+        }
+      },
+      "args": {
+        "database": {
+          "name": "database",
+          "required": true
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,41 +1,47 @@
 {
   "name": "@heroku-cli/plugin-data-privatelink",
   "description": "Heroku Data via PrivateLink CLI",
-  "version": "1.3.1",
-  "author": "Heroku Data UX",
+  "version": "1.3.2",
+  "author": "Heroku",
   "bugs": "https://github.com/heroku/heroku-data-privatelink-cli/issues",
   "dependencies": {
-    "@heroku-cli/color": "^1.1.14",
-    "@heroku-cli/command": "^8.2.6",
-    "@oclif/command": "^1.5.8",
-    "@oclif/config": "^1.10.4",
-    "@oclif/errors": "^1.2.2",
-    "@types/supports-color": "^5.3.0",
-    "cli-ux": "^5.0.0",
-    "tslib": "^1.9.3"
+    "@heroku-cli/color": "^2.0.1",
+    "@heroku-cli/command": "^11.1.2",
+    "@heroku-cli/schema": "^1.0.25",
+    "@oclif/core": "^2.16.0",
+    "@oclif/plugin-help": "^5",
+    "stdout-stderr": "^0.1.13",
+    "tslib": "1.14.1"
   },
   "devDependencies": {
-    "@fancy-test/nock": "^0.1.1",
-    "@heroku-cli/schema": "^1.0.23",
-    "@oclif/dev-cli": "^1.21.0",
-    "@oclif/plugin-help": "^2.1.4",
-    "@oclif/test": "^1.2.2",
-    "@oclif/tslint": "^3.1.1",
-    "@types/chai": "^4.1.7",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.18",
-    "chai": "^4.2.0",
-    "globby": "^8.0.1",
-    "lolex": "^3.0.0",
-    "mocha": "^5.2.0",
-    "nock": "^10.0.5",
-    "nyc": "^13.1.0",
-    "ts-node": "^7.0.1",
-    "tslint": "^5.12.0",
-    "typescript": "^3.2.2"
+    "@oclif/test": "^2.3.28",
+    "@types/chai": "^4.3.14",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^16.11.7",
+    "@types/supports-color": "^8.1.3",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^7.1.1",
+    "eslint": "^7.32.0",
+    "eslint-config-oclif": "^4.0.0",
+    "eslint-config-oclif-typescript": "^1.0.2",
+    "eslint-import-resolver-typescript": "^3.5.5",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-mocha": "^10.4.3",
+    "globby": "^10.0.2",
+    "lolex": "^3.1.0",
+    "mocha": "^9.2.2",
+    "nock": "^13.5.1",
+    "nyc": "^15.1.0",
+    "oclif": "3.17.2",
+    "ts-node": "^10.9.2",
+    "tsheredoc": "^1.0.1",
+    "typescript": "4.8.4"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "/lib",
@@ -45,22 +51,40 @@
   ],
   "homepage": "https://github.com/heroku/heroku-data-privatelink-cli",
   "keywords": [
-    "oclif-plugin"
+    "heroku",
+    "heroku-cli-plugin"
   ],
   "license": "MIT",
+  "mocha": {
+    "require": [
+      "test/helpers/init.js",
+      "ts-node/register",
+      "source-map-support/register"
+    ],
+    "watch-extensions": "ts",
+    "recursive": true,
+    "reporter": "spec",
+    "timeout": 30000
+  },
   "oclif": {
     "commands": "./lib/commands",
     "bin": "heroku",
-    "devPlugins": [
+    "plugins": [
       "@oclif/plugin-help"
     ]
   },
   "repository": "heroku/heroku-data-privatelink-cli",
+  "resolutions": {
+    "isbinaryfile": "4.0.10"
+  },
   "scripts": {
+    "build": "rm -rf lib && tsc -b",
+    "lint": "eslint . --ext .ts --config .eslintrc",
     "postpack": "rm -f oclif.manifest.json",
-    "posttest": "tslint -p test -t stylish",
-    "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "version": "oclif-dev readme && git add README.md"
+    "posttest": "yarn lint",
+    "prepack": "rm -rf lib && tsc -b && oclif manifest",
+    "pretest": "tsc -p test --noEmit && yarn build",
+    "test": "nyc mocha --forbid-only \"test/**/*.unit.test.ts\"",
+    "version": "oclif readme && git add README.md"
   }
 }