Skip to content

Commit 8f5e4a7

Browse files
committed
Remove CodeNotary related exceptions and handling
Remove CodeNotary related exceptions and handling from the Docker interface.
1 parent 2545d6b commit 8f5e4a7

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

supervisor/docker/interface.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@
3131
)
3232
from ..coresys import CoreSys
3333
from ..exceptions import (
34-
CodeNotaryError,
35-
CodeNotaryUntrusted,
3634
DockerAPIError,
3735
DockerError,
3836
DockerJobError,
3937
DockerLogOutOfOrder,
4038
DockerNotFound,
4139
DockerRequestError,
42-
DockerTrustError,
4340
)
4441
from ..jobs import SupervisorJob
4542
from ..jobs.const import JOB_GROUP_DOCKER_INTERFACE, JobConcurrency
@@ -401,16 +398,6 @@ async def process_pull_image_log(reference: PullLogEntry) -> None:
401398
raise DockerError(
402399
f"Unknown error with {image}:{version!s} -> {err!s}", _LOGGER.error
403400
) from err
404-
except CodeNotaryUntrusted as err:
405-
raise DockerTrustError(
406-
f"Pulled image {image}:{version!s} failed on content-trust verification!",
407-
_LOGGER.critical,
408-
) from err
409-
except CodeNotaryError as err:
410-
raise DockerTrustError(
411-
f"Error happened on Content-Trust check for {image}:{version!s}: {err!s}",
412-
_LOGGER.error,
413-
) from err
414401
finally:
415402
if listener:
416403
self.sys_bus.remove_listener(listener)

supervisor/exceptions.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -577,21 +577,6 @@ class PwnedConnectivityError(PwnedError):
577577
"""Connectivity errors while checking pwned passwords."""
578578

579579

580-
# util/codenotary
581-
582-
583-
class CodeNotaryError(HassioError):
584-
"""Error general with CodeNotary."""
585-
586-
587-
class CodeNotaryUntrusted(CodeNotaryError):
588-
"""Error on untrusted content."""
589-
590-
591-
class CodeNotaryBackendError(CodeNotaryError):
592-
"""CodeNotary backend error happening."""
593-
594-
595580
# util/whoami
596581

597582

0 commit comments

Comments
 (0)