twingate-kubernetes-operator-96

/repo/app/api/client.py
/repo/app/api/client_connectors.py
/repo/app/api/client_remote_networks.py
/repo/app/api/client_resources.py
/repo/app/api/client_resources_access.py
/repo/app/api/tests/test_client.py
/repo/app/api/tests/test_client_remote_networks.py
/repo/app/api/tests/test_client_resources.py
/repo/app/api/tests/test_client_resource_access.py
/repo/app/handlers/base.py
/repo/app/handlers/handlers_connectors.py
/repo/app/handlers/handlers_resource.py

/repo/app/handlers/handlers_resource_access.py
/repo/app/handlers/tests/conftest.py
/repo/app/handlers/tests/test_handlers_connector.py
/repo/app/handlers/tests/test_handlers_resource.py
/repo/app/handlers/tests/test_handlers_resource_access.py
/repo/app/handlers/tests/__init__.py
/repo/app/handlers/__init__.py
---
CHANGELOG.md
DEVELOPER.md
Dockerfile
LICENSE
Makefile
README.md
app
conftest.py
deploy
examples
go.mod
go.sum
main.py
poetry.lock
pyproject.toml
scripts
tests_integration

from datetime import datetime
from typing import Any

from pydantic import BaseModel, ConfigDict, Field


class _HandlerResult(BaseModel):
    model_config = ConfigDict(frozen=True, populate_by_name=True, extra="allow")

    ts: datetime = Field(default_factory=datetime.now)
    success: bool

class _HandlerSuccess(_HandlerResult):
    def __init__(self, **data: Any) -> None:
        super().__init__(success=True, **data)


class _HandlerFailure(_HandlerResult):
    def __init__(self, **data: Any) -> None:
        super().__init__(success=False, **data)


def fail(**data: Any) -> dict:
    return _HandlerFailure(**data).model_dump(mode="json")


def success(**data: Any) -> dict:
    return _HandlerSuccess(**data).model_dump(mode="json")
import time

import kopf
import kubernetes.client
import pendulum

from app.crds import TwingateConnectorCRD
from app.handlers.base import success
fr
…[8628 chars omitted]…
tch_namespaced_custom_object(
            owner_group,
            owner_version,
            namespace,
            "twingateconnectors",
            owner["name"],
            {"metadata": {"labels": {"twingate.com/connector-pod-deleted": "true"}}},
        )
    except kubernetes.client.exceptions.ApiException:
        logger.exception("Failed to annotate connector %s", owner["name"])


# endregion

from datetime import timedelta

import kopf

from app.crds import ResourceSpec
from app.handlers.base import success


@kopf.on.create("twingateresource")
def twingate_resource_create(body, spec, memo, logger, patch, **kwargs):
    logger.info("Got a create request: %s", spec)
    resource = ResourceSpec(**spec)

    resource = memo.twingate_client.resource_create(resource)
    patch.spec["id"] = resource.id
    kopf.info(body, reason="Success", message=f"Created on Twingate as {resource.id}")
    return success(
        twingate_id=resource.id,
        created_at=resource.created_at.isoformat(),
        updated_at=resource.updated_at.isoformat(),
    )


@kopf.on.update("twingateresource")
def twingate_resource_update(old, new, diff, status, memo, logger, **kwargs):
    logger.info("Got an update request: %s. Diff: %s. Status: %s.", new, diff, status)
    crd = ResourceSpec(**new["spe
…[6898 chars omitted]…
po/app/handlers/handlers_resource_access.py:29:        memo.twingate_client.resource_access_add(
/repo/app/handlers/handlers_resource_access.py:66:            memo.twingate_client.resource_access_add(
/repo/app/handlers/handlers_resource_access.py:84:        memo.twingate_client.resource_access_remove(
/repo/app/handlers/handlers_resource_access.py:108:        memo.twingate_client.resource_access_add(

import logging
from typing import Any

import requests
from gql import Client
from gql.transport.exceptions import TransportAlreadyConnected
from gql.transport.requests import RequestsHTTPTransport
from graphql import DocumentNode
from requests.adapters import HTTPAdapter, Retry

from app.api.client_connectors import TwingateConnectorAPI
from app.api.client_remote_networks import TwingateRemoteNetworksAPIs

from app.api.client_resources import TwingateResourceAPIs
from app.api.client_resources_access import TwingateResourceAccessAPIs
from app.settings import TwingateOperatorSettings, get_version

log = logging.getLogger(__name__)


class TwingateRetry(Retry):
    """Custom retry object that retries on 429 errors."""

    # ruff: noqa: FBT002
    # (ignoring this here becuase this is not our function so
    # we can't change the signature)
    def is_retry(self, method, status_code, has
…[1441 chars omitted]…

        self.mutation_name = mutation_name
        self.error = error
        self.message = f"{mutation_name} mutation failed."
        super().__init__(self.message)


class TwingateAPIClient(
    TwingateResourceAPIs,
    TwingateResourceAccessAPIs,
    TwingateConnectorAPI,
    TwingateRemoteNetworksAPIs,
):
/repo/main.py:42:        memo.twingate_client = TwingateAPIClient(memo.twingate_settings)

):
    def __init__(
        self,
        settings: TwingateOperatorSettings,
        *,
        fetch_schema_from_transport: bool = False,
    ):
        self.settings = settings
        self.client = self._get_client(
            fetch_schema_from_transport=fetch_schema_from_transport
        )

    def _get_client(self, *, fetch_schema_from_transport: bool = False) -> Client:
        network = self.settings.network
        host = self.settings.host
        transport = TwingateRequestsHTTPTransport(
            self.settings.api_key, url=f"https://{network}.{host}/api/graphql/"
        )
        return Client(
            transport=transport, fetch_schema_from_transport=fetch_schema_from_transport
        )

    def execute_gql(
        self, document: DocumentNode, variable_values: dict[str, Any] | None = None
    ):
        logging.info("Calling %s with %s", document, variable_va
…[989 chars omitted]…
esult = collections.namedtuple(
    "HandlerRunnerResult",
    [
        "result",
        "memo_mock",
        "logger_mock",
        "patch_mock",
        "k8s_client_mock",
        "kopf_info_mock",
        "kopf_adopt_mock",
        "kopf_label_mock",
    ],
)


@pytest.fixture()
def kopf_handler_runner(
    k8s_client_mock: MagicMock,
    kopf_info_mock: MagicMock,
    kopf_adopt_mock: MagicMock,

kopf_adopt_mock: MagicMock,
    kopf_label_mock: MagicMock,
):
    def run(
        handler_f: Callable, crd: Any, memo_mock: MagicMock, namespace="default"
    ) -> HandlerRunnerResult:
        logger_mock = MagicMock()

        patch_mock = MagicMock()
        patch_mock.spec = {}
        patch_mock.meta = {}

        result = handler_f(
            body=crd.model_dump(by_alias=True),
            spec=crd.spec.model_dump(by_alias=True),
            meta=crd.metadata,
            status=crd.status,
            memo=memo_mock,
            logger=logger_mock,
            namespace=namespace,
            patch=patch_mock,
        )
        return HandlerRunnerResult(
            result,
            memo_mock,
            logger_mock,
            patch_mock,
            k8s_client_mock,
            kopf_info_mock,
            kopf_adopt_mock,
            kopf_label_mock,
        )

 
…[3988 chars omitted]…
lue = True
/repo/app/handlers/tests/test_handlers_resource_access.py:329:        memo_mock.twingate_client.resource_access_add.side_effect = (
/repo/app/handlers/tests/test_handlers_resource_access.py:364:        memo_mock.twingate_client.get_resource.return_value = None
/repo/app/handlers/tests/test_handlers_resource_access.py:396:        memo_mock.twingate_client.get_resource.return_value = resource

pod = get_connector_pod(crd, settings.full_url, image)
    secret = get_connector_secret(tokens.access_token, tokens.refresh_token)
    kopf.adopt([pod, secret], owner=body, strict=True, forced=True)
    kopf.label([pod, secret], {"twingate.com/connector": crd.metadata.name})

    kapi = kubernetes.client.CoreV1Api()
    kapi.create_namespaced_secret(namespace=namespace, body=secret)
    kapi.create_namespaced_pod(namespace=namespace, body=pod)

    image_policy = crd.spec.image_policy
    next_version_check = image_policy.get_next_date_iso8601() if image_policy else None
    patch.meta["annotations"] = {ANNOTATION_NEXT_VERSION_CHECK: next_version_check}

    return success(twingate_id=connector_id, image=image)


@kopf.on.resume("twingateconnector")
def twingate_connector_resume(body, patch, **_):
    crd = TwingateConnectorCRD(**body)
    image_policy = crd.spec.image_policy
   
…[506 chars omitted]…
_iso8601() if image_policy else None
    patch.meta["annotations"] = {ANNOTATION_NEXT_VERSION_CHECK: next_version_check}


@kopf.on.timer(
    "twingateconnector",
    interval=60.0,
    annotations={ANNOTATION_NEXT_VERSION_CHECK: kopf.PRESENT},
)
def timer_check_image_version(body, meta, namespace, memo, logger, patch, **_):
    settings = memo.twingate_settings
    crd = TwingateConnectorCRD(**body)

app/handlers/handlers_connectors.py:7:from app.api.client import TwingateAPIClient
app/handlers/handlers_connectors.py:83:    client = TwingateAPIClient(settings)
app/handlers/handlers_connectors.py:232:        client = TwingateAPIClient(memo.twingate_settings)
app/handlers/handlers_resource.py:5:from app.api.client import TwingateAPIClient
app/handlers/handlers_resource.py:14:    resource = TwingateAPIClient(memo.twingate_settings).resource_create(resource)
app/handlers/handlers_resource.py:30:        resource = TwingateAPIClient(memo.twingate_settings).resource_update(crd)
app/handlers/handlers_resource.py:47:        TwingateAPIClient(memo.twingate_settings).resource_delete(resource_id)
app/handlers/handlers_resource.py:58:        if resource := TwingateAPIClient(memo.twingate_settings).get_resource(resource_id):
app/handlers/handlers_resource.py:62:                TwingateAPIClient
…[354 chars omitted]…
Client(memo.twingate_settings).resource_access_add(
app/handlers/handlers_resource_access.py:66:            TwingateAPIClient(memo.twingate_settings).resource_access_add(

app/handlers/handlers_resource_access.py:84:        TwingateAPIClient(memo.twingate_settings).resource_access_remove(
app/handlers/handlers_resource_access.py:108:        TwingateAPIClient(memo.twingate_settings).resource_access_add(

from datetime import timedelta

import kopf

from app.api.client import TwingateAPIClient
from app.crds import ResourceSpec
from app.handlers.base import success


@kopf.on.create("twingateresource")
def twingate_resource_create(body, spec, memo, logger, patch, **kwargs):
    logger.info("Got a create request: %s", spec)

    resource = ResourceSpec(**spec)
    client = TwingateAPIClient(memo.twingate_settings)
    resource = client.resource_create(resource)
    patch.spec["id"] = resource.id
    kopf.info(body, reason="Success", message=f"Created on Twingate as {resource.id}")
    return success(
        twingate_id=resource.id,
        created_at=resource.created_at.isoformat(),
        updated_at=resource.updated_at.isoformat(),
    )


@kopf.on.update("twingateresource")
def twingate_resource_update(old, new, diff, status, memo, logger, **kwargs):
    logger.info("Got an update req
…[2245 chars omitted]…
dd(
63:    # in this case we just need to call api_client.resource_access_add with the new value
66:        client = TwingateAPIClient(memo.twingate_settings)
68:            client.resource_access_add(
86:        client = TwingateAPIClient(memo.twingate_settings)
87:        client.resource_access_remove(
110:    client = TwingateAPIClient(memo.twingate_settings)
112:        client.resource_access_add(

Traceback (most recent call last):
  File "/tmp/repro.py", line 2, in <module>
    from app.crds import ResourceSpec, ResourceAccessSpec, TwingateConnectorCRD
ModuleNotFoundError: No module named 'app'

Traceback (most recent call last):
  File "/tmp/repro.py", line 15, in <module>
    res = hr.twingate_resource_create(body=crd.model_dump(by_alias=True), spec=crd.spec.model_dump(by_alias=True), memo=memo, logger=MagicMock(), patch=MagicMock())
                                                                               ^^^^^^^^
  File "/usr/local/lib/python3.12/site-packages/pydantic/main.py", line 1042, in __getattr__
    raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}')
AttributeError: 'Resource' object has no attribute 'spec'

from unittest.mock import ANY, MagicMock

from app.crds import ResourceSpec
from app.handlers.handlers_resource import (
    twingate_resource_create,
    twingate_resource_delete,
    twingate_resource_sync,
    twingate_resource_update,
)


class TestResourceCreateHandler:

    def test_create(self, resource_factory, kopf_info_mock):
        resource = resource_factory()
        resource_spec = resource.to_spec(id=None)

        spec = resource_spec.model_dump(by_alias=True)

        logger_mock = MagicMock()
        memo_mock = MagicMock()
        memo_mock.twingate_client.resource_create.return_value = resource
        patch_mock = MagicMock()
        patch_mock.spec = {}

        result = twingate_resource_create(
            body="", spec=spec, memo=memo_mock, logger=logger_mock, patch=patch_mock
        )
        assert result == {
            "success": True,
            "twing
…[2512 chars omitted]…
= {"success": True, "ts": ANY}

        kopf_info_mock.assert_called_once_with("", reason="Success", message=ANY)
        assert patch_mock.metadata["ownerReferences"] == [
            {
                "apiVersion": "twingate.com/v1",
                "kind": "TwingateResource",
                "name": "foo",
                "uid": "uid",
            }
        ]

    def test_create_invalid_ref(self):

import datetime
from base64 import b64encode

import factory

from app.api.client_connectors import Connector
from app.api.client_resources import (
    Resource,
    ResourceAddress,
    ResourceRemoteNetwork,
    ResourceSecurityPolicy,
)

# encode string to base64
def to_global_id(type_: str, id_: str) -> str:
    value = f"{type_}:{id_}"
    return b64encode(value.encode()).decode()


class ResourceAddressFactory(factory.Factory):
    class Meta:
        model = ResourceAddress

    class Params:
        hostname = factory.Faker("slug")

    type = "DNS"
    value = factory.LazyAttribute(lambda o: o.hostname + ".default.cluster.local")


class ResourceRemoteNetworkFactory(factory.Factory):
    class Meta:
        model = ResourceRemoteNetwork

    id = factory.Sequence(lambda n: to_global_id("RemoteNetwork", str(n)))


class ResourceSecurityPolicyFactory(factory.Factory):
    cla
…[832 chars omitted]…
s ResourceRemoteNetworkFactory(factory.Factory):
app/api/tests/factories.py:39:class ResourceSecurityPolicyFactory(factory.Factory):
app/api/tests/factories.py:46:class ResourceFactory(factory.Factory):
app/crds.py:82:class ResourceProtocol(BaseModel):
app/crds.py:101:class ResourceProtocols(BaseModel):
app/crds.py:111:class ResourceSpec(BaseModel):
app/crds.py:157:class ResourceAccessSpec(BaseModel):

)
        spec = connector_spec.model_dump(by_alias=True)
        crd = TwingateConnectorCRD(
            api_version="twingate.com/v1beta",
            kind="TwingateConnector",
            metadata=dict(
                uid="123",
                name=connector_spec.name,
                namespace="default",
                annotations=annotations,
            ),
            spec=spec,

            status=status,
        )
        return connector, crd

    return get


def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner):
    connector, crd = get_connector_and_crd()

    memo_mock = MagicMock()
    memo_mock.twingate_client.connector_create.return_value = connector
    memo_mock.twingate_client.connector_generate_tokens.return_value = ConnectorTokens(
        access_token="at", refresh_token="rt"  # nosec
    )
    run = kopf_handler_runner(twingate
…[4295 chars omitted]…
andler_runner
):
    connector, crd = get_connector_and_crd()
    run = kopf_handler_runner(twingate_connector_delete, crd, MagicMock())
    run.memo_mock.twingate_client.connector_delete.assert_not_called()


def test_twingate_connector_pod_deleted_tags_owner(get_connector_and_crd):
    connector, crd = get_connector_and_crd()
    pod = get_connector_pod(crd, "http://test.twingate.com", "twingate/1")

done app/handlers/tests/test_handlers_resource.py
done app/handlers/tests/test_handlers_resource_access.py
done app/handlers/tests/test_handlers_connector.py
1:from unittest.mock import ANY, MagicMock
3:from app.crds import ResourceSpec
4:from app.handlers.handlers_resource import (
14:    with patch("app.handlers.handlers_resource.TwingateAPIClient") as mock:
28:        patch_mock = MagicMock()
29:        patch_mock.spec = {}
32:            body="", spec=spec, memo=memo_mock, logger=logger_mock, patch=patch_mock
47:        assert patch_mock.spec == {"id": resource.id}
80:        patch_mock = MagicMock()

81:        patch_mock.spec = {}

['from unittest.mock import ANY, MagicMock, patch', '', 'import kubernetes', 'import orjson as json', 'import pendulum', 'import pytest', '', 'from app.api.client_connectors import ConnectorTokens', 'from app.crds import ConnectorImagePolicy, ConnectorSpec, TwingateConnectorCRD', 'from app.handlers.handlers_connectors import (', '    ANNOTATION_LAST_VERSION_CHECK,', '    ANNOTATION_NEXT_VERSION_CHECK,', '    get_connector_pod,', '    timer_check_image_version,', '    twingate_connector_create,']
from unittest.mock import ANY, MagicMock, patch

import kubernetes
import orjson as json
import pendulum
import pytest

from app.api.client_connectors import ConnectorTokens
from app.crds import ConnectorImagePolicy, ConnectorSpec, TwingateConnectorCRD
from app.handlers.handlers_connectors import (
    ANNOTATION_LAST_VERSION_CHECK,

    ANNOTATION_NEXT_VERSION_CHECK,
    get_connector_pod,
    timer_check_image_version,
    twingate_connector_create,
    twingate_connector_delete,
    twingate_connector_pod_deleted,
    twingate_connector_recreate_pod,
    twingate_connector_resume,
    twingate_connector_version_policy_update,

==================================== ERRORS ====================================
________ ERROR collecting app/handlers/tests/test_handlers_resource.py _________
app/handlers/tests/test_handlers_resource.py:12: in <module>
    @pytest.fixture()
     ^^^^^^
E   NameError: name 'pytest' is not defined
=========================== short test summary info ============================
ERROR app/handlers/tests/test_handlers_resource.py - NameError: name 'pytest'...
!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!
1 error in 0.33s

E           gql.transport.exceptions.TransportConnectionFailed: Failed to parse: Host "<MagicMock name='mock.twingate_settings.network' id='126106338629760'>.<MagicMock name='mock.twingate_settings.host' id='126106338635040'>" contains invalid character ' '

/usr/local/lib/python3.12/site-packages/gql/transport/requests.py:294: TransportConnectionFailed
=============================== warnings summary ===============================
app/handlers/tests/test_handlers_connector.py::test_twingate_connector_pod_deleted_does_nothing_if_owner_not_found
app/handlers/tests/test_handlers_connector.py::test_twingate_connector_pod_deleted_catches_k8s_api_exceptions
app/handlers/tests/test_handlers_connector.py::test_twingate_connector_resume_without_image_policy_doesnt_annotates
app/handlers/tests/test_handlers_connector.py::test_twingate_connector_pod_deleted_tags_owner
app/handlers/tests/test_h
…[1686 chars omitted]…
_check_not_due
ERROR app/handlers/tests/test_handlers_connector.py::test_twingate_connector_recreate_pod

ERROR app/handlers/tests/test_handlers_connector.py::test_twingate_connector_create_with_imagepolicy_sets_check_annotation
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
1 failed, 28 passed, 7 warnings, 7 errors in 0.75s

E                                                                        [100%]
==================================== ERRORS ====================================
_______________ ERROR at setup of test_twingate_connector_create _______________
file /repo/app/handlers/tests/test_handlers_connector.py, line 59
  def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner, client_mock):
E       fixture 'client_mock' not found
>       available fixtures: _mock_settings, _session_faker, _syrupy_apply_ide_patches, anyio_backend, anyio_backend_name, anyio_backend_options, cache, capfd, capfdbinary, caplog, capsys, capsysbinary, capteesys, ci_run_id, ci_run_number, connector, connector__id, connector__name, connector_factory, datadir, doctest_namespace, factoryboy_request, faker, faker_seed, free_tcp_port, free_tcp_port_factory, free_udp_port, free_udp_port_factory, get_connec
…[564 chars omitted]…
sequential_number, shared_datadir, snapshot, subtests, tmp_path, tmp_path_factory, tmpdir, tmpdir_factory
>       use 'pytest --fixtures [testpath]' for help on them.

/repo/app/handlers/tests/test_handlers_connector.py:59

=========================== short test summary info ============================
ERROR app/handlers/tests/test_handlers_connector.py::test_twingate_connector_create
1 error in 0.26s

24:@pytest.fixture(autouse=True)
31:@pytest.fixture()
59:def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner, client_mock):
63:    client_mock.connector_create.return_value = connector
64:    client_mock.connector_generate_tokens.return_value = ConnectorTokens(
86:    run.k8s_client_mock.create_namespaced_secret.assert_called_once()
87:    call_kw = run.k8s_client_mock.create_namespaced_secret.call_args.kwargs
94:    run.k8s_client_mock.create_namespaced_pod.assert_called_once()
95:    call_kw = run.k8s_client_mock.create_namespaced_pod.call_args.kwargs
109:, client_mock):

twingate_connector_version_policy_update,
)


@pytest.fixture(autouse=True)
def mock_connector_spec_get_image():
    with patch("app.crds.ConnectorSpec.get_image") as mock_get_image:
        mock_get_image.return_value = "twingate/connector:test"
        yield mock_get_image


@pytest.fixture()

def get_connector_and_crd(connector_factory):
    def get(*, spec_overrides=None, status=None, with_id=False, annotations=None):
        annotations = annotations or {}
        spec_overrides = spec_overrides or {}

        connector = connector_factory()
        connector_spec = ConnectorSpec(
            **spec_overrides, **connector.model_dump(exclude=[] if with_id else ["id"])
        )
        spec = connector_spec.model_dump(by_alias=True)
        crd = TwingateConnectorCRD(
            api_version="twingate.com/v1beta",
            kind="TwingateConnector",
            metadata=dict(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=========================== short test summary info ============================
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_deletes_connector
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_ignores_k8s_api_errors
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_without_status_does_nothing
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_do_nothing_if_check_not_due
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
3 failed, 31 passed, 11 warnings, 2 errors in 0.75s

....E..FFE....F                                                          [100%]
==================================== ERRORS ====================================
_ ERROR at setup of test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due _
file /repo/app/handlers/tests/test_handlers_connector.py, line 198
  def test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due(
E       fixture 'freezer' not found
>       available fixtures: _mock_settings, _session_faker, _syrupy_apply_ide_patches, anyio_backend, anyio_backend_name, anyio_backend_options, cache, capfd, capfdbinary, caplog, capsys, capsysbinary, capteesys, ci_run_id, ci_run_number, client_mock, connector, connector__id, connector__name, connector_factory, datadir, doctest_namespace, factoryboy_request, faker, faker_seed, free_tcp_port, free_tcp_port_factory, free_udp_port, free_udp_port_factory, g
…[2016 chars omitted]…
=========================== short test summary info ============================
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_deletes_connector
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_ignores_k8s_api_errors
FAILED app/handlers/tests/test_handlers_connector.py::test_twingate_connector_delete_without_status_does_nothing

diff --git a/app/handlers/tests/test_handlers_connector.py b/app/handlers/tests/test_handlers_connector.py
index 393b683..73a7bdd 100644
--- a/app/handlers/tests/test_handlers_connector.py
+++ b/app/handlers/tests/test_handlers_connector.py
@@ -28,6 +28,12 @@ def mock_connector_spec_get_image():
         yield mock_get_image
 
 
+@pytest.fixture()
+def client_mock():
+    with patch("app.handlers.handlers_connectors.TwingateAPIClient") as mock:
+        yield mock.return_value

+
+
 @pytest.fixture()
 def get_connector_and_crd(connector_factory):
     def get(*, spec_overrides=None, status=None, with_id=False, annotations=None):
@@ -56,12 +62,12 @@ def get_connector_and_crd(connector_factory):
     return get
 
 
-def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner):
+def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner, client_mock):

…[3826 chars omitted]…
ng(
     get_connector_and_crd, kopf_handler_runner
-):
+, client_mock):
     connector, crd = get_connector_and_crd()
     run = kopf_handler_runner(twingate_connector_delete, crd, MagicMock())
-    run.memo_mock.twingate_client.connector_delete.assert_not_called()
+    run.client_mock.connector_delete.assert_not_called()
 
 
 def test_twingate_connector_pod_deleted_tags_owner(get_connector_and_crd):

Updated 1 path from the index
32:def client_mock():
69:    client_mock.connector_create.return_value = connector
70:    client_mock.connector_generate_tokens.return_value = ConnectorTokens(
92:    run.k8s_client_mock.create_namespaced_secret.assert_called_once()
93:    call_kw = run.k8s_client_mock.create_namespaced_secret.call_args.kwargs
100:    run.k8s_client_mock.create_namespaced_pod.assert_called_once()
101:    call_kw = run.k8s_client_mock.create_namespaced_pod.call_args.kwargs
121:    client_mock.connector_create.return_value = connector
122:    client_mock.connector_generate_tokens.return_value = ConnectorTokens(
137:    run.k8s_client_mock.create_namespaced_secret.assert_called_once()
138:    call_kw = run.k8s_client_mock.create_namespaced_secret.call_args.kwargs

145:    run.k8s_client_mock.create_namespaced_pod.assert_called_once()
146:    call_kw = run.k8s_client_mock.crea
…[294 chars omitted]…
alled_once()
272:    run.k8s_client_mock.patch_namespaced_pod.assert_called_once_with(
280:    get_connector_and_crd, kopf_handler_runner, k8s_client_mock
286:    k8s_client_mock.patch_namespaced_pod.side_effect = (
293:    client_mock.connector_delete.assert_called_once()
294:    run.k8s_client_mock.patch_namespaced_pod.assert_called_once_with(
306:    client_mock.connector_delete.assert_not_called()

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
=========================== short test summary info ============================
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_do_nothing_if_check_not_due
34 passed, 10 warnings, 2 errors in 0.38s

23:+def test_twingate_connector_create(get_connector_and_crd, kopf_handler_runner, client_mock):

_ ERROR at setup of test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due _
file /repo/app/handlers/tests/test_handlers_connector.py, line 198
  def test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due(
E       fixture 'freezer' not found
>       available fixtures: _mock_settings, _session_faker, _syrupy_apply_ide_patches, anyio_backend, anyio_backend_name, anyio_backend_options, cache, capfd, capfdbinary, caplog, capsys, capsysbinary, capteesys, ci_run_id, ci_run_number, client_mock, connector, connector__id, connector__name, connector_factory, datadir, doctest_namespace, factoryboy_request, faker, faker_seed, free_tcp_port, free_tcp_port_factory, free_udp_port, free_udp_port_factory, get_connector_and_crd, is_ci, k8s_client_mock, kopf_adopt_mock, kopf_handler_runner, kopf_info_mock, kopf_label_mock, lazy_datadir, lazy_shared_datadir, mock_conn
…[312 chars omitted]…
_name, resource__remote_network, resource__security_policy, resource__updated_at, resource_factory, sequential_number, shared_datadir, snapshot, subtests, tmp_path, tmp_path_factory, tmpdir, tmpdir_factory
>       use 'pytest --fixtures [testpath]' for help on them.

/repo/app/handlers/tests/test_handlers_connector.py:198
=========================== short test summary info ============================

Saved working directory and index state WIP on master: 79704d2 base
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_do_nothing_if_check_not_due
13 passed, 10 warnings, 2 errors in 0.26s
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   app/handlers/handlers_connectors.py
	modified:   app/handlers/handlers_resource.py
	modified:   app/handlers/handlers_resource_access.py
	modified:   app/handlers/tests/test_handlers_connector.py

	modified:   app/handlers/tests/test_handlers_resource.py
	modified:   app/handlers/tests/test_handlers_resource_access.py

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (12bc2506eeb61200eab1fd1d4e9413d29117c5f3)

-from unittest.mock import ANY, MagicMock
+from unittest.mock import ANY, MagicMock, patch
+
+import pytest
+@pytest.fixture()
+def client_mock():
+    with patch("app.handlers.handlers_resource.TwingateAPIClient") as mock:
+        yield mock.return_value
+
+
-    def test_create(self, resource_factory, kopf_info_mock):
+    def test_create(self, resource_factory, kopf_info_mock, client_mock):

-        memo_mock.twingate_client.resource_create.return_value = resource
+        client_mock.resource_create.return_value = resource
-        memo_mock.twingate_client.resource_create.assert_called_once_with(resource_spec)
+        client_mock.resource_create.assert_called_once_with(resource_spec)
-    def test_update(self):
+    def test_update(self, client_mock):
-        memo_mock.twingate_client.resource_update.return_value = MagicMock(id=rid)
+        client_mock.resource_update.return_
…[3508 chars omitted]…
tory, client_mock):
-        memo_mock.twingate_client.resource_access_add.side_effect = (
+        client_mock.resource_access_add.side_effect = (
-    def test_update_success(self, resource_factory):
+    def test_update_success(self, resource_factory, client_mock):
-        memo_mock.twingate_client.resource_access_add.return_value = True
+        client_mock.resource_access_add.return_value = True

from unittest.mock import ANY, MagicMock, patch

import pytest

from app.crds import ResourceSpec
from app.handlers.handlers_resource import (
    twingate_resource_create,
    twingate_resource_delete,
    twingate_resource_sync,
    twingate_resource_update,
)

@pytest.fixture()
def client_mock():
    with patch("app.handlers.handlers_resource.TwingateAPIClient") as mock:
        yield mock.return_value


class TestResourceCreateHandler:
from unittest.mock import ANY, MagicMock, patch

import kopf
import pytest

from app.api.client import GraphQLMutationError
from app.crds import K8sMetadata
from app.handlers.handlers_resource_access import (
    twingate_resource_access_create,
    twingate_resource_access_delete,
    twingate_resource_access_sync,
    twingate_resource_access_update,
)


@pytest.fixture()
def client_mock():
    with patch("app.handlers.handlers_resource_access.TwingateAPIClient") as mock:
        yield mock.return_value


class TestResourceAccessCreateHandler:
    def test_create_success(self, resource_factory, kopf_info_mock, client_mock):
        resource = resource_factory()
        resource_spec = resource.to_spec()

=========================== short test summary info ============================
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_do_nothing_if_check_not_due
ERROR app/tests/test_crds_connector.py::test_version_policy_get_next_date_iso8601_returns_right_date
99 passed, 34 warnings, 3 errors in 2.17s
Traceback (most recent call last):
  File "/tmp/repro.py", line 2, in <module>
    from app.crds import ResourceSpec, ResourceAccessSpec, TwingateConnectorCRD
ModuleNotFoundError: No module named 'app'

bash: line 354: ruff: command not found
bash: line 354: ruff: command not found

44:ruff = "^0.1.13"
118:[tool.ruff]
148:[tool.ruff.per-file-ignores]
158:[tool.ruff.lint.pydocstyle]
app/handlers/handlers_connectors.py: 162
app/handlers/handlers_resource_access.py: 62
app/handlers/handlers_resource_access.py: 63

[tool.ruff]
select = [
    "D",
    "F", # Pyflakes
    "E", "W", # pycodestyle
    "S", # flake8-bandit
    "Q", # flake8-quotes
    "G", # flake8-logging-format
    "B", # flake8-bugbear
    "SIM", # flake8-simplify
    "FBT", # flake8-boolean-trap
    "PERF", # Perflint

    "PT", # flake8-pytest-style
        patch.meta["annotations"] = {
            ANNOTATION_LAST_VERSION_CHECK: now.to_iso8601_string(),
            ANNOTATION_NEXT_VERSION_CHECK: crd.spec.image_policy.get_next_date_iso8601(),
        }
    except kubernetes.client.exceptions.ApiException:
        raise kopf.TemporaryError("Resource not yet created, retrying...", delay=15)

    # Note that both principalId and resourceRef are immutable so only securityPolicyId could change
    # in this case we just need to call api_client.resource_access_add with the new value
    access_crd = ResourceAccessSpec(**new["spec"])

err = f"Resource {access_crd.resource_ref_fullname} not found"
        kopf.warn(body, reason="ResourceNotFound", message=err)
        return {"success": False, "error": err}

    spec = resource_crd.spec
    if not spec.id:
        raise kopf.TemporaryError("Resource not yet created, retrying...", delay=15)

    client = TwingateAPIClient(memo.twingate_settings)
    try:
        client.resource_access_add(
            spec.id, access_crd.principal_id, access_crd.security_policy_id

        )
        kopf.info(
            body,
            reason="Success",
            message=f"Added access to {spec.id}<>{access_crd.principal_id}",
        )
        patch.metadata["ownerReferences"] = [
            resource_crd.metadata.owner_reference_object
        ]
        return success()
    except GraphQLMutationError as mex:
        kopf.exception(
            body, reason="Failure", 
…[425 chars omitted]…
crd = ResourceAccessSpec(**spec)
    resource_crd = access_crd.get_resource()
    if resource_id := resource_crd and resource_crd.spec.id:
        client = TwingateAPIClient(memo.twingate_settings)
        client.resource_access_remove(
            resource_id, access_crd.principal_id
        )


@kopf.timer(
    "twingateresourceaccess",
    interval=timedelta(hours=10).seconds,
    initial_delay=60,

ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_do_nothing_if_check_not_due
ERROR app/handlers/tests/test_handlers_connector.py::test_timer_check_image_version_with_imagepolicy_updates_pod_if_check_due
99 passed, 34 warnings, 3 errors in 2.14s
 app/handlers/handlers_connectors.py                |  6 ++-
 app/handlers/handlers_resource.py                  | 17 ++++---
 app/handlers/handlers_resource_access.py           | 14 ++++--
 app/handlers/tests/test_handlers_connector.py      | 30 +++++++-----
 app/handlers/tests/test_handlers_resource.py       | 54 +++++++++++++---------
 .../tests/test_handlers_resource_access.py         | 54 ++++++++++++----------
 6 files changed, 103 insertions(+), 72 deletions(-)

submitted.