From 46f0cc38ee998ac4798af383fc1f153f884ead5f Mon Sep 17 00:00:00 2001 From: Hasan Acar Date: Wed, 6 Mar 2024 07:57:05 +0000 Subject: [PATCH] fix: sha256 instead of sha1 for metric_id fix: allowlist added to tox Change-Id: I7d99515c07f2b01394d869d437327ab27ffa4a44 --- monasca_persister/repositories/cassandra/metrics_repository.py | 2 +- .../recreate-metric-id/persister-check-missing-metric-id.py | 2 +- .../recreate-metric-id/persister-recreate-metric-id.py | 2 +- tox.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monasca_persister/repositories/cassandra/metrics_repository.py b/monasca_persister/repositories/cassandra/metrics_repository.py index 255e1d1f..1baac309 100644 --- a/monasca_persister/repositories/cassandra/metrics_repository.py +++ b/monasca_persister/repositories/cassandra/metrics_repository.py @@ -132,7 +132,7 @@ class MetricCassandraRepository(abstract_repository.AbstractCassandraRepository) dim_names.append(name) hash_string = '%s\0%s\0%s\0%s' % (region, tenant_id, metric_name, '\0'.join(dim_list)) - metric_id = hashlib.sha1(hash_string.encode('utf8')).hexdigest() + metric_id = hashlib.sha256(hash_string.encode('utf8')).hexdigest() # TODO(brtknr): If database per tenant becomes the default and the # only option, recording tenant_id will be redundant. diff --git a/monasca_persister/tools/cassandra/recreate-metric-id/persister-check-missing-metric-id.py b/monasca_persister/tools/cassandra/recreate-metric-id/persister-check-missing-metric-id.py index 71d9ec09..a374e3bd 100644 --- a/monasca_persister/tools/cassandra/recreate-metric-id/persister-check-missing-metric-id.py +++ b/monasca_persister/tools/cassandra/recreate-metric-id/persister-check-missing-metric-id.py @@ -128,7 +128,7 @@ def main(): hash_string = '%s\0%s\0%s\0%s' % (row.region, row.tenant_id, row.metric_name, '\0'.join(row.dimensions)) - # metric_id = hashlib.sha1(hash_string.encode('utf8')).hexdigest() + # metric_id = hashlib.sha256(hash_string.encode('utf8')).hexdigest() # id_bytes = bytearray.fromhex(metric_id) LOG.info("Recreated hash for metric id: {}".format(hash_string)) diff --git a/monasca_persister/tools/cassandra/recreate-metric-id/persister-recreate-metric-id.py b/monasca_persister/tools/cassandra/recreate-metric-id/persister-recreate-metric-id.py index 62588a6c..1ceee8bc 100644 --- a/monasca_persister/tools/cassandra/recreate-metric-id/persister-recreate-metric-id.py +++ b/monasca_persister/tools/cassandra/recreate-metric-id/persister-recreate-metric-id.py @@ -143,7 +143,7 @@ def main(): hash_string = '%s\0%s\0%s\0%s' % (row.region, row.tenant_id, row.metric_name, '\0'.join(row.dimensions)) - metric_id = hashlib.sha1(hash_string.encode('utf8')).hexdigest() + metric_id = hashlib.sha256(hash_string.encode('utf8')).hexdigest() id_bytes = bytearray.fromhex(metric_id) LOG.info("Recreated hash for metric id: {}".format(hash_string)) diff --git a/tox.ini b/tox.ini index 580d4f4f..d453c5e3 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ passenv = http_proxy no_proxy NO_PROXY usedevelop = True -whitelist_externals = bash +allowlist_externals = bash find rm install_command = pip install {opts} {packages}