Merge pull request #19 from opengovern/fix-azuread-entraid

Fix azuread entraid

Author: artaasadi

compliance/controls/aws/aws_account_alternate_contact_security_registered.yaml

@@ -21,8 +21,8 @@ Query:
     )
     SELECT
       arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN a.partition = 'aws-us-gov' THEN 'info'
         WHEN c.name IS NOT NULL THEN 'ok'

compliance/controls/aws/aws_account_part_of_organizations.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN organization_id IS NOT NULL THEN 'ok'
         ELSE 'alarm'

compliance/controls/aws/aws_acm_certificate_expires_30_days.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN renewal_eligibility = 'INELIGIBLE' THEN 'skip'
         WHEN DATE(not_after) - DATE(current_date) >= 30 THEN 'ok'

compliance/controls/aws/aws_acm_certificate_no_failed_certificate.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN status IN ('VALIDATION_TIMED_OUT', 'FAILED') THEN 'alarm'
         ELSE 'ok'

compliance/controls/aws/aws_acm_certificate_no_pending_validation_certificate.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN status = 'PENDING_VALIDATION' THEN 'info'
         ELSE 'ok'

compliance/controls/aws/aws_acm_certificate_no_wildcard_domain_name.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN domain_name LIKE '*%' THEN 'alarm'
         ELSE 'ok'

compliance/controls/aws/aws_acm_certificate_not_expired.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN renewal_eligibility = 'INELIGIBLE' THEN 'skip'
         WHEN DATE(not_after) < (CURRENT_DATE - INTERVAL '1' minute) THEN 'alarm'

compliance/controls/aws/aws_acm_certificate_rsa_key_length_2048_bits_or_greater.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN NOT key_algorithm LIKE 'RSA-%' THEN 'skip'
         WHEN key_algorithm = 'RSA_1024' THEN 'alarm'

compliance/controls/aws/aws_acm_certificate_transparency_logging_enabled.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       certificate_arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN type = 'IMPORTED' THEN 'skip'
         WHEN certificate_transparency_logging_preference = 'ENABLED' THEN 'ok'

compliance/controls/aws/aws_acmpca_root_certificate_authority_disabled.yaml

@@ -11,8 +11,8 @@ Query:
   QueryToExecute: |
     SELECT
       arn AS resource,
-      og_account_id AS og_account_id,
-      og_resource_id AS og_resource_id,
+      platform_account_id AS platform_account_id,
+      platform_resource_id AS platform_resource_id,
       CASE
         WHEN type <> 'ROOT' THEN 'skip'
         WHEN status = 'DISABLED' THEN 'ok'