oracledb 6.10.0 → 7.0.0

package/plugins/configProviders/awssecretsmanager/index.js

@@ -0,0 +1,147 @@
+// Copyright (c) 2026, Oracle and/or its affiliates.
+//-----------------------------------------------------------------------------
+//
+// This software is dual-licensed to you under the Universal Permissive License
+// (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
+//
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
+"use strict";
+
+const util = require("node:util");
+const { base } = require("../base.js");
+const {
+  createAwsCredential,
+  initAwsCommon,
+  initAwsRequestHandler,
+  resolveRegion
+} = require("../awsCommon.js");
+const oracledb = require("oracledb");
+
+let SecretsManagerClient, GetSecretValueCommand;
+
+class AWSSecretsManagerProvider extends base {
+  constructor(provider_arg, urlExtendedPart) {
+    super(urlExtendedPart);
+    if (provider_arg) {
+      this._addParam("secretname", provider_arg);
+    }
+  }
+
+  init() {
+    initAwsCommon();
+    ({ SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager"));
+    this.requestHandler = initAwsRequestHandler(this.paramMap);
+  }
+
+  resolveSecretString(response) {
+    let secretString = response.SecretString;
+    if (!secretString && response.SecretBinary) {
+      secretString = Buffer.from(response.SecretBinary, "base64").toString(
+        "utf-8"
+      );
+    }
+
+    if (!secretString) {
+      throw new Error("Secret payload is empty");
+    }
+
+    return secretString;
+  }
+
+  async returnConfig() {
+    const fetchRegion = await resolveRegion(this.paramMap);
+
+    this.credential = createAwsCredential(
+      this.paramMap,
+      this.requestHandler,
+      fetchRegion
+    );
+
+    const secretsManagerClient = new SecretsManagerClient({
+      region: fetchRegion,
+      credentials: this.credential,
+      requestHandler: this.requestHandler,
+    });
+
+    const secretIdentifier = this.paramMap.get("secretname");
+    if (!secretIdentifier) {
+      throw new Error(
+        "Secret identifier not provided for AWS Secrets Manager ConfigProvider."
+      );
+    }
+
+    const input = {
+      SecretId: secretIdentifier,
+    };
+
+    const versionId = this.paramMap.get("versionid");
+    if (versionId) {
+      input.VersionId = versionId;
+    }
+
+    try {
+      const command = new GetSecretValueCommand(input);
+      const response = await secretsManagerClient.send(command);
+
+      const secretString = this.resolveSecretString(response);
+
+      try {
+        return JSON.parse(secretString);
+      } catch {
+        return secretString;
+      }
+    } catch (e) {
+      throw new Error(
+        `Failed to retrieve configuration from AWS Secrets Manager: ${e.message}`
+      );
+    } finally {
+      secretsManagerClient.destroy();
+    }
+  }
+}
+
+
+async function hookFn(args) {
+  const configProvider = new AWSSecretsManagerProvider(
+    args.provider_arg,
+    args.urlExtendedPart
+  );
+
+  if (args.paramMap) {
+    configProvider.paramMap = args.paramMap;
+  }
+
+  try {
+    configProvider.init();
+  } catch (err) {
+    const errmsg = util.format(
+      "AWS Secrets Manager Config Provider failed to load required modules: %s\n%s",
+      err.message,
+      err.stack
+    );
+    throw new Error(errmsg);
+  }
+
+  const cfg = await configProvider.returnConfig();
+  return [cfg, null];
+}
+
+oracledb.registerConfigurationProviderHook("awssecretsmanager", hookFn);

package/plugins/configProviders/azure/index.js

@@ -29,6 +29,7 @@ let ClientSecretCredential, ClientCertificateCredential, ChainedTokenCredential,
 const util = require('node:util');
 const { base } = require("../base.js");
 const oracledb = require('oracledb');
+
 class AzureProvider extends base {
   constructor(provider_arg, urlExtendedPart) {
     super(urlExtendedPart);
@@ -96,7 +97,7 @@ class AzureProvider extends base {
     return credential;
   }
   async returnConfig() {
-    const configObject = {};
+    let configObject = {};
     const label = this.paramMap.get("label");
     try {
       this.credential =  await this.returnAzureCredential();
@@ -115,10 +116,8 @@ class AzureProvider extends base {
     const params = (await this.retrieveParamValueFromAzureConfigurationProvider(client, label, 'njs'));
     if (params) {
       const obj = JSON.parse(params);
-      for (const key in obj) {
-        var val = obj[key];
-        configObject[key] = val;
-      }
+      const spreadNjs = { ...obj };
+      configObject = { ...configObject, ...spreadNjs };
     } else {
       configObject['njs'] = null;
     }

package/plugins/token/extensionAzure/index.js

@@ -91,7 +91,6 @@ async function servicePrincipalCredentials(params) {
 
 function hookFn(options) {
   if (options.tokenAuthConfigAzure) {
-    // eslint-disable-next-line no-unused-vars
     options.accessToken = async function callbackFn(refresh, config) {
       return await getToken(config);
     };

package/plugins/token/extensionOci/index.js

@@ -200,7 +200,6 @@ async function instancePrincipalAuthentication(accessTokenConfig) {
 //---------------------------------------------------------------------------
 function hookFn(options) {
   if (options.tokenAuthConfigOci) {
-    // eslint-disable-next-line no-unused-vars
     options.accessToken = async function callbackFn(refresh, config) {
       return await getToken(config);
     };

package/build/Release/oracledb-6.10.0-darwin-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.10.0-darwin-arm64.node v22.17.1 71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d 8b14d5980d7d6116abb8865c7baed9e458698dbf Thu, 09 Oct 2025 15:26:22 GMT

package/build/Release/oracledb-6.10.0-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.10.0-darwin-x64.node v20.11.1 71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d 8b14d5980d7d6116abb8865c7baed9e458698dbf Thu, 09 Oct 2025 15:33:20 GMT

package/build/Release/oracledb-6.10.0-js-buildinfo.txt

@@ -1 +0,0 @@
-71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d

package/build/Release/oracledb-6.10.0-linux-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.10.0-linux-arm64.node v20.19.2 71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d 8b14d5980d7d6116abb8865c7baed9e458698dbf Thu, 09 Oct 2025 13:43:20 GMT

package/build/Release/oracledb-6.10.0-linux-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.10.0-linux-x64.node v22.16.0 71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d 8b14d5980d7d6116abb8865c7baed9e458698dbf Thu, 09 Oct 2025 13:31:19 GMT

package/build/Release/oracledb-6.10.0-win32-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.10.0-win32-x64.node v22.17.1 71ba4e79b3fb8ffe6191e84eb0422c9bdfbb6c9d 8b14d5980d7d6116abb8865c7baed9e458698dbf Thu, 09 Oct 2025 13:31:10 GMT