From aaaae7bd453a322f47f0f6e3a21e57ab99cce52d Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Tue, 5 Mar 2019 11:08:55 -0500 Subject: [PATCH 1/2] adding where clause to prevent null usernames from being inserted into staging.union-user-pi-resource table --- .../cloud_generic/union_user_pi_resource.json | 3 +++ .../cloud_openstack/union_user_pi_resource.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json b/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json index 87621c667d..d863f33112 100644 --- a/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json +++ b/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json @@ -19,6 +19,9 @@ "alias": "r", "on": "r.id = raw.resource_id" } + ], + "where": [ + "raw.provider_user IS NOT NULL" ] } } diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json b/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json index 7e8582a89c..9bd697c95b 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json @@ -19,6 +19,9 @@ "alias": "r", "on": "r.id = raw.resource_id" } + ], + "where": [ + "raw.user_name IS NOT NULL" ] } } From e04ac9ab38c9852538374f44256a324966642425 Mon Sep 17 00:00:00 2001 From: Greg Dean Date: Tue, 5 Mar 2019 13:25:22 -0500 Subject: [PATCH 2/2] changing spacing --- .../etl_action_defs.d/cloud_generic/union_user_pi_resource.json | 2 +- .../cloud_openstack/union_user_pi_resource.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json b/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json index d863f33112..72643f619c 100644 --- a/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json +++ b/configuration/etl/etl_action_defs.d/cloud_generic/union_user_pi_resource.json @@ -21,7 +21,7 @@ } ], "where": [ - "raw.provider_user IS NOT NULL" + "raw.provider_user IS NOT NULL" ] } } diff --git a/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json b/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json index 9bd697c95b..119eba0946 100644 --- a/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json +++ b/configuration/etl/etl_action_defs.d/cloud_openstack/union_user_pi_resource.json @@ -21,7 +21,7 @@ } ], "where": [ - "raw.user_name IS NOT NULL" + "raw.user_name IS NOT NULL" ] } }