Merge pull request #630 from JupiterOne/INT-9927-2

INT-9927: propagate run service metadata to entity
JupiterOne-Archives · Nov 28, 2023 · 6929d18 · 6929d18
2 parents 1147cdd + a5b94a6
commit 6929d18
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/src/steps/cloud-run/__snapshots__/converters.test.ts.snap b/src/steps/cloud-run/__snapshots__/converters.test.ts.snap
@@ -310,6 +310,15 @@ exports[`#createCloudRunServiceEntity should convert to entity 1`] = `
   "function": [
     "workload-management",
   ],
+  "metaClientName": "cloud-console",
+  "metaCreator": "user@email.com",
+  "metaIngress": "all",
+  "metaIngressStatus": "all",
+  "metaLastModifier": "user@email.com",
+  "metaLaunchStage": "BETA",
+  "metaMaxScale": "100",
+  "metaSandbox": "gvisor",
+  "metaUserImage": "us-docker.pkg.dev/cloudrun/container/hello",
   "name": "example-cloud-run-service",
   "webLink": "https://console.cloud.google.com/run/detail/us-central1/example-cloud-run-service",
 }

diff --git a/src/steps/cloud-run/__snapshots__/index.test.ts.snap b/src/steps/cloud-run/__snapshots__/index.test.ts.snap
@@ -120,6 +120,15 @@ exports[`#fetchCloudRunConfigurations should collect data 1`] = `
       "function": [
         "workload-management",
       ],
+      "metaClientName": "cloud-console",
+      "metaCreator": "user@email.com",
+      "metaIngress": "all",
+      "metaIngressStatus": "all",
+      "metaLastModifier": "user@email.com",
+      "metaLaunchStage": "BETA",
+      "metaMaxScale": "100",
+      "metaSandbox": "gvisor",
+      "metaUserImage": "us-docker.pkg.dev/cloudrun/container/hello",
       "name": "example-cloud-run-service",
       "webLink": "https://console.cloud.google.com/run/detail/us-central1/example-cloud-run-service",
     },
@@ -368,6 +377,15 @@ exports[`#fetchCloudRunRoutes should collect data 1`] = `
       "function": [
         "workload-management",
       ],
+      "metaClientName": "cloud-console",
+      "metaCreator": "user@email.com",
+      "metaIngress": "all",
+      "metaIngressStatus": "all",
+      "metaLastModifier": "user@email.com",
+      "metaLaunchStage": "BETA",
+      "metaMaxScale": "100",
+      "metaSandbox": "gvisor",
+      "metaUserImage": "us-docker.pkg.dev/cloudrun/container/hello",
       "name": "example-cloud-run-service",
       "webLink": "https://console.cloud.google.com/run/detail/us-central1/example-cloud-run-service",
     },
@@ -594,6 +612,15 @@ exports[`#fetchCloudRunServices should collect data 1`] = `
       "function": [
         "workload-management",
       ],
+      "metaClientName": "cloud-console",
+      "metaCreator": "user@email.com",
+      "metaIngress": "all",
+      "metaIngressStatus": "all",
+      "metaLastModifier": "user@email.com",
+      "metaLaunchStage": "BETA",
+      "metaMaxScale": "100",
+      "metaSandbox": "gvisor",
+      "metaUserImage": "us-docker.pkg.dev/cloudrun/container/hello",
       "name": "example-cloud-run-service",
       "webLink": "https://console.cloud.google.com/run/detail/us-central1/example-cloud-run-service",
     },

diff --git a/src/steps/cloud-run/converters.ts b/src/steps/cloud-run/converters.ts
@@ -53,6 +53,8 @@ export function createCloudRunServiceEntity(
     webLink = `/run?project=${projectId}`;
   }
 
+  const metadataProperties = parseMetadata(data);
+
   return createIntegrationEntity({
     entityData: {
       source: data,
@@ -66,6 +68,7 @@ export function createCloudRunServiceEntity(
         category: ['infrastructure'],
         createdOn: parseTimePropertyValue(data.metadata?.creationTimestamp),
         webLink: getGoogleCloudConsoleWebLink(webLink),
+        ...metadataProperties.filteredProperties,
       },
     },
   });

diff --git a/src/steps/cloud-run/index.test.ts b/src/steps/cloud-run/index.test.ts
@@ -51,7 +51,7 @@ describe('#fetchCloudRunServices', () => {
     ).toMatchGraphObjectSchema({
       _class: ['Service'],
       schema: {
-        additionalProperties: false,
+        additionalProperties: true,
         properties: {
           _type: { const: 'google_cloud_run_service' },
           _rawData: {
@@ -110,7 +110,7 @@ describe('#fetchCloudRunRoutes', () => {
     ).toMatchGraphObjectSchema({
       _class: ['Service'],
       schema: {
-        additionalProperties: false,
+        additionalProperties: true,
         properties: {
           _type: { const: 'google_cloud_run_service' },
           _rawData: {
@@ -204,7 +204,7 @@ describe('#fetchCloudRunConfigurations', () => {
     ).toMatchGraphObjectSchema({
       _class: ['Service'],
       schema: {
-        additionalProperties: false,
+        additionalProperties: true,
         properties: {
           _type: { const: 'google_cloud_run_service' },
           _rawData: {