Fixed: log-forwarding secret settings are not saved (#508)

* Fixed: log-forwarding secret settings are not saved * Improved log forwarding message in case local config is absent
adobe · Jan 26, 2022 · 311844c · 311844c
1 parent 0d8d4ab
commit 311844c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/src/commands/app/config/get/log-forwarding.js b/src/commands/app/config/get/log-forwarding.js
@@ -21,8 +21,12 @@ class LogForwardingCommand extends BaseCommand {
 
     if (!localConfig.isEqual(serverConfig)) {
       this.log('Local and server log forwarding configuration is different')
-      this.log("Run either 'aio app:deploy' to update the server, " +
-        "or 'aio app:config:set:log-forwarding' to set new local and server configuration")
+      let message = 'Run'
+      if (localConfig.isDefined()) {
+        message += " either 'aio app:deploy' to update the server, or"
+      }
+      message += " 'aio app:config:set:log-forwarding' to set new local and server configuration"
+      this.log(message)
       this.log('Local configuration:')
       this.printConfig(localConfig)
       this.log('\nServer configuration:')

diff --git a/src/commands/app/config/set/log-forwarding.js b/src/commands/app/config/set/log-forwarding.js
@@ -24,7 +24,8 @@ class LogForwardingCommand extends BaseCommand {
     const res = await lf.updateServerConfig(lfConfig)
     this.log(`Log forwarding is set to '${destination}'`)
 
-    await lf.updateLocalConfig(lf.getConfigFromJson(res))
+    const fullSanitizedConfig = lfConfig.getMergedConfig(lf.getConfigFromJson(res))
+    await lf.updateLocalConfig(fullSanitizedConfig)
     this.log('Log forwarding settings are saved to the local configuration')
   }
 

diff --git a/src/lib/log-forwarding.js b/src/lib/log-forwarding.js
@@ -169,6 +169,14 @@ class LogForwardingConfig {
     return this.settings
   }
 
+  getMergedConfig (config) {
+    const newSettings = {}
+    Object.keys(this.settings).forEach(k => {
+      newSettings[k] = config.settings[k] !== undefined ? config.settings[k] : this.settings[k]
+    })
+    return new LogForwardingConfig(this.destination, newSettings)
+  }
+
   isDefined () {
     return this.destination !== undefined
   }

diff --git a/test/commands/app/config/get/log-forwarding.test.js b/test/commands/app/config/get/log-forwarding.test.js
@@ -134,7 +134,7 @@ test('get log forwarding settings (no local config)', async () => {
     return command.run()
       .then(() => {
         expect(stdout.output).toEqual('Local and server log forwarding configuration is different\n' +
-          "Run either 'aio app:deploy' to update the server, or 'aio app:config:set:log-forwarding' to set new local and server configuration\n" +
+          "Run 'aio app:config:set:log-forwarding' to set new local and server configuration\n" +
           'Local configuration:\n' +
           'Not defined\n\n' +
           'Server configuration:\n' +

diff --git a/test/commands/app/config/set/log-forwarding.test.js b/test/commands/app/config/set/log-forwarding.test.js
@@ -53,14 +53,20 @@ test('set log forwarding destination', async () => {
     const destination = 'destination'
     const input = {
       field_one: 'val_one',
-      field_two: 'val_two'
+      field_two: 'val_two',
+      secret: 'val_secret'
     }
     command.prompt.mockResolvedValueOnce({ type: destination })
     command.prompt.mockResolvedValueOnce(input)
     const serverSanitizedSettings = {
       field_one: 'val_one',
       field_two: 'val_two sanitized'
     }
+    const fullSanitizedSettings = {
+      field_one: 'val_one',
+      field_two: 'val_two sanitized',
+      secret: 'val_secret'
+    }
     const setCall = jest.fn().mockResolvedValue({
       destination: serverSanitizedSettings
     })
@@ -80,7 +86,7 @@ test('set log forwarding destination', async () => {
         expect(setCall).toBeCalledTimes(1)
         expect(setCall).toHaveBeenCalledWith(new LogForwarding.LogForwardingConfig(destination, input))
         expect(localSetCall).toBeCalledTimes(1)
-        expect(localSetCall).toHaveBeenCalledWith(new LogForwarding.LogForwardingConfig(destination, serverSanitizedSettings))
+        expect(localSetCall).toHaveBeenCalledWith(new LogForwarding.LogForwardingConfig(destination, fullSanitizedSettings))
         resolve()
       })
   })