pgpm 1.1.1 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/commands/admin-users/add.js +5 -2
  2. package/commands/admin-users/bootstrap.js +4 -1
  3. package/commands/admin-users/remove.js +9 -4
  4. package/esm/commands/admin-users/add.js +5 -2
  5. package/esm/commands/admin-users/bootstrap.js +4 -1
  6. package/esm/commands/admin-users/remove.js +9 -4
  7. package/package.json +6 -6
package/commands/admin-users/add.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const core_1 = require("@pgpmjs/core");
4
+ const env_1 = require("@pgpmjs/env");
4
5
  const logger_1 = require("@pgpmjs/logger");
5
6
  const pg_env_1 = require("pg-env");
6
7
  const log = new logger_1.Logger('admin-users-add');
@@ -32,6 +33,8 @@ exports.default = async (argv, prompter, _options) => {
32
33
  }
33
34
  const pgEnv = (0, pg_env_1.getPgEnvOptions)();
34
35
  const isTest = argv.test;
36
+ // Get merged options (defaults + config + env + overrides)
37
+ const db = (0, env_1.getConnEnvOptions)();
35
38
  const init = new core_1.PgpmInit(pgEnv);
36
39
  try {
37
40
  if (isTest) {
@@ -47,7 +50,7 @@ exports.default = async (argv, prompter, _options) => {
47
50
  log.info('Operation cancelled.');
48
51
  return;
49
52
  }
50
- await init.bootstrapTestRoles();
53
+ await init.bootstrapTestRoles(db.roles, db.connections);
51
54
  log.success('Test users added successfully.');
52
55
  }
53
56
  else {
@@ -78,7 +81,7 @@ exports.default = async (argv, prompter, _options) => {
78
81
  log.info('Operation cancelled.');
79
82
  return;
80
83
  }
81
- await init.bootstrapDbRoles(username, password);
84
+ await init.bootstrapDbRoles(username, password, db.roles);
82
85
  log.success(`Database user "${username}" added successfully.`);
83
86
  }
84
87
  }
package/commands/admin-users/bootstrap.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const core_1 = require("@pgpmjs/core");
4
+ const env_1 = require("@pgpmjs/env");
4
5
  const logger_1 = require("@pgpmjs/logger");
5
6
  const pg_env_1 = require("pg-env");
6
7
  const log = new logger_1.Logger('admin-users-bootstrap');
@@ -38,9 +39,11 @@ exports.default = async (argv, prompter, _options) => {
38
39
  log.info('Operation cancelled.');
39
40
  return;
40
41
  }
42
+ // Get merged options (defaults + config + env + overrides)
43
+ const db = (0, env_1.getConnEnvOptions)();
41
44
  const init = new core_1.PgpmInit(pgEnv);
42
45
  try {
43
- await init.bootstrapRoles();
46
+ await init.bootstrapRoles(db.roles);
44
47
  log.success('postgres roles and permissions initialized successfully.');
45
48
  }
46
49
  finally {
package/commands/admin-users/remove.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const core_1 = require("@pgpmjs/core");
4
+ const env_1 = require("@pgpmjs/env");
4
5
  const logger_1 = require("@pgpmjs/logger");
5
6
  const pg_env_1 = require("pg-env");
6
7
  const log = new logger_1.Logger('admin-users-remove');
@@ -30,6 +31,10 @@ exports.default = async (argv, prompter, _options) => {
30
31
  }
31
32
  const pgEnv = (0, pg_env_1.getPgEnvOptions)();
32
33
  const isTest = argv.test;
34
+ // Get merged options (defaults + config + env + overrides)
35
+ const db = (0, env_1.getConnEnvOptions)();
36
+ const appUser = db.connections.app.user;
37
+ const adminUser = db.connections.admin.user;
33
38
  const init = new core_1.PgpmInit(pgEnv);
34
39
  try {
35
40
  if (isTest) {
@@ -37,7 +42,7 @@ exports.default = async (argv, prompter, _options) => {
37
42
  {
38
43
  type: 'confirm',
39
44
  name: 'yes',
40
- message: 'Are you sure you want to remove test users (app_user, app_admin)?',
45
+ message: `Are you sure you want to remove test users (${appUser}, ${adminUser})?`,
41
46
  default: false
42
47
  }
43
48
  ]);
@@ -45,8 +50,8 @@ exports.default = async (argv, prompter, _options) => {
45
50
  log.info('Operation cancelled.');
46
51
  return;
47
52
  }
48
- await init.removeDbRoles('app_user');
49
- await init.removeDbRoles('app_admin');
53
+ await init.removeDbRoles(appUser, db.roles);
54
+ await init.removeDbRoles(adminUser, db.roles);
50
55
  log.success('Test users removed successfully.');
51
56
  }
52
57
  else {
@@ -71,7 +76,7 @@ exports.default = async (argv, prompter, _options) => {
71
76
  log.info('Operation cancelled.');
72
77
  return;
73
78
  }
74
- await init.removeDbRoles(username);
79
+ await init.removeDbRoles(username, db.roles);
75
80
  log.success(`Database user "${username}" removed successfully.`);
76
81
  }
77
82
  }
package/esm/commands/admin-users/add.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { PgpmInit } from '@pgpmjs/core';
2
+ import { getConnEnvOptions } from '@pgpmjs/env';
2
3
  import { Logger } from '@pgpmjs/logger';
3
4
  import { getPgEnvOptions } from 'pg-env';
4
5
  const log = new Logger('admin-users-add');
@@ -30,6 +31,8 @@ export default async (argv, prompter, _options) => {
30
31
  }
31
32
  const pgEnv = getPgEnvOptions();
32
33
  const isTest = argv.test;
34
+ // Get merged options (defaults + config + env + overrides)
35
+ const db = getConnEnvOptions();
33
36
  const init = new PgpmInit(pgEnv);
34
37
  try {
35
38
  if (isTest) {
@@ -45,7 +48,7 @@ export default async (argv, prompter, _options) => {
45
48
  log.info('Operation cancelled.');
46
49
  return;
47
50
  }
48
- await init.bootstrapTestRoles();
51
+ await init.bootstrapTestRoles(db.roles, db.connections);
49
52
  log.success('Test users added successfully.');
50
53
  }
51
54
  else {
@@ -76,7 +79,7 @@ export default async (argv, prompter, _options) => {
76
79
  log.info('Operation cancelled.');
77
80
  return;
78
81
  }
79
- await init.bootstrapDbRoles(username, password);
82
+ await init.bootstrapDbRoles(username, password, db.roles);
80
83
  log.success(`Database user "${username}" added successfully.`);
81
84
  }
82
85
  }
package/esm/commands/admin-users/bootstrap.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { PgpmInit } from '@pgpmjs/core';
2
+ import { getConnEnvOptions } from '@pgpmjs/env';
2
3
  import { Logger } from '@pgpmjs/logger';
3
4
  import { getPgEnvOptions } from 'pg-env';
4
5
  const log = new Logger('admin-users-bootstrap');
@@ -36,9 +37,11 @@ export default async (argv, prompter, _options) => {
36
37
  log.info('Operation cancelled.');
37
38
  return;
38
39
  }
40
+ // Get merged options (defaults + config + env + overrides)
41
+ const db = getConnEnvOptions();
39
42
  const init = new PgpmInit(pgEnv);
40
43
  try {
41
- await init.bootstrapRoles();
44
+ await init.bootstrapRoles(db.roles);
42
45
  log.success('postgres roles and permissions initialized successfully.');
43
46
  }
44
47
  finally {
package/esm/commands/admin-users/remove.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { PgpmInit } from '@pgpmjs/core';
2
+ import { getConnEnvOptions } from '@pgpmjs/env';
2
3
  import { Logger } from '@pgpmjs/logger';
3
4
  import { getPgEnvOptions } from 'pg-env';
4
5
  const log = new Logger('admin-users-remove');
@@ -28,6 +29,10 @@ export default async (argv, prompter, _options) => {
28
29
  }
29
30
  const pgEnv = getPgEnvOptions();
30
31
  const isTest = argv.test;
32
+ // Get merged options (defaults + config + env + overrides)
33
+ const db = getConnEnvOptions();
34
+ const appUser = db.connections.app.user;
35
+ const adminUser = db.connections.admin.user;
31
36
  const init = new PgpmInit(pgEnv);
32
37
  try {
33
38
  if (isTest) {
@@ -35,7 +40,7 @@ export default async (argv, prompter, _options) => {
35
40
  {
36
41
  type: 'confirm',
37
42
  name: 'yes',
38
- message: 'Are you sure you want to remove test users (app_user, app_admin)?',
43
+ message: `Are you sure you want to remove test users (${appUser}, ${adminUser})?`,
39
44
  default: false
40
45
  }
41
46
  ]);
@@ -43,8 +48,8 @@ export default async (argv, prompter, _options) => {
43
48
  log.info('Operation cancelled.');
44
49
  return;
45
50
  }
46
- await init.removeDbRoles('app_user');
47
- await init.removeDbRoles('app_admin');
51
+ await init.removeDbRoles(appUser, db.roles);
52
+ await init.removeDbRoles(adminUser, db.roles);
48
53
  log.success('Test users removed successfully.');
49
54
  }
50
55
  else {
@@ -69,7 +74,7 @@ export default async (argv, prompter, _options) => {
69
74
  log.info('Operation cancelled.');
70
75
  return;
71
76
  }
72
- await init.removeDbRoles(username);
77
+ await init.removeDbRoles(username, db.roles);
73
78
  log.success(`Database user "${username}" removed successfully.`);
74
79
  }
75
80
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pgpm",
3
- "version": "1.1.1",
3
+ "version": "1.1.3",
4
4
  "author": "Constructive <developers@constructive.io>",
5
5
  "description": "PostgreSQL Package Manager - Database migration and package management CLI",
6
6
  "main": "index.js",
@@ -45,17 +45,17 @@
45
45
  "ts-node": "^10.9.2"
46
46
  },
47
47
  "dependencies": {
48
- "@pgpmjs/core": "^3.0.9",
49
- "@pgpmjs/env": "^2.8.5",
48
+ "@pgpmjs/core": "^3.1.1",
49
+ "@pgpmjs/env": "^2.8.7",
50
50
  "@pgpmjs/logger": "^1.3.5",
51
- "@pgpmjs/types": "^2.12.5",
51
+ "@pgpmjs/types": "^2.12.6",
52
52
  "appstash": "^0.2.6",
53
53
  "create-gen-app": "^0.6.0",
54
54
  "find-and-require-package-json": "^0.8.2",
55
55
  "inquirerer": "^2.2.0",
56
56
  "js-yaml": "^4.1.0",
57
57
  "minimist": "^1.2.8",
58
- "pg-cache": "^1.6.7",
58
+ "pg-cache": "^1.6.8",
59
59
  "pg-env": "^1.2.4",
60
60
  "semver": "^7.6.2",
61
61
  "shelljs": "^0.10.0",
@@ -73,5 +73,5 @@
73
73
  "pg",
74
74
  "pgsql"
75
75
  ],
76
- "gitHead": "63d51202de99ec03c329e00e5cd1dff4bc60b367"
76
+ "gitHead": "248d4056d3191b71bcab5892ef98b09164de9f7f"
77
77
  }