@itentialopensource/adapter-gcp_compute 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## 1.5.2 [09-18-2023]
+
+* Patch/adapt 2852
+
+See merge request itentialopensource/adapters/cloud/adapter-gcp_compute!12
+
+---
+
 ## 1.5.1 [09-11-2023]
 
 * more migration & metadata changes

package/adapter.js

@@ -134,7 +134,8 @@ class GcpCompute extends AdapterBaseCl {
       'refreshAuthorizationHeader',
       'refreshAuthorizationAndIdentifyRequest',
       'getToken',
-      'generateKeyObjFromProps'
+      'generateKeyObjFromProps',
+      'refreshAuthorizationBroker'
     ];
     if (!inIgnore && Array.isArray(inIgnore)) {
       myIgnore = inIgnore;
@@ -442,7 +443,7 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.hasEntities(entityType, entityList, callback);
+      return this.refreshAuthorizationBroker().then(() => super.hasEntities(entityType, entityList, callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -464,7 +465,7 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.getDevice(deviceName, callback);
+      return this.refreshAuthorizationBroker().then(() => super.getDevice(deviceName, callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -484,9 +485,8 @@ class GcpCompute extends AdapterBaseCl {
     const meth = 'adapter-getDevicesFiltered';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-
     try {
-      return super.getDevicesFiltered(options, callback);
+      return this.refreshAuthorizationBroker().then(() => super.getDevicesFiltered(options, callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -508,7 +508,7 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.isAlive(deviceName, callback);
+      return this.refreshAuthorizationBroker().then(() => super.isAlive(deviceName, callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -531,7 +531,7 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.getConfig(deviceName, format, callback);
+      return this.refreshAuthorizationBroker().then(() => super.getConfig(deviceName, format, callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -552,7 +552,7 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.iapGetDeviceCount(callback);
+      return this.refreshAuthorizationBroker().then(() => super.iapGetDeviceCount(callback));
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -845,6 +845,19 @@ class GcpCompute extends AdapterBaseCl {
     }
   }
 
+  async refreshAuthorizationBroker() {
+    const meth = 'adapter-refreshAuthorizationBroker';
+    const origin = `${this.id}-${meth}`;
+    try {
+      const token = await this.gtoken.getToken();
+      this.refreshAuthorizationHeader(token);
+    } catch (ex) {
+      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
+      log.error(`${origin}: ${errorObj.IAPerror.displayString} ${ex.message}`);
+      throw new Error(errorObj);
+    }
+  }
+
   /**
    * configureGtoken accepts the options for the gtoken library documented in the website below,
    * plus keyFileContents in order to facilitate convenient retrieval from Hashicorp Vault

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-gcp_compute",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "This adapter integrates with system described as: computeEngineApi.",
   "main": "adapter.js",
   "systemName": "Google Cloud Platform Compute",