From 6170134b8b35279e70d31ae0c726679511a4872c Mon Sep 17 00:00:00 2001 From: Joe Cheuk Date: Fri, 26 Jan 2018 11:19:33 -0800 Subject: [PATCH] fixed pylint issues --- google/cloud/security/common/data_access/ke_dao.py | 2 +- google/cloud/security/common/gcp_type/resource.py | 4 ++-- .../cloud/security/scanner/audit/ke_version_rules_engine.py | 2 +- google/cloud/security/scanner/scanners/ke_version_scanner.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google/cloud/security/common/data_access/ke_dao.py b/google/cloud/security/common/data_access/ke_dao.py index 221f62e544..58c8d8ce5e 100644 --- a/google/cloud/security/common/data_access/ke_dao.py +++ b/google/cloud/security/common/data_access/ke_dao.py @@ -41,6 +41,6 @@ def get_clusters(self, timestamp): """ query = select_data.KE_CLUSTERS_JSON.format(timestamp) rows = self.execute_sql_with_fetch( - resource.ResourceType.KE, query, ()) + resource.ResourceType.KENGINE, query, ()) return [ke_cluster.KeCluster.from_json(**row) for row in rows] diff --git a/google/cloud/security/common/gcp_type/resource.py b/google/cloud/security/common/gcp_type/resource.py index 2d3d0b23d2..b1d406c757 100755 --- a/google/cloud/security/common/gcp_type/resource.py +++ b/google/cloud/security/common/gcp_type/resource.py @@ -55,8 +55,8 @@ class ResourceType(object): # AppEngine APPENGINE = 'appengine' - # KE - KE = 'ke' + # KEngine + KENGINE = 'ke' resource_types = frozenset([ ORGANIZATION, diff --git a/google/cloud/security/scanner/audit/ke_version_rules_engine.py b/google/cloud/security/scanner/audit/ke_version_rules_engine.py index 2d82501a5e..5170d4c7e9 100644 --- a/google/cloud/security/scanner/audit/ke_version_rules_engine.py +++ b/google/cloud/security/scanner/audit/ke_version_rules_engine.py @@ -427,7 +427,7 @@ def _make_violation(self, ke_cluster, nodepool, violation_reason): """ node_pool_name = nodepool.get('name') if nodepool else '' return RuleViolation( - resource_type=resource_mod.ResourceType.KE, + resource_type=resource_mod.ResourceType.KENGINE, resource_id=ke_cluster.name, rule_name=self.rule_name, rule_index=self.rule_index, diff --git a/google/cloud/security/scanner/scanners/ke_version_scanner.py b/google/cloud/security/scanner/scanners/ke_version_scanner.py index e8541fa778..4576ab2355 100644 --- a/google/cloud/security/scanner/scanners/ke_version_scanner.py +++ b/google/cloud/security/scanner/scanners/ke_version_scanner.py @@ -106,8 +106,8 @@ def _retrieve(self): list: KE Cluster data. """ ke_clusters = (ke_dao - .KeDao(self.global_configs) - .get_clusters(self.snapshot_timestamp)) + .KeDao(self.global_configs) + .get_clusters(self.snapshot_timestamp)) return ke_clusters