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

fix: fix controls errors

Author: artaasadi

compliance/controls/azure/azure_cis_v130_5_1_2.yaml

@@ -17,6 +17,8 @@ Query:
         _ctx,
         resource_group,
         subscription_id,
+        og_account_id,
+        og_resource_id,
         COUNT(*) FILTER (WHERE l ->> 'enabled' = 'true' 
           AND l ->> 'category' IN ('Administrative', 'Security', 'Alert', 'Policy')
         ) AS valid_category_count,
@@ -30,6 +32,8 @@ Query:
         name,
         id,
         _ctx,
+        og_account_id,
+        og_resource_id,
         resource_group,
         subscription_id
     )

compliance/controls/azure/azure_cis_v140_5_1_2.yaml

@@ -16,6 +16,8 @@ Query:
         id,
         _ctx,
         resource_group,
+        og_account_id,
+        og_resource_id,
         subscription_id,
         COUNT(*) FILTER (WHERE l ->> 'enabled' = 'true'
           AND l ->> 'category' IN ('Administrative', 'Security', 'Alert', 'Policy')
@@ -31,6 +33,8 @@ Query:
         id,
         _ctx,
         resource_group,
+        og_account_id,
+        og_resource_id,
         subscription_id
     )
     SELECT

compliance/controls/azure/azure_cis_v150_5_1_2.yaml

@@ -15,6 +15,8 @@ Query:
         name,
         id,
         _ctx,
+        og_account_id,
+        og_resource_id,
         resource_group,
         subscription_id,
         COUNT(*) FILTER (WHERE l ->> 'enabled' = 'true'
@@ -31,6 +33,8 @@ Query:
         id,
         _ctx,
         resource_group,
+        og_account_id,
+        og_resource_id,
         subscription_id
     )
     SELECT