Merge pull request #209 from JupiterOne/208-projectId-config

Fixes #208 - Incorrect projectId property being applied to entities when projectId is supplied in integration config

Author: austinkelleher

CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to
 
 ## [Unreleased]
 
+## 0.32.1 - 2021-06-04
+
+### Fixed
+
+- [#208](https://github.com/JupiterOne/graph-google-cloud/issues/208) -
+  Incorrect `projectId` property being applied to entities when `projectId` is
+  supplied in integration config
+
 ## 0.32.0 - 2021-06-04
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/graph-google-cloud",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "A graph conversion tool for https://cloud.google.com/",
   "license": "MPL-2.0",
   "main": "dist/index.js",

src/index.ts

@@ -76,6 +76,7 @@ export const invocationConfig: IntegrationInvocationConfig<IntegrationConfig> =
 
     beforeAddEntity(context, entity: Entity): Entity {
       const projectId =
+        context.instance.config.projectId ||
         context.instance.config.serviceAccountKeyConfig.project_id;
 
       return {