From 7db4f460eeb41a76ea5cb703ef9a3a2952510914 Mon Sep 17 00:00:00 2001
From: mikiodehartj1 <113941652+mikiodehartj1@users.noreply.github.com>
Date: Tue, 2 May 2023 14:53:05 -0600
Subject: [PATCH 1/2] changes to section 3

---
 jupiterone/questions/questions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jupiterone/questions/questions.yaml b/jupiterone/questions/questions.yaml
index efa2527f..bbbddcf4 100644
--- a/jupiterone/questions/questions.yaml
+++ b/jupiterone/questions/questions.yaml
@@ -1171,7 +1171,7 @@ questions:
       find google_compute_subnetwork WITH flowLogsEnabled != true
   tags:
   - google-cloud
-  - VPC-flowlogs
+  - VPC-flow-logs
   - logging
   compliance:
   - standard: CIS Google Cloud Foundations 1.1

From cc222a2a92847c48bf0e9f650b493ddfd44d32b8 Mon Sep 17 00:00:00 2001
From: mikiodehartj1 <113941652+mikiodehartj1@users.noreply.github.com>
Date: Wed, 3 May 2023 14:40:37 -0600
Subject: [PATCH 2/2] changes to section 1

---
 jupiterone/questions/questions.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/jupiterone/questions/questions.yaml b/jupiterone/questions/questions.yaml
index bbbddcf4..26ecbc65 100644
--- a/jupiterone/questions/questions.yaml
+++ b/jupiterone/questions/questions.yaml
@@ -589,6 +589,32 @@ questions:
     requirements:
       - '1.18'
 
+- id: integration-question-google-dataproc-cmek
+  title: Ensure that Dataproc Cluster is encrypted using Customer-Managed Encryption Key
+  description: >
+    When you use Dataproc, cluster and job data is stored on Persistent Disks (PDs) associated with the Compute Engine VMs in your cluster and in a Cloud Storage staging bucket. This PD and bucket data is encrypted using a Google-generated data encryption key (DEK) and key encryption key (KEK). The CMEK feature allows you to create, use, and revoke the key encryption key (KEK). Google still controls the data encryption key (DEK).
+  queries:
+  - name: good
+    query: |
+      FIND google_dataproc_cluster WITH encrypted = true AND kmsKeyName ~= "cmek"
+  - name: bad
+    query: |
+      FIND google_dataproc_cluster WITH encrypted != true OR kmsKeyName !~= "cmek"
+  tags:
+  - google-cloud
+  - customer-managed-encryption-key
+  - encryption
+  compliance:
+  - standard: CIS Google Cloud Foundations 1.1
+    requirements:
+      - '1.17'
+  - standard: CIS Google Cloud Platform Foundation Benchmark 1.3
+    requirements:
+      - '1.17'
+  - standard: CIS Google Cloud Platform Foundation Benchmark 2.0.0
+    requirements:
+      - '1.17'
+
 - id: integration-question-google-cloud-iam-all-user-policies
   title: Which policies are bound to “allUsers” or “allAuthenticatedUsers”?
   description: >