feat(result): added resourceType and resourceName to Google Deployment Management queries result

assets/queries/googleDeploymentManager/bigquery_database_is_public/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.access[%d].specialGroup", [resource.name, j]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("'access[%d].specialGroup' to be not equal to 'allAuthenticatedUsers'", [j]),

assets/queries/googleDeploymentManager/bucket_without_versioning/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'versioning' to be defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.versioning", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'versioning.enabled' to be defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.versioning.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'versioning.enabled' to be true",

assets/queries/googleDeploymentManager/client_certificate_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'masterAuth' to be defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuth", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'masterAuth.clientCertificateConfig' to be defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuth.clientCertificateConfig.issueClientCertificate", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'masterAuth.clientCertificateConfig.issueClientCertificate' to be true",

assets/queries/googleDeploymentManager/cloud_dns_without_dnnsec/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'dnssecConfig' is defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.dnssecConfig", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'state' is defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.dnssecConfig.state", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'state' is set to 'on'",

assets/queries/googleDeploymentManager/cloud_storage_anonymous_or_publicly_accessible/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'acl' to be defined",
@@ -27,6 +29,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.acl[%d].entity", [resource.name, j]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("properties.acl[%d].entity to be not equal to 'allUsers' or 'AllAuthenticatedUsers'", [j]),
@@ -43,6 +47,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'defaultObjectAcl' to be defined",
@@ -60,6 +66,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.defaultObjectAcl[%d].entity", [resource.name, j]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("properties.defaultObjectAcl[%d].entity to be not equal to 'allUsers' or 'AllAuthenticatedUsers'", [j]),

assets/queries/googleDeploymentManager/cloud_storage_bucket_is_publicly_accessible/query.rego

@@ -11,6 +11,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.entity", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'entity' is not equal to 'allUsers' or 'allAuthenticatedUsers'",

assets/queries/googleDeploymentManager/cloud_storage_bucket_versioning_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'versioning' is defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.versioning.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'enabled' is set to true",

assets/queries/googleDeploymentManager/cluster_labels_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'resourceLabels' to be defined and not null",

assets/queries/googleDeploymentManager/cluster_master_authentication_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'masterAuth' to be defined and not null",
@@ -27,6 +29,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuth", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "Attribute 'masterAuth.username' to be defined and Attribute 'masterAuth.password' to be defined",
@@ -44,6 +48,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuth", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "Attribute 'masterAuth.username' to be not empty and attribute 'masterAuth.password' to be not empty",

assets/queries/googleDeploymentManager/compute_instance_is_publicly_accessible/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.networkInterfaces", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'accessConfigs' is undefined",

assets/queries/googleDeploymentManager/cos_node_image_not_used/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.config.imageType", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'config.imageType' should start with 'cos'",

assets/queries/googleDeploymentManager/disk_encryption_disabled/query.rego

@@ -11,6 +11,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.disks", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'diskEncryptionKey' is defined and not null",
@@ -29,6 +31,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.disks.diskEncryptionKey", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'disk_encryption_key.rawKey' or 'disk_encryption_key.kmsKeyName' is defined and not null",
@@ -48,6 +52,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.disks.diskEncryptionKey.%s", [resource.name, fields[f]]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("'diskEncryptionKey.%s' is not empty", [fields[f]]),

assets/queries/googleDeploymentManager/dnssec_using_rsasha1/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.dnssecConfig.defaultKeySpecs", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'algorithm' is not equal to 'rsasha1'",

assets/queries/googleDeploymentManager/gke_legacy_authorization_enabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.legacyAbac.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'legacyAbac.enabled' to be false",

assets/queries/googleDeploymentManager/gke_master_authorized_networks_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'masterAuthorizedNetworksConfig' to be defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuthorizedNetworksConfig", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'masterAuthorizedNetworksConfig.enabled' to be defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.masterAuthorizedNetworksConfig.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'masterAuthorizedNetworksConfig.enabled' to be true",

assets/queries/googleDeploymentManager/google_storage_bucket_level_access_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.iamConfiguration.uniformBucketLevelAccess.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'enabled' is set to true",

assets/queries/googleDeploymentManager/ip_aliasing_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'ipAllocationPolicy' to be defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.ipAllocationPolicy", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'ipAllocationPolicy.useIpAliases' to be defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.ipAllocationPolicy.useIpAliases", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'ipAllocationPolicy.useIpAliases' to be true",

assets/queries/googleDeploymentManager/ip_forwarding_enabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.canIpForward", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'canIpForward' is not set to true",

assets/queries/googleDeploymentManager/mysql_instance_with_local_infile_on/query.rego

@@ -12,6 +12,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.settings.databaseFlags[%d]", [resource.name, f]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": sprintf("'settings.databaseFlags[%d]' to be 'off'", [f]),

assets/queries/googleDeploymentManager/network_policy_disabled/query.rego

@@ -10,6 +10,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'networkPolicy' to be defined and not null",
@@ -26,6 +28,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.networkPolicy", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'networkPolicy.enabled' to be defined and not null",
@@ -42,6 +46,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.networkPolicy.enabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'networkPolicy.enabled' to be true",
@@ -58,6 +64,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'addonsConfig' to be defined and not null",
@@ -74,6 +82,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.addonsConfig", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'addonsConfig.networkPolicyConfig' to be defined and not null",
@@ -90,6 +100,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.addonsConfig.networkPolicyConfig", [resource.name]),
 		"issueType": "MissingAttribute",
 		"keyExpectedValue": "'addonsConfig.networkPolicyConfig.disabled' to be defined and not null",
@@ -106,6 +118,8 @@ CxPolicy[result] {
 
 	result := {
 		"documentId": input.document[i].id,
+		"resourceType": resource.type,
+		"resourceName": resource.name,
 		"searchKey": sprintf("resources.name={{%s}}.properties.addonsConfig.networkPolicyConfig.disabled", [resource.name]),
 		"issueType": "IncorrectValue",
 		"keyExpectedValue": "'addonsConfig.networkPolicyConfig.disabled' to be false",