From f938029b36c60f0330b0677a3878584ddc31282d Mon Sep 17 00:00:00 2001 From: Lev Morgan Date: Wed, 27 Mar 2019 19:48:23 -0500 Subject: [PATCH] Revised exception for missing passphrase catalog The exception raised on attempting to generate passphrases without a passphrase catalog has been revised from a PassphraseSchemaNotFoundException to a PassphraseCatalogNotFoundException Change-Id: Ifbb2903638ffffe5008db52adb6f874bcfa25a99 --- doc/source/exceptions.rst | 5 ----- pegleg/engine/catalogs/passphrase_catalog.py | 6 +++--- pegleg/engine/exceptions.py | 5 ----- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/doc/source/exceptions.rst b/doc/source/exceptions.rst index 24ec61b2..13c1066a 100644 --- a/doc/source/exceptions.rst +++ b/doc/source/exceptions.rst @@ -84,11 +84,6 @@ Genesis Bundle Exceptions Passphrase Exceptions --------------------- -.. autoexception:: pegleg.engine.exceptions.PassphraseSchemaNotFoundException - :members: - :show-inheritance: - :undoc-members: - .. autoexception:: pegleg.engine.exceptions.PassphraseCatalogNotFoundException :members: :show-inheritance: diff --git a/pegleg/engine/catalogs/passphrase_catalog.py b/pegleg/engine/catalogs/passphrase_catalog.py index df6308aa..0e1e4725 100644 --- a/pegleg/engine/catalogs/passphrase_catalog.py +++ b/pegleg/engine/catalogs/passphrase_catalog.py @@ -15,7 +15,7 @@ import logging from pegleg.engine.catalogs.base_catalog import BaseCatalog -from pegleg.engine.exceptions import PassphraseSchemaNotFoundException +from pegleg.engine.exceptions import PassphraseCatalogNotFoundException LOG = logging.getLogger(__name__) KIND = 'PassphraseCatalog' @@ -45,12 +45,12 @@ class PassphraseCatalog(BaseCatalog): :param str sitename: Name of the environment :param list documents: Environment configuration documents - :raises PassphraseSchemaNotFoundException: If it cannot find a + :raises PassphraseCatalogNotFoundException: If it cannot find a ``pegleg/passphraseCatalog/v1`` document. """ super(PassphraseCatalog, self).__init__(KIND, sitename, documents) if not self._catalog_docs: - raise PassphraseSchemaNotFoundException() + raise PassphraseCatalogNotFoundException() @property def get_passphrase_names(self): diff --git a/pegleg/engine/exceptions.py b/pegleg/engine/exceptions.py index 8473f94a..888fd85d 100644 --- a/pegleg/engine/exceptions.py +++ b/pegleg/engine/exceptions.py @@ -77,11 +77,6 @@ class IncompletePKIPairError(PeglegBaseException): message = ("Incomplete keypair set %(kinds)s for name: %(name)s") -class PassphraseSchemaNotFoundException(PeglegBaseException): - """Failed to find schema for Passphrases rendering.""" - message = ('Could not find Passphrase schema for rendering Passphrases!') - - class PassphraseCatalogNotFoundException(PeglegBaseException): """Failed to find Catalog for Passphrases generation.""" message = ('Could not find the Passphrase Catalog to generate '