@skillswaveca/nova-shared-libraries 4.15.1 → 4.16.0

package/docs-base/package-info.js

@@ -1,31 +1,31 @@
 export const packageInfo = [
   {
     "name": "@skillswaveca/nova-utils",
-    "version": "3.15.1",
+    "version": "4.16.0",
     "description": "A collection of random utils used in nova repos",
     "docsPath": "./nova-utils/index.html"
   },
   {
     "name": "nova-router",
-    "version": "3.15.1",
+    "version": "4.16.0",
     "description": "An extended Koa router that enables better validation",
     "docsPath": "./nova-router/index.html"
   },
   {
     "name": "@skillswaveca/nova-model",
-    "version": "3.15.1",
+    "version": "4.16.0",
     "description": "Nova model stuff",
     "docsPath": "./nova-model/index.html"
   },
   {
     "name": "@skillswaveca/nova-middleware",
-    "version": "3.15.1",
+    "version": "4.16.0",
     "description": "A collection of middleware used by nova projects",
     "docsPath": "./nova-middleware/index.html"
   },
   {
     "name": "@skillswaveca/nova-drivers",
-    "version": "3.15.1",
+    "version": "4.16.0",
     "description": "Some helper drivers for AWS services",
     "docsPath": "./drivers/index.html"
   }

package/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-shared-libraries",
   "description": "A monorepo of shared libraries for Nova projects.",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "license": "MIT",
   "keywords": [],

package/packages/drivers/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-drivers",
   "description": "Some helper drivers for AWS services",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/drivers/src/aws/secrets-manager.js

@@ -23,17 +23,22 @@ export class SecretsManager extends AwsBaseDriver {
    *
    * @param {*} secretName - The name of the secret stored in AWS Secret Manager.
    * @param {string} [keyId] - An optional key to retrieve a specific value from an AWS secret object.
+   * @param {string} [region] - An optional region to fetch the secret from.
+   * @param {string} [rootEnvironmentAwsAccountId] - An optional AWS account ID to fetch the secret from.
    * @returns - The secret value. If the secret was created via the web interface, this string
    *  is a JSON. Otherwise (e.g. via the API), this string is the secret itself.
    */
-  async getSecret(secretName, keyId) {
+  async getSecret(secretName, keyId, region, rootEnvironmentAwsAccountId) {
     if (!secretName) {
       this.log.error('Missing secret name to fetch secret');
       return;
     }
 
     try {
-      const data = await this.client.send(new GetSecretValueCommand({ SecretId: secretName }));
+      const secretId = region && rootEnvironmentAwsAccountId ?
+        `arn:aws:secretsmanager:${region}:${rootEnvironmentAwsAccountId}:secret:${secretName}` :
+        secretName;
+      const data = await this.client.send(new GetSecretValueCommand({ SecretId: secretId }));
       const DEFAULT_SECRET_KEY = 'secretValue';
       const ALL_KEYS = 'allKeys';
       const secretData = JSON.parse(data.SecretString);

package/packages/drivers/src/oauth.js

@@ -35,6 +35,8 @@ export class OAuthDriver extends HttpDriver {
    * @param {Object} configuration.oauth.auth - The authentication details.
    * @param {string} configuration.oauth.auth.tokenHost - The host for the token.
    * @param {string} configuration.oauth.auth.tokenPath - The path for the token.
+   * @param {string} configuration.region - The region for the secrets.
+   * @param {string} configuration.rootEnvironmentAwsAccountId - The account ID for the secrets.
    */
   constructor(apiIdentifier, configuration = {}) {
     const { baseUrl, oauth, tokenConfig } = configuration;
@@ -52,6 +54,9 @@ export class OAuthDriver extends HttpDriver {
     this.tokenConfig = tokenConfig;
     this.secretKey = oauth.client.secret;
     this.secretKeyId = oauth.client.secretKeyId;
+
+    this.region = configuration.region;
+    this.rootEnvironmentAwsAccountId = configuration.rootEnvironmentAwsAccountId
   }
 
   /**
@@ -142,7 +147,7 @@ export class OAuthDriver extends HttpDriver {
     if (this.clientCredentialsInstance) {
       return this.clientCredentialsInstance;
     }
-    if (this.secretKey) this.clientConfig.client.secret = await secretsManager.getSecret(this.secretKey, this.secretKeyId);
+    if (this.secretKey) this.clientConfig.client.secret = await secretsManager.getSecret(this.secretKey, this.secretKeyId, this.region, this.rootEnvironmentAwsAccountId);
     delete this.clientConfig.client.secretKeyId;
     this.clientCredentialsInstance = new ClientCredentials(this.clientConfig);
     return this.clientCredentialsInstance;

package/packages/nova-middleware/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-middleware",
   "description": "A collection of middleware used by nova projects",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-model/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-model",
   "description": "Nova model stuff",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-router/package.json

@@ -3,7 +3,7 @@
   "name": "nova-router",
   "description": "An extended Koa router that enables better validation",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-utils/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-utils",
   "description": "A collection of random utils used in nova repos",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.15.1",
+  "version": "4.16.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",