@pgpmjs/env 2.8.6 → 2.8.8

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 (5) hide show
  1. package/env.js +3 -3
  2. package/esm/env.js +3 -3
  3. package/esm/merge.js +21 -1
  4. package/merge.js +21 -1
  5. package/package.json +2 -2
package/env.js CHANGED
@@ -26,7 +26,7 @@ const parseEnvStringArray = (val) => {
26
26
  const getEnvVars = () => {
27
27
  const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE,
28
28
  // New connections.app and connections.admin env vars
29
- DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
29
+ DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SECRET_KEY, AWS_SECRET_ACCESS_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
30
30
  // Jobs-related env vars
31
31
  JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } = process.env;
32
32
  return {
@@ -77,8 +77,8 @@ const getEnvVars = () => {
77
77
  cdn: {
78
78
  ...(BUCKET_NAME && { bucketName: BUCKET_NAME }),
79
79
  ...(AWS_REGION && { awsRegion: AWS_REGION }),
80
- ...(AWS_ACCESS_KEY && { awsAccessKey: AWS_ACCESS_KEY }),
81
- ...(AWS_SECRET_KEY && { awsSecretKey: AWS_SECRET_KEY }),
80
+ ...((AWS_ACCESS_KEY || AWS_ACCESS_KEY_ID) && { awsAccessKey: AWS_ACCESS_KEY || AWS_ACCESS_KEY_ID }),
81
+ ...((AWS_SECRET_KEY || AWS_SECRET_ACCESS_KEY) && { awsSecretKey: AWS_SECRET_KEY || AWS_SECRET_ACCESS_KEY }),
82
82
  ...(MINIO_ENDPOINT && { minioEndpoint: MINIO_ENDPOINT }),
83
83
  },
84
84
  deployment: {
package/esm/env.js CHANGED
@@ -22,7 +22,7 @@ const parseEnvStringArray = (val) => {
22
22
  export const getEnvVars = () => {
23
23
  const { PGROOTDATABASE, PGTEMPLATE, DB_PREFIX, DB_EXTENSIONS, DB_CWD, DB_CONNECTION_USER, DB_CONNECTION_PASSWORD, DB_CONNECTION_ROLE,
24
24
  // New connections.app and connections.admin env vars
25
- DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_SECRET_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
25
+ DB_CONNECTIONS_APP_USER, DB_CONNECTIONS_APP_PASSWORD, DB_CONNECTIONS_ADMIN_USER, DB_CONNECTIONS_ADMIN_PASSWORD, PORT, SERVER_HOST, SERVER_TRUST_PROXY, SERVER_ORIGIN, SERVER_STRICT_AUTH, PGHOST, PGPORT, PGUSER, PGPASSWORD, PGDATABASE, BUCKET_NAME, AWS_REGION, AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SECRET_KEY, AWS_SECRET_ACCESS_KEY, MINIO_ENDPOINT, DEPLOYMENT_USE_TX, DEPLOYMENT_FAST, DEPLOYMENT_USE_PLAN, DEPLOYMENT_CACHE, DEPLOYMENT_TO_CHANGE, MIGRATIONS_CODEGEN_USE_TX,
26
26
  // Jobs-related env vars
27
27
  JOBS_SCHEMA, JOBS_SUPPORT_ANY, JOBS_SUPPORTED, INTERNAL_GATEWAY_URL, INTERNAL_JOBS_CALLBACK_URL, INTERNAL_JOBS_CALLBACK_PORT } = process.env;
28
28
  return {
@@ -73,8 +73,8 @@ export const getEnvVars = () => {
73
73
  cdn: {
74
74
  ...(BUCKET_NAME && { bucketName: BUCKET_NAME }),
75
75
  ...(AWS_REGION && { awsRegion: AWS_REGION }),
76
- ...(AWS_ACCESS_KEY && { awsAccessKey: AWS_ACCESS_KEY }),
77
- ...(AWS_SECRET_KEY && { awsSecretKey: AWS_SECRET_KEY }),
76
+ ...((AWS_ACCESS_KEY || AWS_ACCESS_KEY_ID) && { awsAccessKey: AWS_ACCESS_KEY || AWS_ACCESS_KEY_ID }),
77
+ ...((AWS_SECRET_KEY || AWS_SECRET_ACCESS_KEY) && { awsSecretKey: AWS_SECRET_KEY || AWS_SECRET_ACCESS_KEY }),
78
78
  ...(MINIO_ENDPOINT && { minioEndpoint: MINIO_ENDPOINT }),
79
79
  },
80
80
  deployment: {
package/esm/merge.js CHANGED
@@ -20,7 +20,27 @@ export const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
20
20
  const opts = getEnvOptions({
21
21
  db: overrides
22
22
  }, cwd);
23
- return opts.db;
23
+ // Ensure roles is always resolved from defaults even if config/env explicitly sets it to undefined
24
+ const db = opts.db ?? {};
25
+ const defaultRoles = pgpmDefaults.db?.roles ?? {};
26
+ const defaultConnections = pgpmDefaults.db?.connections ?? {};
27
+ return {
28
+ ...db,
29
+ roles: {
30
+ ...defaultRoles,
31
+ ...(db.roles ?? {})
32
+ },
33
+ connections: {
34
+ app: {
35
+ ...defaultConnections.app,
36
+ ...(db.connections?.app ?? {})
37
+ },
38
+ admin: {
39
+ ...defaultConnections.admin,
40
+ ...(db.connections?.admin ?? {})
41
+ }
42
+ }
43
+ };
24
44
  };
25
45
  export const getDeploymentEnvOptions = (overrides = {}, cwd = process.cwd()) => {
26
46
  const opts = getEnvOptions({
package/merge.js CHANGED
@@ -27,7 +27,27 @@ const getConnEnvOptions = (overrides = {}, cwd = process.cwd()) => {
27
27
  const opts = (0, exports.getEnvOptions)({
28
28
  db: overrides
29
29
  }, cwd);
30
- return opts.db;
30
+ // Ensure roles is always resolved from defaults even if config/env explicitly sets it to undefined
31
+ const db = opts.db ?? {};
32
+ const defaultRoles = types_1.pgpmDefaults.db?.roles ?? {};
33
+ const defaultConnections = types_1.pgpmDefaults.db?.connections ?? {};
34
+ return {
35
+ ...db,
36
+ roles: {
37
+ ...defaultRoles,
38
+ ...(db.roles ?? {})
39
+ },
40
+ connections: {
41
+ app: {
42
+ ...defaultConnections.app,
43
+ ...(db.connections?.app ?? {})
44
+ },
45
+ admin: {
46
+ ...defaultConnections.admin,
47
+ ...(db.connections?.admin ?? {})
48
+ }
49
+ }
50
+ };
31
51
  };
32
52
  exports.getConnEnvOptions = getConnEnvOptions;
33
53
  const getDeploymentEnvOptions = (overrides = {}, cwd = process.cwd()) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pgpmjs/env",
3
- "version": "2.8.6",
3
+ "version": "2.8.8",
4
4
  "author": "Dan Lynch <Dan Lynch>",
5
5
  "description": "PGPM environment management",
6
6
  "main": "index.js",
@@ -43,5 +43,5 @@
43
43
  "devDependencies": {
44
44
  "makage": "^0.1.9"
45
45
  },
46
- "gitHead": "ac6c6b866ea6a578baf61208b22fcb12fdd46e5d"
46
+ "gitHead": "deb816f0fb9aad6cef1accf0dc603e016e48d335"
47
47
  }