@itentialopensource/adapter-gcp_compute 0.2.0 → 1.1.0

package/adapterBase.js

@@ -22,6 +22,7 @@ const AjvCl = require('ajv');
 const PropUtilCl = require('@itentialopensource/adapter-utils').PropertyUtility;
 const RequestHandlerCl = require('@itentialopensource/adapter-utils').RequestHandler;
 
+const entitiesToDB = require(path.join(__dirname, 'utils/entitiesToDB'));
 const troubleshootingAdapter = require(path.join(__dirname, 'utils/troubleshootingAdapter'));
 const tbUtils = require(path.join(__dirname, 'utils/tbUtils'));
 
@@ -247,6 +248,7 @@ class AdapterBase extends EventEmitterCl {
       // properties that this code cares about
       this.healthcheckType = this.allProps.healthcheck.type;
       this.healthcheckInterval = this.allProps.healthcheck.frequency;
+      this.healthcheckQuery = this.allProps.healthcheck.query_object;
 
       // set the failover codes from properties
       if (this.allProps.request.failover_codes) {
@@ -451,6 +453,20 @@ class AdapterBase extends EventEmitterCl {
     const origin = `${this.id}-adapterBase-healthCheck`;
     log.trace(origin);
 
+    // if there is healthcheck query_object property, it needs to be added to the adapter
+    let myRequest = reqObj;
+    if (this.healthcheckQuery && Object.keys(this.healthcheckQuery).length > 0) {
+      if (myRequest && myRequest.uriQuery) {
+        myRequest.uriQuery = { ...myRequest.uriQuery, ...this.healthcheckQuery };
+      } else if (myRequest) {
+        myRequest.uriQuery = this.healthcheckQuery;
+      } else {
+        myRequest = {
+          uriQuery: this.healthcheckQuery
+        };
+      }
+    }
+
     // call to the healthcheck in connector
     return this.requestHandlerInst.identifyHealthcheck(reqObj, (res, error) => {
       // unhealthy
@@ -644,7 +660,7 @@ class AdapterBase extends EventEmitterCl {
     }
 
     // make sure the entities directory exists
-    const entitydir = path.join(__dirname, '../entities');
+    const entitydir = path.join(__dirname, 'entities');
     if (!fs.statSync(entitydir).isDirectory()) {
       log.error('Could not find the entities directory');
       result.found = false;
@@ -672,7 +688,7 @@ class AdapterBase extends EventEmitterCl {
               log.info(`          method: ${actions.actions[a].method} path: ${actions.actions[a].entitypath}`);
               const fitem = {
                 entity: entities[e],
-                action: actions[a].name,
+                action: actions.actions[a].name,
                 method: actions.actions[a].method,
                 path: actions.actions[a].entitypath
               };
@@ -806,7 +822,7 @@ class AdapterBase extends EventEmitterCl {
    */
   async runConnectivity(callback) {
     try {
-      const { serviceItem } = await troubleshootingAdapter.getAdapterConfig();
+      const { serviceItem } = await tbUtils.getAdapterConfig();
       const { host } = serviceItem.properties.properties;
       const result = tbUtils.runConnectivity(host, false);
       if (result.failCount > 0) {
@@ -986,6 +1002,27 @@ class AdapterBase extends EventEmitterCl {
       return [];
     }
   }
+
+  /**
+   * @summary moves entities to mongo database
+   *
+   * @function moveEntitiesToDB
+   *
+   * @return {Callback} - containing the response from the mongo transaction
+   */
+  moveEntitiesToDB(callback) {
+    const meth = 'adapterBase-moveEntitiesToDB';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
+
+    try {
+      return callback(entitiesToDB.moveEntitiesToDB(__dirname, { pronghornProps: this.allProps, id: this.id }), null);
+    } catch (err) {
+      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, err);
+      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+      return callback(null, errorObj);
+    }
+  }
 }
 
 module.exports = AdapterBase;

package/entities/.generic/action.json

@@ -4,7 +4,7 @@
       "name": "getGenerics",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}?{query}",
+      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "createGeneric",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}?{query}",
+      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "updateGeneric",
       "protocol": "REST",
       "method": "PUT",
-      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}?{query}",
+      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -67,7 +67,7 @@
       "name": "patchGeneric",
       "protocol": "REST",
       "method": "PATCH",
-      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}?{query}",
+      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -88,7 +88,7 @@
       "name": "deleteGeneric",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}?{query}",
+      "entitypath": "{base_path}/{version}/{pathv1}/{pathv2}/{pathv3}/{pathv4}/{pathv5}/{pathv6}/{pathv7}/{pathv8}/{pathv9}/{pathv10}/{pathv11}/{pathv12}/{pathv13}/{pathv14}/{pathv15}/{pathv16}/{pathv17}/{pathv18}/{pathv19}/{pathv20}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/.system/action.json

@@ -31,7 +31,7 @@
       "name": "healthcheck",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{pathv1}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/AcceleratorTypes/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedAcceleratorTypes",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/acceleratorTypes?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/acceleratorTypes?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectZonesZoneAcceleratorTypes",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/acceleratorTypes?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/acceleratorTypes?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "getProjectZonesZoneAcceleratorTypesAcceleratorType",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/acceleratorTypes/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/acceleratorTypes/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/Addresses/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedAddresses",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/addresses?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/addresses?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectRegionsRegionAddresses",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/regions/{pathv2}/addresses?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/regions/{pathv2}/addresses?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "postProjectRegionsRegionAddresses",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/regions/{pathv2}/addresses?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/regions/{pathv2}/addresses?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -66,7 +66,7 @@
       "name": "deleteProjectRegionsRegionAddressesAddress",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/regions/{pathv2}/addresses/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/regions/{pathv2}/addresses/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "getProjectRegionsRegionAddressesAddress",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/regions/{pathv2}/addresses/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/regions/{pathv2}/addresses/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/Autoscalers/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedAutoscalers",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/autoscalers?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/autoscalers?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectZonesZoneAutoscalers",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "patchProjectZonesZoneAutoscalers",
       "protocol": "REST",
       "method": "PATCH",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -66,7 +66,7 @@
       "name": "postProjectZonesZoneAutoscalers",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "putProjectZonesZoneAutoscalers",
       "protocol": "REST",
       "method": "PUT",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -106,7 +106,7 @@
       "name": "deleteProjectZonesZoneAutoscalersAutoscaler",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -126,7 +126,7 @@
       "name": "getProjectZonesZoneAutoscalersAutoscaler",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/autoscalers/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/autoscalers/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/BackendBuckets/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectGlobalBackendBuckets",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "postProjectGlobalBackendBuckets",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -45,7 +45,7 @@
       "name": "deleteProjectGlobalBackendBucketsBackendBucket",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -65,7 +65,7 @@
       "name": "getProjectGlobalBackendBucketsBackendBucket",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "patchProjectGlobalBackendBucketsBackendBucket",
       "protocol": "REST",
       "method": "PATCH",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -106,7 +106,7 @@
       "name": "putProjectGlobalBackendBucketsBackendBucket",
       "protocol": "REST",
       "method": "PUT",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -126,7 +126,7 @@
       "name": "postProjectGlobalBackendBucketsBackendBucketAddSignedUrlKey",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}/addSignedUrlKey?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}/addSignedUrlKey?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -146,7 +146,7 @@
       "name": "postProjectGlobalBackendBucketsBackendBucketDeleteSignedUrlKey",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendBuckets/{pathv2}/deleteSignedUrlKey?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendBuckets/{pathv2}/deleteSignedUrlKey?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/BackendServices/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedBackendServices",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/backendServices?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/backendServices?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectGlobalBackendServices",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "postProjectGlobalBackendServices",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -66,7 +66,7 @@
       "name": "deleteProjectGlobalBackendServicesBackendService",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "getProjectGlobalBackendServicesBackendService",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -107,7 +107,7 @@
       "name": "patchProjectGlobalBackendServicesBackendService",
       "protocol": "REST",
       "method": "PATCH",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -127,7 +127,7 @@
       "name": "putProjectGlobalBackendServicesBackendService",
       "protocol": "REST",
       "method": "PUT",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -147,7 +147,7 @@
       "name": "postProjectGlobalBackendServicesBackendServiceAddSignedUrlKey",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}/addSignedUrlKey?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}/addSignedUrlKey?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -167,7 +167,7 @@
       "name": "postProjectGlobalBackendServicesBackendServiceDeleteSignedUrlKey",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}/deleteSignedUrlKey?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}/deleteSignedUrlKey?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -187,7 +187,7 @@
       "name": "postProjectGlobalBackendServicesBackendServiceGetHealth",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}/getHealth?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}/getHealth?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -207,7 +207,7 @@
       "name": "postProjectGlobalBackendServicesBackendServiceSetSecurityPolicy",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/backendServices/{pathv2}/setSecurityPolicy?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/backendServices/{pathv2}/setSecurityPolicy?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/DiskTypes/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedDiskTypes",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/diskTypes?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/diskTypes?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectZonesZoneDiskTypes",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/diskTypes?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/diskTypes?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "getProjectZonesZoneDiskTypesDiskType",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/diskTypes/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/diskTypes/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/Disks/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectAggregatedDisks",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/aggregated/disks?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/aggregated/disks?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "getProjectZonesZoneDisks",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -46,7 +46,7 @@
       "name": "postProjectZonesZoneDisks",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -66,7 +66,7 @@
       "name": "deleteProjectZonesZoneDisksDisk",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "getProjectZonesZoneDisksDisk",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -107,7 +107,7 @@
       "name": "postProjectZonesZoneDisksDiskAddResourcePolicies",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/addResourcePolicies?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/addResourcePolicies?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -127,7 +127,7 @@
       "name": "postProjectZonesZoneDisksDiskCreateSnapshot",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/createSnapshot?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/createSnapshot?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -147,7 +147,7 @@
       "name": "postProjectZonesZoneDisksDiskRemoveResourcePolicies",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/removeResourcePolicies?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/removeResourcePolicies?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -167,7 +167,7 @@
       "name": "postProjectZonesZoneDisksDiskResize",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/resize?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/resize?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -187,7 +187,7 @@
       "name": "getProjectZonesZoneDisksResourceGetIamPolicy",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/getIamPolicy?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/getIamPolicy?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -208,7 +208,7 @@
       "name": "postProjectZonesZoneDisksResourceSetIamPolicy",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/setIamPolicy?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/setIamPolicy?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -228,7 +228,7 @@
       "name": "postProjectZonesZoneDisksResourceSetLabels",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/setLabels?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/setLabels?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -248,7 +248,7 @@
       "name": "postProjectZonesZoneDisksResourceTestIamPermissions",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/zones/{pathv2}/disks/{pathv3}/testIamPermissions?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/zones/{pathv2}/disks/{pathv3}/testIamPermissions?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,

package/entities/ExternalVpnGateways/action.json

@@ -4,7 +4,7 @@
       "name": "getProjectGlobalExternalVpnGateways",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -25,7 +25,7 @@
       "name": "postProjectGlobalExternalVpnGateways",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -45,7 +45,7 @@
       "name": "deleteProjectGlobalExternalVpnGatewaysExternalVpnGateway",
       "protocol": "REST",
       "method": "DELETE",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -65,7 +65,7 @@
       "name": "getProjectGlobalExternalVpnGatewaysExternalVpnGateway",
       "protocol": "REST",
       "method": "GET",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways/{pathv2}?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways/{pathv2}?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -86,7 +86,7 @@
       "name": "postProjectGlobalExternalVpnGatewaysResourceSetLabels",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways/{pathv2}/setLabels?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways/{pathv2}/setLabels?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,
@@ -106,7 +106,7 @@
       "name": "postProjectGlobalExternalVpnGatewaysResourceTestIamPermissions",
       "protocol": "REST",
       "method": "POST",
-      "entitypath": "{base_path}/{version}/{pathv1}/global/externalVpnGateways/{pathv2}/testIamPermissions?{query}",
+      "entitypath": "{base_path}/{version}/projects/{pathv1}/global/externalVpnGateways/{pathv2}/testIamPermissions?{query}",
       "requestSchema": "schema.json",
       "responseSchema": "schema.json",
       "timeout": 0,