ac-awssecrets 2.0.5 → 2.1.1

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+<a name="2.1.1"></a>
+
+## [2.1.1](https://github.com/admiralcloud/ac-awssecrets/compare/v2.1.0..v2.1.1) (2024-05-08 13:44:22)
+
+
+### Bug Fix
+
+* **App:** Only set value from secret, if secret exists | MP | [ab1b8e87bd1e35c7eb4428c1aa90ad9a93597d9e](https://github.com/admiralcloud/ac-awssecrets/commit/ab1b8e87bd1e35c7eb4428c1aa90ad9a93597d9e)    
+Only set value from secret, if secret exists  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+### Chores
+
+* **App:** Updated packages | MP | [57d506749cbcad5372c84952a8e7929dd62dca37](https://github.com/admiralcloud/ac-awssecrets/commit/57d506749cbcad5372c84952a8e7929dd62dca37)    
+Updated packages  
+Related issues: [undefined/undefined#master](undefined/browse/master)
+<a name="2.1.0"></a>
+ 
+# [2.1.0](https://github.com/admiralcloud/ac-awssecrets/compare/v2.0.5..v2.1.0) (2023-12-31 14:46:52)
+
+
+### Feature
+
+* **App:** Do not use custom credentialprovider | MP | [9556a0fb87e15c8d1242585373a706853384d796](https://github.com/admiralcloud/ac-awssecrets/commit/9556a0fb87e15c8d1242585373a706853384d796)    
+It does not seem to speed up the process to use custom credential provider. It can also create compatibility issues  
+Related issues: [undefined/undefined#develop](undefined/browse/develop)
+### Chores
+
+* **App:** Updated packages | MP | [cd5c172c2ed8169f5927c4a7e6562b7a5a9b5899](https://github.com/admiralcloud/ac-awssecrets/commit/cd5c172c2ed8169f5927c4a7e6562b7a5a9b5899)    
+Updated packages  
+Related issues: [undefined/undefined#develop](undefined/browse/develop)
 <a name="2.0.5"></a>
 
 ## [2.0.5](https://github.com/admiralcloud/ac-awssecrets/compare/v2.0.4..v2.0.5) (2023-06-24 09:11:54)

package/index.js

@@ -1,5 +1,4 @@
 const { SecretsManagerClient, GetSecretValueCommand } = require('@aws-sdk/client-secrets-manager')
-const customCredentialProvider = require('ac-aws-customcredentialprovider')
 
 const testConfig = require('./test/config');
 
@@ -36,8 +35,7 @@ const awsSecrets = () => {
     const environment = config?.environment || 'development'
 
     const awsConfig = {
-      region: 'eu-central-1',
-      credentials: customCredentialProvider({ localDevelopment: config.localDevelopment, debug })
+      region: 'eu-central-1'
     }
     const client = new SecretsManagerClient(awsConfig)
 
@@ -104,55 +102,56 @@ const awsSecrets = () => {
       for (const secret of secrets) {
         let existingValue = getKey(config, secret.key) || {}
         let value = secret?.value
-
-        // convert values
-        if (typeof value === 'object') {
-          Object.keys(value).forEach((key) => {
-            let val = value[key]
-            if (val === 'true') val = true
-            else if (val === 'false') val = false
-            else if (typeof val === 'string' && val.startsWith('JSON:')) {
-              try {
-                val = JSON.parse(val.substring(5))
-              }
-              catch(e) {
-                console.error('%s | %s | JSON could not be parsed %j', functionName, secret.name, val)
-                throw new Error('invalidJSON')
-              }
-            }
-            value[key] = val
-          })
-        }
-
-        if (secret.servers) {
-          if (typeof secret.servers === 'boolean') {
-            let servers = existingValue?.servers || []
-            config[secret.key].servers = servers.map(server => {
-              if (server.server === secret.serverName) {
-                server = { ...server, ...value }
+        if (value) {
+          // convert values
+          if (typeof value === 'object') {
+            Object.keys(value).forEach((key) => {
+              let val = value[key]
+              if (val === 'true') val = true
+              else if (val === 'false') val = false
+              else if (typeof val === 'string' && val.startsWith('JSON:')) {
+                try {
+                  val = JSON.parse(val.substring(5))
+                }
+                catch(e) {
+                  console.error('%s | %s | JSON could not be parsed %j', functionName, secret.name, val)
+                  throw new Error('invalidJSON')
+                }
               }
-              return server
+              value[key] = val
             })
           }
-          else {
-            // NEW NOTATION AS OBJECT
-            /* TODO: Probably not used anywhere, so legacy is ok
-            let match = {}
-            _.set(match, _.get(secret.servers, 'identifier'), _.get(secret.servers, 'value'))
-            existingValue = _.find(_.get(config, key, []), match)   
-            */
+
+          if (secret.servers) {
+            if (typeof secret.servers === 'boolean') {
+              let servers = existingValue?.servers || []
+              config[secret.key].servers = servers.map(server => {
+                if (server.server === secret.serverName) {
+                  server = { ...server, ...value }
+                }
+                return server
+              })
+            }
+            else {
+              // NEW NOTATION AS OBJECT
+              /* TODO: Probably not used anywhere, so legacy is ok
+              let match = {}
+              _.set(match, _.get(secret.servers, 'identifier'), _.get(secret.servers, 'value'))
+              existingValue = _.find(_.get(config, key, []), match)   
+              */
+            }
           }
-        }
-        else if (secret?.type === 'arrayObject') {
-          existingValue.push(value)
-          setKey(config, secret.key, existingValue)
-        }
-        else {
-          if (Object.keys(existingValue).length === 0) {
-            setKey(config, secret.key, {})
+          else if (secret?.type === 'arrayObject') {
+            existingValue.push(value)
+            setKey(config, secret.key, existingValue)
+          }
+          else {
+            if (Object.keys(existingValue).length === 0) {
+              setKey(config, secret.key, {})
+            }
+            existingValue = { ...existingValue, ...value }
+            setKey(config, secret.key, existingValue)
           }
-          existingValue = { ...existingValue, ...value }
-          setKey(config, secret.key, existingValue)
         }
 
         if (secret?.log || debug) {

package/package.json

@@ -3,17 +3,16 @@
   "author": "Mark Poepping (https://www.admiralcloud.com)",
   "license": "MIT",
   "repository": "admiralcloud/ac-awssecrets",
-  "version": "2.0.5",
+  "version": "2.1.1",
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.359.0",
-    "ac-aws-customcredentialprovider": "^0.1.3"
+    "@aws-sdk/client-secrets-manager": "^3.569.0"
   },
   "devDependencies": {
-    "ac-semantic-release": "^0.4.1",
-    "c8": "^8.0.0",
-    "chai": "^4.3.7",
+    "ac-semantic-release": "^0.4.2",
+    "c8": "^9.1.0",
+    "chai": "^4.4.1",
     "eslint": "8.x",
-    "mocha": "^10.2.0"
+    "mocha": "^10.4.0"
   },
   "scripts": {
     "test": "mocha --reporter spec",

package/test/config.js

@@ -19,6 +19,9 @@ const config = {
   },
   aws: {
     accessKeys: []
+  },
+  configVar7: {
+    level: 'info'
   }
 }
 
@@ -28,6 +31,7 @@ const secrets = [
   { key: 'configVar4', name: 'json' },
   { key: 'configVar5.path', name: 'path' },
   { key: 'configVar6', name: 'notExistingLocally' },
+  { key: 'configVar7', name: 'notExistingKey' },
 ]
 
 const availableSecrets = [{

package/test/test.js

@@ -61,6 +61,10 @@ describe('Reading secrets', () => {
     expect(config.configVar6).to.have.property('prop2', 'abc')
   })
 
+  it('Check non existing key - should fallback to existing value without error', async() => {
+    expect(config.configVar7).to.have.property('level', 'info')
+  })
+
   it('Check multisecrets', async() => {
     //console.log(50, config.aws.accessKeys)
     expect(config.aws.accessKeys).to.have.length(2)