From 2c15110255540e1d5ce5bbacc3ccd15f9a4fa135 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 28 Mar 2017 10:53:16 +0200 Subject: [PATCH] Rename constructor arguments for consistency --- server/extension/sql/210_rates.sql | 2 +- .../cartodb_services/config/legacy_rate_limits.py | 6 +++--- .../cartodb_services/config/rate_limits.py | 7 +++---- .../cartodb_services/tools/legacy_service_manager.py | 2 +- .../cartodb_services/tools/service_manager.py | 2 +- .../cartodb_services/test/test_ratelimitsconfig.py | 12 ++++++------ 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/server/extension/sql/210_rates.sql b/server/extension/sql/210_rates.sql index 63e8d4e..058c766 100644 --- a/server/extension/sql/210_rates.sql +++ b/server/extension/sql/210_rates.sql @@ -11,7 +11,7 @@ RETURNS JSON AS $$ cartodb_services.init(plpy, GD) service_config = ServiceConfiguration(service, username, orgname) - rate_limit_config = RateLimitsConfigBuilder(service_config.server, service_config.user, service_config.org, service=service, user=username, org=orgname).get() + rate_limit_config = RateLimitsConfigBuilder(service_config.server, service_config.user, service_config.org, service=service, username=username, orgname=orgname).get() if rate_limit_config.is_limited(): return json.dumps({'limit': rate_limit_config.limit, 'period': rate_limit_config.period}) else: diff --git a/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py b/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py index d4208ec..e50da06 100644 --- a/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py +++ b/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py @@ -6,10 +6,10 @@ class RateLimitsConfigLegacyBuilder(object): Build a RateLimitsConfig object using the *legacy* configuration classes """ - def __init__(self, redis_connection, db_conn, service, user, org): + def __init__(self, redis_connection, db_conn, service, username, orgname): self._service = service - self._username = user - self._orgname = org + self._username = username + self._orgname = orgname self._redis_connection = redis_connection self._db_conn = db_conn diff --git a/server/lib/python/cartodb_services/cartodb_services/config/rate_limits.py b/server/lib/python/cartodb_services/cartodb_services/config/rate_limits.py index 814a1f3..98f6a47 100644 --- a/server/lib/python/cartodb_services/cartodb_services/config/rate_limits.py +++ b/server/lib/python/cartodb_services/cartodb_services/config/rate_limits.py @@ -49,14 +49,13 @@ class RateLimitsConfigBuilder(object): from the user/org/server configuration. """ - # TODO: user->username, org->orgname - def __init__(self, server_conf, user_conf, org_conf, service, user, org): + def __init__(self, server_conf, user_conf, org_conf, service, username, orgname): self._server_conf = server_conf self._user_conf = user_conf self._org_conf = org_conf self._service = service - self._username = user - self._orgname = org + self._username = username + self._orgname = orgname def get(self): # Order of precedence is user_conf, org_conf, server_conf diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/legacy_service_manager.py b/server/lib/python/cartodb_services/cartodb_services/tools/legacy_service_manager.py index 63bb90f..2ae700c 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tools/legacy_service_manager.py +++ b/server/lib/python/cartodb_services/cartodb_services/tools/legacy_service_manager.py @@ -19,5 +19,5 @@ class LegacyServiceManager(ServiceManagerBase): self.quota_service = QuotaService(self.config, redis_conn) - rate_limit_config = RateLimitsConfigLegacyBuilder(redis_conn, plpy, service=service, user=username, org=orgname).get() + rate_limit_config = RateLimitsConfigLegacyBuilder(redis_conn, plpy, service=service, username=username, orgname=orgname).get() self.rate_limiter = RateLimiter(rate_limit_config, redis_conn) diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py b/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py index 22d1677..d493e40 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py +++ b/server/lib/python/cartodb_services/cartodb_services/tools/service_manager.py @@ -62,7 +62,7 @@ class ServiceManager(ServiceManagerBase): self.logger = Logger(logger_config) self.config = config_builder(service_config.server, service_config.user, service_config.org, username, orgname).get() - rate_limit_config = RateLimitsConfigBuilder(service_config.server, service_config.user, service_config.org, service=service, user=username, org=orgname).get() + rate_limit_config = RateLimitsConfigBuilder(service_config.server, service_config.user, service_config.org, service=service, username=username, orgname=orgname).get() redis_metrics_connection = RedisMetricsConnectionFactory(service_config.environment, service_config.server).get() diff --git a/server/lib/python/cartodb_services/test/test_ratelimitsconfig.py b/server/lib/python/cartodb_services/test/test_ratelimitsconfig.py index 976b0c9..5cb967c 100644 --- a/server/lib/python/cartodb_services/test/test_ratelimitsconfig.py +++ b/server/lib/python/cartodb_services/test/test_ratelimitsconfig.py @@ -62,8 +62,8 @@ class TestRateLimitsConfig(TestCase): user_conf=self.empty_redis_config, org_conf=self.empty_redis_config, service='geocoder', - user=self.username, - org=self.orgname + username=self.username, + orgname=self.orgname ).get() plpy_mock._define_result("CDB_Conf_GetConf\('rate_limits'\)", []) assert_equal(read_config, config) @@ -88,8 +88,8 @@ class TestRateLimitsConfig(TestCase): user_conf=self.empty_redis_config, org_conf=self.org_config, service='geocoder', - user=self.username, - org=self.orgname + username=self.username, + orgname=self.orgname ).get() plpy_mock._define_result("CDB_Conf_GetConf\('rate_limits'\)", []) assert_equal(read_config, org_config) @@ -117,8 +117,8 @@ class TestRateLimitsConfig(TestCase): user_conf=self.user_config, org_conf=self.org_config, service='geocoder', - user=self.username, - org=self.orgname + username=self.username, + orgname=self.orgname ).get() plpy_mock._define_result("CDB_Conf_GetConf\('rate_limits'\)", []) assert_equal(read_config, user_config)