zuul/zuul
Code Issues Proposed changes

Merge "Cache secret/SSH keys from Zookeeper"

Browse Source
This commit is contained in:
Zuul 2021-04-24 09:17:20 +00:00 committed by Gerrit Code Review
commit 3ca33f0686
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/test_v3.py
View File

@ -3712,7 +3712,7 @@ class TestProjectKeys(ZuulTestCase):
with open(os.path.join(FIXTURE_DIR, fn)) as i:
test_keys.append(i.read())
keystore = self.scheds.first.sched.getKeyStorage()
keystore = self.scheds.first.sched.keystore
private_secrets_key, public_secrets_key = (
keystore.getProjectSecretsKeys("gerrit", "org/project")
)

3
zuul/lib/keystorage.py
View File

@ -20,6 +20,7 @@ import os
import tempfile
import time
import cachetools
import kazoo
import paramiko
@ -268,6 +269,7 @@ class ZooKeeperKeyStorage(ZooKeeperBase, KeyStorage):
self.password_bytes = password.encode("utf-8")
self.backup = backup
@cachetools.cached(cache={})
def getProjectSSHKeys(self, connection_name, project_name):
key_project_name = strings.unique_project_name(project_name)
key_path = self.SSH_PATH.format(connection_name, key_project_name)
@ -335,6 +337,7 @@ class ZooKeeperKeyStorage(ZooKeeperBase, KeyStorage):
data = json.dumps(keydata).encode("utf-8")
self.kazoo_client.create(key_path, value=data, makepath=True)
@cachetools.cached(cache={})
def getProjectSecretsKeys(self, connection_name, project_name):
key_project_name = strings.unique_project_name(project_name)
key_path = self.SECRETS_PATH.format(connection_name, key_project_name)

20
zuul/scheduler.py
View File

@ -213,6 +213,11 @@ class Scheduler(threading.Thread):
def start(self):
super(Scheduler, self).start()
self.keystore = ZooKeeperKeyStorage(
self.zk_client,
password=self._get_key_store_password(),
backup=FileKeyStorage(self._get_key_dir()))
self._command_running = True
self.log.debug("Starting command processor")
self.command_socket.start()
@ -665,12 +670,6 @@ class Scheduler(threading.Thread):
"current mode is %o" % (key_dir, mode))
return key_dir
def getKeyStorage(self):
file_key_store = FileKeyStorage(self._get_key_dir())
return ZooKeeperKeyStorage(self.zk_client,
password=self._get_key_store_password(),
backup=file_key_store)
def _checkTenantSourceConf(self, config):
tenant_config = None
script = False
@ -714,8 +713,7 @@ class Scheduler(threading.Thread):
connection.clearCache()
loader = configloader.ConfigLoader(
self.connections, self, self.merger,
self.getKeyStorage())
self.connections, self, self.merger, self.keystore)
tenant_config, script = self._checkTenantSourceConf(self.config)
self.unparsed_abide = loader.readConfig(
tenant_config, from_script=script)
@ -763,8 +761,7 @@ class Scheduler(threading.Thread):
default_version=default_ansible_version)
loader = configloader.ConfigLoader(
self.connections, self, self.merger,
self.getKeyStorage())
self.connections, self, self.merger, self.keystore)
tenant_config, script = self._checkTenantSourceConf(self.config)
old_unparsed_abide = self.unparsed_abide
self.unparsed_abide = loader.readConfig(
@ -820,8 +817,7 @@ class Scheduler(threading.Thread):
branch_name)
old_tenant = self.abide.tenants[event.tenant_name]
loader = configloader.ConfigLoader(
self.connections, self, self.merger,
self.getKeyStorage())
self.connections, self, self.merger, self.keystore)
abide = loader.reloadTenant(
self.abide, old_tenant, self.ansible_manager)
tenant = abide.tenants[event.tenant_name]