Merge pull request #17 from opengovern/fix-control-primarytables

fix: update controls

Author: artaasadi

compliance/controls/aws/aws_cis_v130_4_13.yaml

@@ -5,13 +5,13 @@ IntegrationType:
 Query:
   Engine: CloudQL-v0.0.1
   ListOfTables:
+    - aws_account
     - aws_cloudtrail_trail
     - aws_cloudwatch_alarm
     - aws_sns_topic_subscription
     - aws_cloudwatch_log_metric_filter
-    - aws_account
   Parameters: []
-  PrimaryTable: aws_cloudtrail_trail
+  PrimaryTable: aws_account
   QueryToExecute: |
     WITH trails AS (
       SELECT

compliance/controls/aws/aws_cis_v200_3_9.yaml

@@ -14,6 +14,8 @@ Query:
       SELECT
         arn,
         account_id,
+        og_account_id,
+        og_resource_id,
         region,
         owner_id,
         vpc_id,
@@ -36,8 +38,8 @@ Query:
     )
     SELECT
       v.arn AS resource,
-      v.account_id AS og_account_id,
-      v.vpc_id AS og_resource_id,
+      v.og_account_id AS og_account_id,
+      v.og_resource_id AS og_resource_id,
       CASE
         WHEN v.account_id <> v.owner_id THEN 'skip'
         WHEN f.resource_id IS NOT NULL THEN 'ok'

compliance/controls/azure/azure_cis_v150_2_6.yaml

@@ -8,7 +8,7 @@ Query:
     - azure_policy_assignment
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_policy_assignment
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH policy_assignment_parameters AS (
       SELECT

compliance/controls/azure/azure_cis_v210_5_2_1.yaml

@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT

compliance/controls/azure/azure_cis_v210_6_6.yaml

@@ -9,7 +9,7 @@ Query:
     - azure_network_watcher
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_network_watcher
+  PrimaryTable: azure_location
   QueryToExecute: |
     SELECT
       loc.id AS resource,