modified tests to fix logic

Author: amychisholm03

lib/utilization/gcp-info.js

@@ -51,23 +51,24 @@ function fetchGCPInfo(agent, callback) {
       }
 
       // Most GCP services have id, zone, machineType, name
-      const results = common.getKeys(data, ['id', 'zone', 'machineType', 'name'])
+      // GCP Cloud Run only has id and zone
+      const results = common.getKeys(data, ['id', 'zone'])
       if (!results) {
-        // GCP cloud run metadata only has id and zone
-        const cloudRunSpecificResults = common.getKeys(data, ['id', 'zone'])
-        if (cloudRunSpecificResults && process.env.K_SERVICE) {
-          resultDict = cloudRunSpecificResults
-        }
+        logger.debug({ utilization: 'gcp' }, 'GCP metadata was invalid.')
+        agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
       } else {
-        results.machineType = results.machineType.split('/').pop()
-        results.zone = results.zone.split('/').pop()
+        if (common.checkValueString(data.name)) {
+          results.name = data.name
+        }
+        if (common.checkValueString(data.machineType)) {
+          results.machineType = data.machineType.split('/').pop()
+        }
+        if (common.checkValueString(results.zone)) {
+          results.zone = results.zone.split('/').pop()
+        }
 
         resultDict = results
       }
-      if (!resultDict) {
-        logger.debug({ utilization: 'gcp' }, 'GCP metadata was invalid.')
-        agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
-      }
       callback(null, results)
     }
   )

test/lib/cross_agent_tests/utilization_vendor_specific/gcp.json

@@ -54,10 +54,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "name": "aef-default-20170501t160547-7gh8",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -74,10 +80,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "name": "aef-default-20170501t160547-7gh8",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -174,10 +186,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "machineType": "custom-1-1024",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -194,10 +212,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "machineType": "custom-1-1024",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -236,10 +260,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "machineType": "custom-1-1024",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -256,10 +286,16 @@
         "timeout": false
       }
     },
-    "expected_vendors_hash": null,
+    "expected_vendors_hash": {
+      "gcp": {
+        "id": "3161347020215157123",
+        "machineType": "custom-1-1024",
+        "zone": "us-central1-c"
+      }
+    },
     "expected_metrics": {
       "Supportability/utilization/gcp/error": {
-        "call_count": 1
+        "call_count": 0
       }
     }
   },
@@ -285,4 +321,4 @@
       }
     }
   }
-]
+]

test/unit/collector/facts.test.js

@@ -809,20 +809,18 @@ test('host facts', async (t) => {
       callback(null, systemInfo)
     }
 
-    const systemInfoPath = require.resolve('../../../lib/system-info')
-    ctx.originalSystemInfoModule = require.cache[systemInfoPath]
-    ctx.systemInfoPath = systemInfoPath
-    require.cache[systemInfoPath] = {
-      id: systemInfoPath,
-      filename: systemInfoPath,
+    ctx.systemInfoPath = require.resolve('../../../lib/system-info')
+    ctx.originalSystemInfoModule = require.cache[ctx.systemInfoPath]
+    require.cache[ctx.systemInfoPath] = {
+      id: ctx.systemInfoPath,
+      filename: ctx.systemInfoPath,
       loaded: true,
       exports: mockSysInfo
     }
 
-    const factsPath = require.resolve('../../../lib/collector/facts')
-    ctx.originalFactsModule = require.cache[factsPath]
-    ctx.factsPath = factsPath
-    delete require.cache[factsPath]
+    ctx.factsPath = require.resolve('../../../lib/collector/facts')
+    ctx.originalFactsModule = require.cache[ctx.factsPath]
+    delete require.cache[ctx.factsPath]
 
     const facts = require('../../../lib/collector/facts')
     ctx.nr.facts = function (agent, callback) {