From e6fb4e1fb578c9ee69bd2628935727dd66632563 Mon Sep 17 00:00:00 2001
From: sfc-gh-afedorov <andrey.fedorov@snowflake.com>
Date: Sun, 2 Aug 2020 08:58:13 -0700
Subject: [PATCH] [dc] Add raw col's to AzIC preview APIs

---
 migrations/v1_9_4-v1_9_5.md     | 15 +++++++++++----
 src/connectors/azure_collect.py | 10 +++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/migrations/v1_9_4-v1_9_5.md b/migrations/v1_9_4-v1_9_5.md
index 06cac7332..f8f4e24d3 100644
--- a/migrations/v1_9_4-v1_9_5.md
+++ b/migrations/v1_9_4-v1_9_5.md
@@ -17,8 +17,13 @@ ALTER TABLE azure_collect_service_principals ADD COLUMN app_description STRING;
 ALTER TABLE azure_collect_service_principals ADD COLUMN description STRING;
 ALTER TABLE azure_collect_service_principals ADD COLUMN notes STRING;
 
+ALTER TABLE azure_collect_security_contacts ADD COLUMN etag STRING;
+
 ALTER TABLE azure_collect_groups ADD COLUMN raw VARIANT;
 ALTER TABLE azure_collect_managed_devices ADD COLUMN raw VARIANT;
+ALTER TABLE azure_collect_security_contacts ADD COLUMN raw VARIANT;
+ALTER TABLE azure_collect_diagnostic_settings ADD COLUMN raw VARIANT;
+ALTER TABLE azure_collect_auto_provisioning_settings ADD COLUMN raw VARIANT;
 ALTER TABLE azure_collect_service_principals ADD COLUMN raw VARIANT;
 ALTER TABLE azure_collect_reports_credential_user_registration_details ADD COLUMN raw VARIANT;
 ~~~
@@ -146,11 +151,12 @@ CREATE OR REPLACE TABLE azure_collect_sql_servers (
     name STRING,
     properties VARIANT,
     tags VARIANT,
-    type STRING
+    type STRING,
+    raw VARIANT
 );
 GRANT SELECT, INSERT ON TABLE azure_collect_sql_servers TO ROLE app_snowalert;
 
-CREATE OR REPLACE TABLE sql_servers_auditing_settings (
+CREATE OR REPLACE TABLE azure_collect_sql_servers_auditing_settings (
     recorded_at TIMESTAMP_LTZ,
     tenant_id VARCHAR(50),
     subscription_id VARCHAR(50),
@@ -159,9 +165,10 @@ CREATE OR REPLACE TABLE sql_servers_auditing_settings (
     id STRING,
     type STRING,
     name STRING,
-    properties VARIANT
+    properties VARIANT,
+    raw VARIANT
 );
-GRANT SELECT, INSERT ON TABLE sql_servers_auditing_settings TO ROLE app_snowalert;
+GRANT SELECT, INSERT ON TABLE azure_collect_sql_servers_auditing_settings TO ROLE app_snowalert;
 ~~~
 
 ~~~
diff --git a/src/connectors/azure_collect.py b/src/connectors/azure_collect.py
index 13bfa5e85..091cd3738 100644
--- a/src/connectors/azure_collect.py
+++ b/src/connectors/azure_collect.py
@@ -332,6 +332,7 @@ def access_token_cache(cloud, client_id, tenant, secret, resource, _creds={}):
         ('name', 'STRING'),
         ('properties', 'VARIANT'),
         ('type', 'STRING'),
+        ('raw', 'VARIANT'),
     ],
     # https://docs.microsoft.com/en-us/rest/api/resources/policyassignments/list#policyassignment
     'policy_assignments': [
@@ -353,12 +354,12 @@ def access_token_cache(cloud, client_id, tenant, secret, resource, _creds={}):
         ('tenant_id', 'VARCHAR(50)'),
         ('subscription_id', 'VARCHAR(50)'),
         ('error', 'VARIANT'),
-        ('raw', 'VARIANT'),
         ('id', 'STRING'),
         ('name', 'STRING'),
         ('type', 'STRING'),
         ('properties', 'VARIANT'),
         ('etag', 'STRING'),
+        ('raw', 'VARIANT'),
     ],
     # https://docs.microsoft.com/en-us/graph/api/resources/serviceprincipal?view=graph-rest-beta#properties
     'service_principals': [
@@ -617,6 +618,7 @@ def access_token_cache(cloud, client_id, tenant, secret, resource, _creds={}):
         ('tags', 'VARIANT'),
         ('properties', 'VARIANT'),
         ('identity', 'VARIANT'),
+        ('raw', 'VARIANT'),
     ],
     # https://docs.microsoft.com/en-us/rest/api/monitor/activitylogalerts/listbysubscriptionid#activitylogalertresource
     'activity_log_alerts': [
@@ -708,6 +710,7 @@ def access_token_cache(cloud, client_id, tenant, secret, resource, _creds={}):
         ('properties', 'VARIANT'),
         ('tags', 'VARIANT'),
         ('type', 'STRING'),
+        ('raw', 'VARIANT'),
     ],
     # https://docs.microsoft.com/en-us/rest/api/sql/server%20auditing%20settings/get
     'sql_servers_auditing_settings': [
@@ -720,6 +723,7 @@ def access_token_cache(cloud, client_id, tenant, secret, resource, _creds={}):
         ('type', 'STRING'),
         ('name', 'STRING'),
         ('properties', 'VARIANT'),
+        ('raw', 'VARIANT'),
     ],
 }
 
@@ -1584,6 +1588,7 @@ def connect(connection_name, options):
             'name': 'name',
             'properties': 'properties',
             'type': 'type',
+            '*': 'raw',
         },
     },
     'policy_assignments': {
@@ -1647,6 +1652,7 @@ def connect(connection_name, options):
             'tags': 'tags',
             'identity': 'identity',
             'properties': 'properties',
+            '*': 'raw',
         },
     },
     'workflows': {
@@ -1759,6 +1765,7 @@ def connect(connection_name, options):
             'properties': 'properties',
             'tags': 'tags',
             'type': 'type',
+            '*': 'raw',
         },
         'children': [
             {'kind': 'sql_servers_auditing_settings', 'args': {'serverFullId': 'id'}}
@@ -1779,6 +1786,7 @@ def connect(connection_name, options):
             'name': 'name',
             'type': 'type',
             'properties': 'properties',
+            '*': 'raw',
         },
     },
 }