check variable types before trying to delete. fixes #96

adobe · Apr 10, 2020 · f248f11 · f248f11
1 parent 08cfb1c
commit f248f11
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 15 deletions.
diff --git a/src/client.js b/src/client.js
@@ -57,9 +57,9 @@ class Client {
                         debug(text)
                         if (res.ok) resolve(res)
                         else {
-                        const error = new Error(`${message}: ${res.url} (${res.status} ${res.statusText})`)
-                        error.res = res
-                        reject(error)
+                            const error = new Error(`${message}: ${res.url} (${res.status} ${res.statusText})`)
+                            error.res = res
+                            reject(error)
                         }
                     })
                 }

diff --git a/src/commands/cloudmanager/set-environment-variables.js b/src/commands/cloudmanager/set-environment-variables.js
@@ -32,6 +32,10 @@ class SetEnvironmentVariablesCommand extends BaseEnvironmentVariablesCommand {
 
         const programId = await getProgramId(flags)
 
+        const currentVariablesList = await this.getEnvironmentVariables(programId, args.environmentId, flags.passphrase)
+        const currentVariableTypes = {}
+        currentVariablesList.forEach(variable => currentVariableTypes[variable.name] = variable.type)
+
         const variables = []
         if (flags.variable) {
             // each --param flag expects two values ( a key and a value ). Multiple --parm flags can be passed
@@ -56,20 +60,31 @@ class SetEnvironmentVariablesCommand extends BaseEnvironmentVariablesCommand {
             }
         }
         if (flags.delete) {
-            flags.delete.forEach(key => variables.push({
-                name: key,
-                value: ''
-            }))
+            flags.delete.forEach(key => {
+                if (currentVariableTypes[key]) {
+                    variables.push({
+                        name: key,
+                        type: currentVariableTypes[key],
+                        value: ''
+                    })
+                } else {
+                    this.warn(`Variable ${key} not found. Will not try to delete.`)
+                }
+            })
         }
 
-        cli.action.start('setting variables')
-        await this.setEnvironmentVariables(programId, args.environmentId, variables, flags.passphrase)
-        cli.action.stop()
+        if (variables.length > 0) {
+            cli.action.start('setting variables')
+            await this.setEnvironmentVariables(programId, args.environmentId, variables, flags.passphrase)
+            cli.action.stop()
+        } else {
+            this.log("No variables to set or delete.")
+        }
 
         let result
 
         try {
-            result = await this.getEnvironmentVariables(programId, args.environmentId, variables, flags.passphrase)
+            result = await this.getEnvironmentVariables(programId, args.environmentId, flags.passphrase)
         } catch (error) {
             this.error(error.message)
         }

diff --git a/test/commands/set-environment-variables.test.js b/test/commands/set-environment-variables.test.js
@@ -53,7 +53,7 @@ test('set-environment-variables - bad variable flag', async () => {
                 iss: "good"
             }
         }),
-        'cloudmanager_programid': "6"
+        'cloudmanager_programid': "4"
     })
 
     expect.assertions(2)
@@ -71,7 +71,7 @@ test('set-environment-variables - bad secret flag', async () => {
                 iss: "good"
             }
         }),
-        'cloudmanager_programid': "6"
+        'cloudmanager_programid': "4"
     })
 
     expect.assertions(2)
@@ -272,12 +272,57 @@ test('set-environment-variables - delete', async () => {
 
     expect.assertions(3)
 
-    let runResult = SetEnvironmentVariablesCommand.run(["1", "--delete", "foo"])
+    let runResult = SetEnvironmentVariablesCommand.run(["1", "--delete", "KEY"])
     await expect(runResult instanceof Promise).toBeTruthy()
     await expect(runResult).resolves.toBeTruthy()
     const patchCall = fetchMock.calls().find(call => call[0] === 'https://cloudmanager.adobe.io/api/program/4/environment/1/variables' && call[1].method === 'PATCH')
     await expect(JSON.parse(patchCall[1].body)).toMatchObject([{
-        "name" : "foo",
+        "name" : "KEY",
+        "type": "string",
         "value" : ""
     }])
 })
+
+test('set-environment-variables - delete secret', async () => {
+    setStore({
+        'jwt-auth': JSON.stringify({
+            client_id: '1234',
+            jwt_payload: {
+                iss: "good"
+            }
+        }),
+        'cloudmanager_programid': "4"
+    })
+
+    expect.assertions(3)
+
+    let runResult = SetEnvironmentVariablesCommand.run(["1", "--delete", "I_AM_A_SECRET"])
+    await expect(runResult instanceof Promise).toBeTruthy()
+    await expect(runResult).resolves.toBeTruthy()
+    const patchCall = fetchMock.calls().find(call => call[0] === 'https://cloudmanager.adobe.io/api/program/4/environment/1/variables' && call[1].method === 'PATCH')
+    await expect(JSON.parse(patchCall[1].body)).toMatchObject([{
+        "name" : "I_AM_A_SECRET",
+        "type": "secretString",
+        "value" : ""
+    }])
+})
+
+test('set-environment-variables - delete not found', async () => {
+    setStore({
+        'jwt-auth': JSON.stringify({
+            client_id: '1234',
+            jwt_payload: {
+                iss: "good"
+            }
+        }),
+        'cloudmanager_programid': "4"
+    })
+
+    expect.assertions(3)
+
+    let runResult = SetEnvironmentVariablesCommand.run(["1", "--delete", "foo"])
+    await expect(runResult instanceof Promise).toBeTruthy()
+    await expect(runResult).resolves.toBeTruthy()
+    const patchCall = fetchMock.calls().find(call => call[0] === 'https://cloudmanager.adobe.io/api/program/4/environment/1/variables' && call[1].method === 'PATCH')
+    await expect(patchCall).toBeFalsy()
+})