Merge branch 'main' into chore/add_bigquery

cloudquery · Dec 12, 2023 · 77d78cf · 77d78cf
2 parents 02b838b + b7ff919
commit 77d78cf
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 30 deletions.
diff --git a/transformations/aws/compliance-free/models/aws_compliance__foundational_security_free.sql b/transformations/aws/compliance-free/models/aws_compliance__foundational_security_free.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=is_snowflake()) }}
+{{ config(enabled=block_bigquery() and block_postgres()) }}
 
 with
     aggregated as (

diff --git a/transformations/aws/compliance-free/models/aws_compliance__pci_dss_v3_2_1_free.sql b/transformations/aws/compliance-free/models/aws_compliance__pci_dss_v3_2_1_free.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{ autoscaling_groups_elb_check('pci_dss_v3.2.1','autoscaling.1') }})

diff --git a/transformations/aws/compliance-premium/models/aws_compliance__foundational_security.sql b/transformations/aws/compliance-premium/models/aws_compliance__foundational_security.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=is_snowflake()) }}
+{{ config(enabled=block_bigquery() and block_postgres()) }}
 
 with
     aggregated as (

diff --git a/transformations/aws/compliance-premium/models/aws_compliance__imds_v2.sql b/transformations/aws/compliance-premium/models/aws_compliance__imds_v2.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery() and block_snowflake()) }}
+
 with
     aggregated as (
         ({{ ec2_not_imdsv2_instances('imds_v2','EC2-IMDSv2') }})

diff --git a/transformations/aws/compliance-premium/models/aws_compliance__pci_dss_v3.2.1.sql b/transformations/aws/compliance-premium/models/aws_compliance__pci_dss_v3.2.1.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery() and block_snowflake()) }}
+
 with
     aggregated as (
         ({{ autoscaling_groups_elb_check('pci_dss_v3.2.1','autoscaling.1') }})

diff --git a/transformations/aws/compliance-premium/models/aws_compliance__public_egress.sql b/transformations/aws/compliance-premium/models/aws_compliance__public_egress.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery() and block_snowflake()) }}
+
 with
     aggregated as (
         ({{ public_egress_sg_and_routing_instances('public_egress','ec2-all-instances-with-routes-and-security-groups') }})

diff --git a/transformations/aws/compliance-premium/models/aws_compliance__publicly_available.sql b/transformations/aws/compliance-premium/models/aws_compliance__publicly_available.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery() and block_snowflake()) }}
+
 with
     aggregated as (
         ({{ api_gw_publicly_accessible('publicly_available','API-Gateways') }})

diff --git a/transformations/aws/macros/efs/access_point_enforce_user_identity.sql b/transformations/aws/macros/efs/access_point_enforce_user_identity.sql
@@ -1,5 +1,3 @@
-{{ config(enabled=is_snowflake()) }} 
-
 {% macro access_point_enforce_user_identity(framework, check_id) %}
   {{ return(adapter.dispatch('access_point_enforce_user_identity')(framework, check_id)) }}
 {% endmacro %}

diff --git a/transformations/aws/models/aws_compliance__api_gateway_method_settings.sql b/transformations/aws/models/aws_compliance__api_gateway_method_settings.sql
@@ -1 +1,3 @@
+{{ config(enabled=block_bigquery()) }}
+
 {{ api_gateway_method_settings() }}
diff --git a/transformations/aws/models/aws_compliance__networks_acls_ingress_rules.sql b/transformations/aws/models/aws_compliance__networks_acls_ingress_rules.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
     ({{ networks_acls_ingress_rules() }})

diff --git a/transformations/aws/models/aws_compliance__security_group_egress_rules.sql b/transformations/aws/models/aws_compliance__security_group_egress_rules.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
     ({{ security_group_egress_rules() }})

diff --git a/transformations/azure/compliance-free/dbt_project.yml b/transformations/azure/compliance-free/dbt_project.yml
@@ -15,7 +15,7 @@ model-paths: ["models", "../models"]
 analysis-paths: ["analyses"]
 test-paths: ["tests"]
 seed-paths: ["seeds"]
-macro-paths: ["../macros"]
+macro-paths: ["../macros", "../../macros"]
 snapshot-paths: ["snapshots"]
 
 clean-targets: # directories to be removed by `dbt clean`

diff --git a/transformations/azure/compliance-free/models/azure_compliance__cis_v1_3_0_free.sql b/transformations/azure/compliance-free/models/azure_compliance__cis_v1_3_0_free.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{iam_custom_subscription_owner_roles('cis_v1.3.0','1.21')}})

diff --git a/transformations/azure/compliance-free/profiles.yml b/transformations/azure/compliance-free/profiles.yml
diff --git a/transformations/azure/compliance-premium/dbt_project.yml b/transformations/azure/compliance-premium/dbt_project.yml
@@ -15,7 +15,7 @@ model-paths: ["models", "../models"]
 analysis-paths: ["analyses"]
 test-paths: ["tests"]
 seed-paths: ["seeds"]
-macro-paths: ["../macros"]
+macro-paths: ["../macros", "../../macros"]
 snapshot-paths: ["snapshots"]
 
 clean-targets: # directories to be removed by `dbt clean`

diff --git a/transformations/azure/compliance-premium/models/azure_compliance__cis_v1_3_0.sql b/transformations/azure/compliance-premium/models/azure_compliance__cis_v1_3_0.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{iam_custom_subscription_owner_roles('cis_v1.3.0','1.21')}})

diff --git a/transformations/azure/compliance-premium/profiles.yml b/transformations/azure/compliance-premium/profiles.yml
diff --git a/transformations/azure/models/view_azure_nsg_dest_port_ranges.sql b/transformations/azure/models/view_azure_nsg_dest_port_ranges.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{view_azure_nsg_dest_port_ranges()}})

diff --git a/transformations/azure/models/view_azure_nsg_rules.sql b/transformations/azure/models/view_azure_nsg_rules.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{view_azure_nsg_rules()}})

diff --git a/transformations/azure/models/view_azure_security_policy_parameters.sql b/transformations/azure/models/view_azure_security_policy_parameters.sql
@@ -1,3 +1,5 @@
+{{ config(enabled=block_bigquery()) }}
+
 with
     aggregated as (
         ({{view_azure_security_policy_parameters()}})

diff --git a/transformations/macros/block_bigquery.sql b/transformations/macros/block_bigquery.sql
@@ -0,0 +1,7 @@
+{% macro block_bigquery() %}
+  {% if target.type == 'bigquery' %}
+    {{ return(false) }}
+  {% else %}
+    {{ return(true) }}
+  {% endif %}
+{% endmacro %}
diff --git a/transformations/macros/block_posgres.sql b/transformations/macros/block_posgres.sql
@@ -0,0 +1,7 @@
+{% macro block_postgres() %}
+  {% if target.type == 'postgres' %}
+    {{ return(false) }}
+  {% else %}
+    {{ return(true) }}
+  {% endif %}
+{% endmacro %}
diff --git a/transformations/macros/block_snowflake.sql b/transformations/macros/block_snowflake.sql
@@ -0,0 +1,7 @@
+{% macro block_snowflake() %}
+  {% if target.type == 'snowflake' %}
+    {{ return(false) }}
+  {% else %}
+    {{ return(true) }}
+  {% endif %}
+{% endmacro %}
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		{{ config(enabled=block_bigquery()) }}

		{{ api_gateway_method_settings() }}