From 751615b1a4dfcdc5e2a5e593dfe7e63419bf93cb Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 3 Sep 2025 17:40:59 +0200 Subject: [PATCH] Changed 09_ports.yml to 10_ports.yml --- cli/create/role.py | 2 +- group_vars/all/{09_ports.yml => 10_ports.yml} | 0 tests/integration/test_all_ports_application_ids_are_valid.py | 2 +- tests/integration/test_oauth2_proxy_ports.py | 4 ++-- tests/integration/test_ports_references_validity.py | 4 ++-- tests/integration/test_ports_uniqueness.py | 2 +- tests/unit/cli/create/test_role.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename group_vars/all/{09_ports.yml => 10_ports.yml} (100%) diff --git a/cli/create/role.py b/cli/create/role.py index 73767e20..75c2e4ce 100644 --- a/cli/create/role.py +++ b/cli/create/role.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..') from module_utils.entity_name_utils import get_entity_name # Paths to the group-vars files -PORTS_FILE = './group_vars/all/09_ports.yml' +PORTS_FILE = './group_vars/all/10_ports.yml' NETWORKS_FILE = './group_vars/all/09_networks.yml' ROLE_TEMPLATE_DIR = './templates/roles/web-app' ROLES_DIR = './roles' diff --git a/group_vars/all/09_ports.yml b/group_vars/all/10_ports.yml similarity index 100% rename from group_vars/all/09_ports.yml rename to group_vars/all/10_ports.yml diff --git a/tests/integration/test_all_ports_application_ids_are_valid.py b/tests/integration/test_all_ports_application_ids_are_valid.py index daa9aa9a..2d6e5d13 100644 --- a/tests/integration/test_all_ports_application_ids_are_valid.py +++ b/tests/integration/test_all_ports_application_ids_are_valid.py @@ -11,7 +11,7 @@ class TestApplicationIDsInPorts(unittest.TestCase): # Path to the ports definition file ports_file = os.path.abspath( os.path.join( - os.path.dirname(__file__), '..', '..', 'group_vars', 'all', '09_ports.yml' + os.path.dirname(__file__), '..', '..', 'group_vars', 'all', '10_ports.yml' ) ) with open(ports_file, 'r', encoding='utf-8') as f: diff --git a/tests/integration/test_oauth2_proxy_ports.py b/tests/integration/test_oauth2_proxy_ports.py index dfefb0ac..c6056ba5 100644 --- a/tests/integration/test_oauth2_proxy_ports.py +++ b/tests/integration/test_oauth2_proxy_ports.py @@ -8,7 +8,7 @@ class TestOAuth2ProxyPorts(unittest.TestCase): def setUpClass(cls): # Set up root paths and load oauth2_proxy ports mapping cls.ROOT = Path(__file__).parent.parent.parent.resolve() - cls.PORTS_FILE = cls.ROOT / 'group_vars' / 'all' / '09_ports.yml' + cls.PORTS_FILE = cls.ROOT / 'group_vars' / 'all' / '10_ports.yml' with cls.PORTS_FILE.open() as f: data = yaml.safe_load(f) cls.oauth2_ports = ( @@ -50,7 +50,7 @@ class TestOAuth2ProxyPorts(unittest.TestCase): if app_id not in self.oauth2_ports: self.fail( f"Missing oauth2_proxy port mapping for application '{app_id}' " - f"in group_vars/all/09_ports.yml" + f"in group_vars/all/10_ports.yml" ) diff --git a/tests/integration/test_ports_references_validity.py b/tests/integration/test_ports_references_validity.py index f184f826..688f4589 100644 --- a/tests/integration/test_ports_references_validity.py +++ b/tests/integration/test_ports_references_validity.py @@ -9,7 +9,7 @@ class TestPortReferencesValidity(unittest.TestCase): # locate and load the ports definition base = os.path.dirname(__file__) cls.ports_file = os.path.abspath( - os.path.join(base, '..', '..', 'group_vars', 'all', '09_ports.yml') + os.path.join(base, '..', '..', 'group_vars', 'all', '10_ports.yml') ) if not os.path.isfile(cls.ports_file): raise FileNotFoundError(f"{cls.ports_file} does not exist.") @@ -42,7 +42,7 @@ class TestPortReferencesValidity(unittest.TestCase): """ Scan all .j2, .yml, .yaml files under roles/, group_vars/, host_vars/, tasks/, templates/, and playbooks/ for any ports... references - (dot, [''], or .get('')) and verify each triple is defined in 09_ports.yml. + (dot, [''], or .get('')) and verify each triple is defined in 10_ports.yml. """ project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) dirs_to_scan = ['roles', 'group_vars', 'host_vars', 'tasks', 'templates', 'playbooks'] diff --git a/tests/integration/test_ports_uniqueness.py b/tests/integration/test_ports_uniqueness.py index c4ccd622..889df301 100644 --- a/tests/integration/test_ports_uniqueness.py +++ b/tests/integration/test_ports_uniqueness.py @@ -8,7 +8,7 @@ class TestPortsUniqueness(unittest.TestCase): def setUpClass(cls): base_dir = os.path.dirname(__file__) cls.ports_file = os.path.abspath( - os.path.join(base_dir, '..', '..', 'group_vars', 'all', '09_ports.yml') + os.path.join(base_dir, '..', '..', 'group_vars', 'all', '10_ports.yml') ) # Try to load data; leave it as None if missing or invalid YAML try: diff --git a/tests/unit/cli/create/test_role.py b/tests/unit/cli/create/test_role.py index 147d3c0e..35278b05 100644 --- a/tests/unit/cli/create/test_role.py +++ b/tests/unit/cli/create/test_role.py @@ -18,7 +18,7 @@ class TestCreateDockerRoleCLI(unittest.TestCase): def setUp(self): # Temporary directory for YAML files and templates self.tmpdir = tempfile.mkdtemp() - self.ports_file = os.path.join(self.tmpdir, '09_ports.yml') + self.ports_file = os.path.join(self.tmpdir, '10_ports.yml') self.networks_file = os.path.join(self.tmpdir, '09_networks.yml') def tearDown(self):