From 7347125b6ff04e4edf19ffdf72e40a3ad37bbfae Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 16 Jul 2026 12:39:22 -0400 Subject: [PATCH] Disable implicit tenant creation If we support more tenants, we will modify that branch. --- confluent_server/confluent/config/configmanager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index 420ff8e6..054a260d 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -1382,7 +1382,7 @@ class ConfigManager(object): return _cfgstore['main'] return _cfgstore['tenant'][self.tenant] - def __init__(self, tenant, decrypt=False, username=None): + def __init__(self, tenant, decrypt=False, username=None, create_tenant=False): self.clientfiles = {} global _cfgstore self.inrestore = False @@ -1404,12 +1404,14 @@ class ConfigManager(object): self._cfgstore['nodes'] = {} self._bg_sync_to_file() return - elif 'tenant' not in _cfgstore: + elif 'tenant' not in _cfgstore and create_tenant: _cfgstore['tenant'] = {tenant: {}} self._bg_sync_to_file() - elif tenant not in _cfgstore['tenant']: + elif tenant not in _cfgstore['tenant'] and create_tenant: _cfgstore['tenant'][tenant] = {} self._bg_sync_to_file() + elif tenant and tenant not in _cfgstore.get('tenant', {}): + raise ValueError("Tenant {0} does not exist".format(tenant)) self.tenant = tenant if 'nodegroups' not in self._cfgstore: self._cfgstore['nodegroups'] = {'everything': {}}