impr(VLTCLT-68): Improve validation for get/update/deleteAccountLimits

Author: tmacro

lib/IAMClient.js

@@ -325,11 +325,9 @@ class VaultClient {
             Version: '2010-05-08',
         };
 
-        if (accountName) {
-            assert(!this.parameterValidation || typeof accountName === 'string',
-                'the account name, if set, should be a string');
-            data.AccountName = accountName;
-        }
+        assert(!this.parameterValidation || typeof accountName === 'string',
+            'the account name should be a string');
+        data.AccountName = accountName;
         this.request('POST', '/', true, callback, data);
     }
 
@@ -348,12 +346,10 @@ class VaultClient {
             limits: JSON.stringify(limits),
         };
         assert(!this.parameterValidation || (limits && typeof limits === 'object'),
-            'Limits must be an object');
-        if (accountName) {
-            assert(!this.parameterValidation || typeof accountName === 'string',
-                'the account name, if set, should be a string');
-            data.AccountName = accountName;
-        }
+            'limits must be an object');
+        assert(!this.parameterValidation || typeof accountName === 'string',
+            'the account name should be a string');
+        data.AccountName = accountName;
         this.request('POST', '/', true, callback, data);
     }
 
@@ -370,11 +366,9 @@ class VaultClient {
             Version: '2010-05-08',
         };
 
-        if (accountName) {
-            assert(!this.parameterValidation || typeof accountName === 'string',
-                'the account name, if set, should be a string');
-            data.AccountName = accountName;
-        }
+        assert(!this.parameterValidation || typeof accountName === 'string',
+            'the account name should be a string');
+        data.AccountName = accountName;
         this.request('POST', '/', true, callback, data);
     }
 
@@ -391,11 +385,9 @@ class VaultClient {
             Version: '2010-05-08',
         };
 
-        if (accountName) {
-            assert(!this.parameterValidation || typeof accountName === 'string',
-                'the account name, if set, should be a string');
-            data.AccountName = accountName;
-        }
+        assert(!this.parameterValidation || typeof accountName === 'string',
+            'the account name should be a string');
+        data.AccountName = accountName;
         this.request('POST', '/', true, callback, data);
     }
 

tests/unit/deleteAccountLimits.js

@@ -31,25 +31,19 @@ describe('IAMClient - deleteAccountLimits', () => {
         });
     });
 
-    it('should call the request method with the correct parameters when accountName is not provided', () => {
+    it('should throw an error when accountName is not provided', () => {
         client = createClient(true);
-        client.deleteAccountLimits(undefined, () => {});
-
-        assert.strictEqual(lastRequestData.method, 'POST');
-        assert.strictEqual(lastRequestData.path, '/');
-        assert.strictEqual(lastRequestData.iamAuthenticate, true);
-        assert.deepStrictEqual(lastRequestData.data, {
-            Action: 'DeleteAccountLimits',
-            Version: '2010-05-08',
-        });
+        assert.throws(() => {
+            client.deleteAccountLimits(undefined, () => {});
+        }, /the account name should be a string/);
     });
 
     it('should throw an error if accountName is not a string', () => {
         client = createClient(true);
         const accountName = 123;
         assert.throws(() => {
             client.deleteAccountLimits(accountName, () => {});
-        }, /the account name, if set, should be a string/);
+        }, /the account name should be a string/);
     });
 
     it('should call the request method when wrong options are provided and parameterValidation is false', () => {

tests/unit/getAccountLimits.js

@@ -32,18 +32,12 @@ describe('GetAccountLimits', () => {
         assert.deepStrictEqual(lastRequestData.data, expectedData);
     });
 
-    it('should call the request method with default parameters when accountName is not provided', () => {
+    it('should throw an error when accountName is not provided', () => {
         client = createClient(true);
         const callback = () => {};
-        client.getAccountLimits(undefined, callback);
-        const expectedData = {
-            Action: 'GetAccountLimits',
-            Version: '2010-05-08',
-        };
-        assert.strictEqual(lastRequestData.method, 'POST');
-        assert.strictEqual(lastRequestData.path, '/');
-        assert.strictEqual(lastRequestData.iamAuthenticate, true);
-        assert.deepStrictEqual(lastRequestData.data, expectedData);
+        assert.throws(() => {
+            client.getAccountLimits(undefined, callback);
+        }, /the account name should be a string/);
     });
 
     it('should throw an error if accountName is not a string', () => {
@@ -52,7 +46,7 @@ describe('GetAccountLimits', () => {
         const callback = () => {};
         assert.throws(() => {
             client.getAccountLimits(accountName, callback);
-        }, /the account name, if set, should be a string/);
+        }, /the account name should be a string/);
     });
 
     it('should not throw an error if accountName is not a string and parameterValidation is false', () => {

tests/unit/updateAccountLimits.js

@@ -35,21 +35,13 @@ describe('updateAccountLimits', () => {
         assert.deepStrictEqual(lastRequestData.data, expectedData);
     });
 
-    it('should call the request method with the correct parameters when accountName is not provided', () => {
+    it('should throw when accountName is not provided', () => {
         client = createClient(true);
         const limits = { rateLimit: 1000 };
-
-        const expectedData = {
-            Action: 'UpdateAccountLimits',
-            Version: '2010-05-08',
-            limits: JSON.stringify(limits),
-        };
-
-        client.updateAccountLimits(undefined, limits, () => {});
-        assert.strictEqual(lastRequestData.method, 'POST');
-        assert.strictEqual(lastRequestData.path, '/');
-        assert.strictEqual(lastRequestData.iamAuthenticate, true);
-        assert.deepStrictEqual(lastRequestData.data, expectedData);
+        assert.throws(
+            () => client.updateAccountLimits(undefined, limits, () => {})
+            , /the account name should be a string/
+        )
     });
 
     it('should handle complex limits object correctly', () => {
@@ -82,7 +74,7 @@ describe('updateAccountLimits', () => {
 
         assert.throws(() => {
             client.updateAccountLimits(accountName, limits, () => {});
-        }, /Limits must be an object/);
+        }, /limits must be an object/);
     });
 
     it('should throw an error if limits is null', () => {
@@ -92,7 +84,7 @@ describe('updateAccountLimits', () => {
 
         assert.throws(() => {
             client.updateAccountLimits(accountName, limits, () => {});
-        }, /Limits must be an object/);
+        }, /limits must be an object/);
     });
 
     it('should not throw an error if limits is not an object and parameterValidation is false', () => {
@@ -121,7 +113,7 @@ describe('updateAccountLimits', () => {
 
         assert.throws(() => {
             client.updateAccountLimits(accountName, limits, () => {});
-        }, /the account name, if set, should be a string/);
+        }, /the account name should be a string/);
     });
 
     it('should not throw an error if accountName is not a string and parameterValidation is false', () => {