@itentialopensource/adapter-amazon_route53 0.2.0 → 0.2.1

package/adapter.js

@@ -11,6 +11,7 @@ const path = require('path');
 const aws4 = require('aws4');
 const AWS = require('aws-sdk');
 const requestCall = require('request');
+const querystring = require('querystring');
 
 /* Fetch in the other needed components for the this Adaptor */
 const AdapterBaseCl = require(path.join(__dirname, 'adapterBase.js'));
@@ -93,7 +94,8 @@ class AmazonRoute53 extends AdapterBaseCl {
       'iapVerifyAdapterCapability',
       'iapUpdateAdapterEntityCache',
       'hasEntities',
-      'getAuthorization'
+      'getAuthorization',
+      'getAuthorizationAndIdentifyRequest'
     ];
     if (!inIgnore && Array.isArray(inIgnore)) {
       myIgnore = inIgnore;
@@ -657,17 +659,32 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders
+    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
+    let thisHeaderData = null;
+    // if the additional headers was passed in as a string parse the json into an object
+    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
+      try {
+        // parse the additional headers object that was passed in
+        thisHeaderData = JSON.parse(thisHeaderData);
+      } catch (err) {
+        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
+        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+        return callback(null, errorObj);
+      }
+    } else if (thisHeaderData === null) {
+      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
+    }
+    // add headers if provided
+    if (addlHeaders) {
+      Object.assign(thisHeaderData, addlHeaders);
+    }
+
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      uriOptions: {}
+      addlHeaders: thisHeaderData
     };
-    // add headers if provided
-    if (addlHeaders) {
-      reqObj.addlHeaders = addlHeaders;
-    }
 
     // determine the call and return flag
     let action = 'getGenerics';
@@ -686,7 +703,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.requestHandlerInst.identifyRequest('.generic', action, reqObj, returnF, (irReturnData, irReturnError) => {
+      return this.getAuthorizationAndIdentifyRequest('.generic', action, reqObj, returnF, `${this.allProps.base_path}/${this.allProps.version}/${uriPath}/?${querystring.stringify(queryParams)}`, null, null, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -767,17 +784,32 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders
+    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
+    let thisHeaderData = null;
+    // if the additional headers was passed in as a string parse the json into an object
+    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
+      try {
+        // parse the additional headers object that was passed in
+        thisHeaderData = JSON.parse(thisHeaderData);
+      } catch (err) {
+        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
+        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+        return callback(null, errorObj);
+      }
+    } else if (thisHeaderData === null) {
+      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
+    }
+    // add headers if provided
+    if (addlHeaders) {
+      Object.assign(thisHeaderData, addlHeaders);
+    }
+
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      uriOptions: {}
+      addlHeaders: thisHeaderData
     };
-    // add headers if provided
-    if (addlHeaders) {
-      reqObj.addlHeaders = addlHeaders;
-    }
 
     // determine the call and return flag
     let action = 'getGenericsNoBase';
@@ -796,7 +828,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.requestHandlerInst.identifyRequest('.generic', action, reqObj, returnF, (irReturnData, irReturnError) => {
+      return this.getAuthorizationAndIdentifyRequest('.generic', action, reqObj, returnF, `${uriPath}/?${querystring.stringify(queryParams)}`, null, null, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -854,20 +886,23 @@ class AmazonRoute53 extends AdapterBaseCl {
    *
    *  @return {Object} the headers to add to the request
    */
-  getAuthorization(method, uripath, pathBody, STSParams, roleName, callback) {
+  getAuthorization(method, uripath, pathBody, requestHeaders, STSParams, roleName, callback) {
     const origin = `${this.id}-adapter-getAuthorization`;
     log.trace(origin);
 
     // set up the options for the AWS header
     const options = {
       host: this.allProps.host,
-      path: uripath,
+      path: uripath.replace(/\/\//g, '/'),
       service: 'route53',
       region: this.allProps.region
     };
+    if (requestHeaders) {
+      options.headers = requestHeaders;
+    }
 
     if (method !== 'GET' && method !== 'DELETE') {
-      options.body = pathBody;
+      options.body = JSON.stringify(pathBody);
     }
 
     // if we are using STS
@@ -965,6 +1000,51 @@ class AmazonRoute53 extends AdapterBaseCl {
     });
   }
 
+  /**
+   * @summary wrapper for identifyRequest which sets up the necessary AWS authentication headers first
+   *
+   * @function getAuthorizationAndIdentifyRequest
+   * @param {string} entity - the name of the entity for this request. (required)
+   * @param {string} action - the name of the action being executed. (required)
+   * @param {object} requestObj - an object that contains all of the possible parts of the request (payload, uriPathVars,
+   *                              uriQuery, uriOptions and addlHeaders (optional). Can be a stringified Object.
+   * @param {boolean} translate - whether to translate the response. Defaults to true. If no translation will just return
+   *                              'success' or an error message
+   * @param {string} uriPath - the path for the call. (required)
+   * @param {object} [stsParams] - STS Parameters to use for authentication.
+   * @param {string} [roleName] - RoleName to authenticate against
+   * @param {Callback} callback - a callback function to return the result Data/Status or the Error
+   */
+  getAuthorizationAndIdentifyRequest(entity, action, requestObj, translate, uriPath, stsParams, roleName, callback) {
+    const meth = 'adapter-getAuthorizationAndIdentifyRequest';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
+
+    try {
+      // using this for method now - would like to use for path in the future
+      const entitySchema = this.requestHandlerInst.propUtil.getEntitySchemaFromFS(entity, action);
+      // thisPath = this.requestHandlerInst.restHandler.buildRequestPath(); - Needs to be exposed
+
+      // Call to get the signature for the call
+      return this.getAuthorization(entitySchema.method, uriPath, requestObj.payload, requestObj.addlHeaders, stsParams, roleName, (signature, sigerr) => {
+        if (sigerr) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+          return callback(null, errorObj);
+        }
+        // Assign the signature to the proper headers
+        Object.assign(requestObj.addlHeaders, signature);
+
+        // make the call with the proper information
+        return this.requestHandlerInst.identifyRequest(entity, action, requestObj, translate, callback);
+      });
+    } catch (ex) {
+      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
+      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+      return callback(null, errorObj);
+    }
+  }
+
   /**
    * @function activateKeySigningKey
    * @pronghornType method
@@ -1057,42 +1137,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/keysigningkey/${hostedZoneId}/${name}/activate`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'activateKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}/activate?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['activateKeySigningKeySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'activateKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['activateKeySigningKeySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1193,42 +1265,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/associatevpc`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'associateVPCWithHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/associatevpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['associateVPCWithHostedZone'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'associateVPCWithHostedZone', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['associateVPCWithHostedZone'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1329,42 +1393,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/rrset/`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/rrset/?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['changeResourceRecordSetsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['changeResourceRecordSetsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1472,42 +1528,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/tags/${resourceType}/${resourceId}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeTagsForResource', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}/${resourceId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['changeTagsForResourceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'changeTagsForResource', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['changeTagsForResourceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1608,42 +1656,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/tags/${resourceType}/${resourceId}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTagsForResource', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}/${resourceId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTagsForResourceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTagsForResource', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTagsForResourceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1737,42 +1777,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/healthcheck`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createHealthCheckSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createHealthCheckSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -1867,43 +1899,35 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/healthcheck`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHealthChecks', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHealthChecksSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listHealthChecks', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHealthChecksSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
-      });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
+      });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
       log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -1996,42 +2020,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createHostedZoneSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createHostedZone', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createHostedZoneSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2128,42 +2144,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzone`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZones', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZones', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2257,42 +2265,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/keysigningkey`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createKeySigningKeySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createKeySigningKeySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2386,42 +2386,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/queryloggingconfig`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createQueryLoggingConfigSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createQueryLoggingConfig', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createQueryLoggingConfigSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2518,42 +2510,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/queryloggingconfig`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listQueryLoggingConfigs', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listQueryLoggingConfigsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listQueryLoggingConfigs', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listQueryLoggingConfigsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2647,42 +2631,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/delegationset`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createReusableDelegationSetSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createReusableDelegationSet', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createReusableDelegationSetSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2773,42 +2749,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/delegationset`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listReusableDelegationSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listReusableDelegationSetsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listReusableDelegationSets', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listReusableDelegationSetsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -2902,42 +2870,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/trafficpolicy`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicy', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3031,42 +2991,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/trafficpolicyinstance`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicyInstanceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicyInstanceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3167,42 +3119,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/trafficpolicy/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
-          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicyVersion', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicyVersionSTSRole'], null, null, null);
+          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicyVersion', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createTrafficPolicyVersionSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3303,42 +3247,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/authorizevpcassociation`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'createVPCAssociationAuthorization', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/authorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createVPCAssociationAuthorizationSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'createVPCAssociationAuthorization', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['createVPCAssociationAuthorizationSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3436,42 +3372,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzone/${id}/authorizevpcassociation`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listVPCAssociationAuthorizations', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/authorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listVPCAssociationAuthorizationsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listVPCAssociationAuthorizations', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listVPCAssociationAuthorizationsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3572,42 +3500,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/keysigningkey/${hostedZoneId}/${name}/deactivate`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deactivateKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}/deactivate?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deactivateKeySigningKeySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deactivateKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deactivateKeySigningKeySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3701,42 +3621,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/healthcheck/${healthCheckId}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteHealthCheckSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteHealthCheck', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteHealthCheckSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3830,42 +3742,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/healthcheck/${healthCheckId}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -3966,42 +3870,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('PUT', `/${restVer}/healthcheck/${healthCheckId}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateHealthCheckSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'updateHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateHealthCheckSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4095,42 +3991,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/hostedzone/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteHostedZoneSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteHostedZone', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteHostedZoneSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4224,42 +4112,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzone/${id}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZone', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4360,42 +4240,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateHostedZoneComment', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateHostedZoneCommentSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'updateHostedZoneComment', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateHostedZoneCommentSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4496,42 +4368,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/keysigningkey/${hostedZoneId}/${name}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteKeySigningKeySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteKeySigningKey', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteKeySigningKeySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4625,42 +4489,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/queryloggingconfig/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteQueryLoggingConfigSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteQueryLoggingConfig', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteQueryLoggingConfigSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4754,42 +4610,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/queryloggingconfig/${id}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getQueryLoggingConfigSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getQueryLoggingConfig', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getQueryLoggingConfigSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -4883,42 +4731,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/delegationset/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteReusableDelegationSetSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteReusableDelegationSet', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteReusableDelegationSetSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5012,42 +4852,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/delegationset/${id}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getReusableDelegationSetSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getReusableDelegationSet', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getReusableDelegationSetSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5148,42 +4980,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/trafficpolicy/${id}/${version}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteTrafficPolicySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteTrafficPolicy', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteTrafficPolicySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5284,42 +5108,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicy/${id}/${version}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicy', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5427,42 +5243,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/trafficpolicy/${id}/${version}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateTrafficPolicyComment', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateTrafficPolicyCommentSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'updateTrafficPolicyComment', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateTrafficPolicyCommentSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5556,42 +5364,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/trafficpolicyinstance/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteTrafficPolicyInstanceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteTrafficPolicyInstance', reqObj, false, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteTrafficPolicyInstanceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5685,42 +5485,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicyinstance/${id}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicyInstanceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicyInstanceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5821,42 +5613,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/trafficpolicyinstance/${id}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateTrafficPolicyInstanceSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'updateTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['updateTrafficPolicyInstanceSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -5957,42 +5741,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('DELETE', `/${restVer}/hostedzone/${id}/deauthorizevpcassociation`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteVPCAssociationAuthorization', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/deauthorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteVPCAssociationAuthorizationSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'deleteVPCAssociationAuthorization', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['deleteVPCAssociationAuthorizationSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6086,42 +5862,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/disable-dnssec`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'disableHostedZoneDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/disable-dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['disableHostedZoneDNSSECSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'disableHostedZoneDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['disableHostedZoneDNSSECSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6222,42 +5990,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/disassociatevpc`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'disassociateVPCFromHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/disassociatevpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['disassociateVPCFromHostedZoneSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'disassociateVPCFromHostedZone', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['disassociateVPCFromHostedZoneSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6351,42 +6111,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/hostedzone/${id}/enable-dnssec`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'enableHostedZoneDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/enable-dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['enableHostedZoneDNSSECSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'enableHostedZoneDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['enableHostedZoneDNSSECSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6480,42 +6232,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/accountlimit/${type}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/accountlimit/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getAccountLimitSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getAccountLimit', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getAccountLimitSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6609,42 +6353,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/change/${id}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getChange', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/change/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getChangeSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getChange', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getChangeSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6731,42 +6467,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/checkeripranges`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getCheckerIpRanges', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/checkeripranges?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getCheckerIpRangesSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getCheckerIpRanges', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getCheckerIpRangesSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6860,42 +6588,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzone/${id}/dnssec`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDNSSECSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getDNSSECSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -6988,42 +6708,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/geolocation`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getGeoLocation', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/geolocation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getGeoLocationSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getGeoLocation', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getGeoLocationSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7110,42 +6822,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/healthcheckcount`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheckcount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckCountSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckCount', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckCountSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7239,42 +6943,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/healthcheck/${healthCheckId}/lastfailurereason`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckLastFailureReason', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}/lastfailurereason?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckLastFailureReasonSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckLastFailureReason', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckLastFailureReasonSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7368,42 +7064,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/healthcheck/${healthCheckId}/status`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckStatus', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}/status?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckStatusSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckStatus', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHealthCheckStatusSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7490,42 +7178,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzonecount`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZoneCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonecount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneCountSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZoneCount', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneCountSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7626,42 +7306,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzonelimit/${id}/${type}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZoneLimit', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonelimit/${id}/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneLimitSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZoneLimit', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getHostedZoneLimitSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7762,42 +7434,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/reusabledelegationsetlimit/${id}/${type}`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getReusableDelegationSetLimit', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/reusabledelegationsetlimit/${id}/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getReusableDelegationSetLimitSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getReusableDelegationSetLimit', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getReusableDelegationSetLimitSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -7884,42 +7548,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicyinstancecount`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicyInstanceCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstancecount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicyInstanceCountSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicyInstanceCount', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['getTrafficPolicyInstanceCountSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8014,42 +7670,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/geolocations`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listGeoLocations', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/geolocations?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listGeoLocationsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listGeoLocations', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listGeoLocationsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8142,42 +7790,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzonesbyname`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZonesByName', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonesbyname?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesByNameSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZonesByName', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesByNameSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8282,42 +7922,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzonesbyvpc`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZonesByVPC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonesbyvpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesByVPCSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZonesByVPC', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listHostedZonesByVPCSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8427,42 +8059,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/hostedzone/${id}/rrset`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/rrset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listResourceRecordSetsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listResourceRecordSets', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listResourceRecordSetsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8563,42 +8187,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('POST', `/${restVer}/tags/${resourceType}`, bodyVars, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTagsForResources', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTagsForResourcesSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTagsForResources', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTagsForResourcesSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8689,42 +8305,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicies`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicies', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicies?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPoliciesSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
 
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicies', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPoliciesSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8819,42 +8427,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicyinstances`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstances', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstances', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -8954,42 +8554,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicyinstances/hostedzone`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstancesByHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesByHostedZoneSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstancesByHostedZone', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesByHostedZoneSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -9098,42 +8690,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicyinstances/trafficpolicy`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstancesByPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances/trafficpolicy?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesByPolicySTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstancesByPolicy', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyInstancesByPolicySTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -9231,42 +8815,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/trafficpolicies/${id}/versions`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyVersions', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicies/${id}/versions?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyVersionsSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyVersions', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['listTrafficPolicyVersionsSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
@@ -9380,42 +8956,34 @@ class AmazonRoute53 extends AdapterBaseCl {
       thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
     }
 
+    // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
+    // see adapter code documentation for more information on the request object's fields
+    const reqObj = {
+      payload: bodyVars,
+      uriPathVars: pathVars,
+      uriQuery: queryParams,
+      addlHeaders: thisHeaderData
+    };
+
     try {
-      // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
-      // see adapter code documentation for more information on the request object's fields
-      return this.getAuthorization('GET', `/${restVer}/testdnsanswer`, null, stsParams, roleName, (signature, sigerr) => {
-        if (sigerr) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
+      // Make the call -
+      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
+      return this.getAuthorizationAndIdentifyRequest('Rest', 'testDNSAnswer', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/testdnsanswer?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+        // if we received an error or their is no response on the results
+        // return an error
+        if (irReturnError) {
+          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
+          return callback(null, irReturnError);
+        }
+        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['testDNSAnswerSTSRole'], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
-        Object.assign(thisHeaderData, signature);
-        const reqObj = {
-          payload: bodyVars,
-          uriPathVars: pathVars,
-          uriQuery: queryParams,
-          addlHeaders: thisHeaderData
-        };
-
-        // Make the call -
-        // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-        return this.requestHandlerInst.identifyRequest('Rest', 'testDNSAnswer', reqObj, true, (irReturnData, irReturnError) => {
-          // if we received an error or their is no response on the results
-          // return an error
-          if (irReturnError) {
-            /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-            return callback(null, irReturnError);
-          }
-          if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['testDNSAnswerSTSRole'], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
 
-          /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-          // return the response
-          return callback(irReturnData, null);
-        });
+        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
+        // return the response
+        return callback(irReturnData, null);
       });
     } catch (ex) {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);