qontract-reconcile 0.10.1rc505__py3-none-any.whl → 0.10.1rc507__py3-none-any.whl

reconcile/test/test_acs_rbac.py

@@ -19,7 +19,7 @@ from reconcile.gql_definitions.acs.acs_rbac import (
     RoleV1,
     UserV1,
 )
-from reconcile.utils import acs_api
+from reconcile.utils.acs import rbac
 
 AUTH_PROVIDER_ID = "6a41743c-792b-11ee-b962-0242ac120002"
 
@@ -196,9 +196,9 @@ def modeled_acs_roles() -> list[AcsRole]:
 
 
 @pytest.fixture
-def api_response_roles() -> list[acs_api.Role]:
+def api_response_roles() -> list[rbac.Role]:
     return [
-        acs_api.Role(
+        rbac.Role(
             api_data={
                 "name": "app-sre-acs-admin",
                 "permissionSetId": "1",
@@ -207,7 +207,7 @@ def api_response_roles() -> list[acs_api.Role]:
                 "system_default": False,
             }
         ),
-        acs_api.Role(
+        rbac.Role(
             api_data={
                 "name": "cluster-analyst",
                 "permissionSetId": "2",
@@ -216,7 +216,7 @@ def api_response_roles() -> list[acs_api.Role]:
                 "system_default": False,
             }
         ),
-        acs_api.Role(
+        rbac.Role(
             api_data={
                 "name": "service-vuln-admin",
                 "permissionSetId": "3",
@@ -229,9 +229,9 @@ def api_response_roles() -> list[acs_api.Role]:
 
 
 @pytest.fixture
-def api_response_groups() -> list[acs_api.Group]:
+def api_response_groups() -> list[rbac.Group]:
     return [
-        acs_api.Group(
+        rbac.Group(
             api_data={
                 "roleName": "app-sre-acs-admin",
                 "props": {
@@ -242,7 +242,7 @@ def api_response_groups() -> list[acs_api.Group]:
                 },
             }
         ),
-        acs_api.Group(
+        rbac.Group(
             api_data={
                 "roleName": "app-sre-acs-admin",
                 "props": {
@@ -253,7 +253,7 @@ def api_response_groups() -> list[acs_api.Group]:
                 },
             }
         ),
-        acs_api.Group(
+        rbac.Group(
             api_data={
                 "roleName": "cluster-analyst",
                 "props": {
@@ -264,7 +264,7 @@ def api_response_groups() -> list[acs_api.Group]:
                 },
             }
         ),
-        acs_api.Group(
+        rbac.Group(
             api_data={
                 "roleName": "cluster-analyst",
                 "props": {
@@ -275,7 +275,7 @@ def api_response_groups() -> list[acs_api.Group]:
                 },
             }
         ),
-        acs_api.Group(
+        rbac.Group(
             api_data={
                 "roleName": "service-vuln-admin",
                 "props": {
@@ -290,9 +290,9 @@ def api_response_groups() -> list[acs_api.Group]:
 
 
 @pytest.fixture
-def api_response_access_scopes() -> list[acs_api.AccessScope]:
+def api_response_access_scopes() -> list[rbac.AccessScope]:
     return [
-        acs_api.AccessScope(
+        rbac.AccessScope(
             api_data={
                 "id": "1",
                 "name": "Unrestricted",
@@ -300,7 +300,7 @@ def api_response_access_scopes() -> list[acs_api.AccessScope]:
                 "rules": None,
             }
         ),
-        acs_api.AccessScope(
+        rbac.AccessScope(
             api_data={
                 "id": "2",
                 "name": "cluster-analyst",
@@ -311,7 +311,7 @@ def api_response_access_scopes() -> list[acs_api.AccessScope]:
                 },
             }
         ),
-        acs_api.AccessScope(
+        rbac.AccessScope(
             api_data={
                 "id": "3",
                 "name": "service-vuln-admin",
@@ -335,21 +335,21 @@ def api_response_access_scopes() -> list[acs_api.AccessScope]:
 
 
 @pytest.fixture
-def api_response_permission_sets() -> list[acs_api.PermissionSet]:
+def api_response_permission_sets() -> list[rbac.PermissionSet]:
     return [
-        acs_api.PermissionSet(
+        rbac.PermissionSet(
             api_data={
                 "id": "1",
                 "name": "Admin",
             }
         ),
-        acs_api.PermissionSet(
+        rbac.PermissionSet(
             api_data={
                 "id": "2",
                 "name": "Analyst",
             }
         ),
-        acs_api.PermissionSet(
+        rbac.PermissionSet(
             api_data={
                 "id": "3",
                 "name": "Vulnerability Management Admin",
@@ -374,15 +374,15 @@ def test_get_desired_state(
 
 def test_get_current_state(
     modeled_acs_roles: list[AcsRole],
-    api_response_roles: list[acs_api.Role],
-    api_response_groups: list[acs_api.Group],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
+    api_response_roles: list[rbac.Role],
+    api_response_groups: list[rbac.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
 ):
     integration = AcsRbacIntegration()
     result = integration.get_current_state(
         AUTH_PROVIDER_ID,
-        acs_api.RbacResources(
+        rbac.RbacResources(
             roles=api_response_roles,
             access_scopes=api_response_access_scopes,
             groups=api_response_groups,
@@ -396,8 +396,8 @@ def test_get_current_state(
 def test_add_rbac_dry_run(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
 ):
     dry_run = True
     desired = modeled_acs_roles
@@ -407,7 +407,7 @@ def test_add_rbac_dry_run(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=current_access_scopes,
         groups=[],
@@ -437,8 +437,8 @@ def test_add_rbac_dry_run(
 def test_add_rbac(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
 ):
     dry_run = False
     desired = modeled_acs_roles
@@ -448,7 +448,7 @@ def test_add_rbac(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=current_access_scopes,
         groups=[],
@@ -488,7 +488,7 @@ def test_add_rbac(
     ])
     acs_mock.create_group_batch.assert_has_calls([
         mocker.call([
-            acs_api.AcsApi.GroupAdd(
+            rbac.AcsRbacApi.GroupAdd(
                 role_name=desired[2].name,
                 key=a.key,
                 value=a.value,
@@ -502,8 +502,8 @@ def test_add_rbac(
 def test_delete_rbac_dry_run(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_groups: list[acs_api.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_groups: list[rbac.Group],
 ):
     dry_run = True
     current = modeled_acs_roles
@@ -511,7 +511,7 @@ def test_delete_rbac_dry_run(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=api_response_access_scopes,
         groups=api_response_groups,
@@ -539,8 +539,8 @@ def test_delete_rbac_dry_run(
 def test_delete_rbac(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_groups: list[acs_api.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_groups: list[rbac.Group],
 ):
     dry_run = False
     current = modeled_acs_roles
@@ -550,7 +550,7 @@ def test_delete_rbac(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=api_response_access_scopes,
         groups=api_response_groups,
@@ -582,9 +582,9 @@ def test_delete_rbac(
 def test_update_rbac_groups_only(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
-    api_response_groups: list[acs_api.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
+    api_response_groups: list[rbac.Group],
 ):
     dry_run = False
     desired = modeled_acs_roles
@@ -597,7 +597,7 @@ def test_update_rbac_groups_only(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=api_response_access_scopes,
         groups=current_groups,
@@ -621,7 +621,7 @@ def test_update_rbac_groups_only(
         mocker.call(
             [current_groups[0]],
             [
-                acs_api.AcsApi.GroupAdd(
+                rbac.AcsRbacApi.GroupAdd(
                     role_name=desired[0].name,
                     key=desired[0].assignments[0].key,
                     value=desired[0].assignments[0].value,
@@ -638,9 +638,9 @@ def test_update_rbac_groups_only(
 def test_full_reconcile(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
-    api_response_groups: list[acs_api.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
+    api_response_groups: list[rbac.Group],
 ):
     dry_run = False
 
@@ -674,7 +674,7 @@ def test_full_reconcile(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=current_access_scopes,
         groups=api_response_groups,
@@ -710,7 +710,7 @@ def test_full_reconcile(
     ])
     acs_mock.create_group_batch.assert_has_calls([
         mocker.call([
-            acs_api.AcsApi.GroupAdd(
+            rbac.AcsRbacApi.GroupAdd(
                 role_name=desired[2].name,
                 key=a.key,
                 value=a.value,
@@ -755,9 +755,9 @@ def test_full_reconcile(
 def test_full_reconcile_with_errors(
     mocker: MockerFixture,
     modeled_acs_roles: list[AcsRole],
-    api_response_access_scopes: list[acs_api.AccessScope],
-    api_response_permission_sets: list[acs_api.PermissionSet],
-    api_response_groups: list[acs_api.Group],
+    api_response_access_scopes: list[rbac.AccessScope],
+    api_response_permission_sets: list[rbac.PermissionSet],
+    api_response_groups: list[rbac.Group],
 ):
     dry_run = False
 
@@ -790,7 +790,7 @@ def test_full_reconcile_with_errors(
 
     acs_mock = Mock()
 
-    rbac_api_resources = acs_api.RbacResources(
+    rbac_api_resources = rbac.RbacResources(
         roles=[],
         access_scopes=current_access_scopes,
         groups=api_response_groups,

reconcile/utils/terrascript/cloudflare_resources.py

@@ -201,11 +201,12 @@ class CloudflareZoneTerrascriptResource(TerrascriptResource):
             certificate_secret = cert_values.pop("certificate_secret")
             certificate = secret_reader.read(certificate_secret.pop("certificate"))
             key = secret_reader.read(certificate_secret.pop("key"))
+            bundle_method = cert_values.pop("bundle_method") or "ubiquitous"
             custom_ssl_values: dict[Any, Any] = {
                 "zone_id": f"${{{zone.id}}}",
                 "depends_on": self._get_dependencies([zone]),
                 "custom_ssl_options": {
-                    "bundle_method": cert_values.pop("bundle_method", "ubiquitous"),
+                    "bundle_method": bundle_method,
                     "type": cert_values.pop("type"),
                     "certificate": certificate,
                     "private_key": key,

reconcile/utils/acs_api.py

@@ -1,326 +0,0 @@
-from typing import (
-    Any,
-    Optional,
-    Self,
-)
-
-import requests
-from pydantic import BaseModel
-
-
-class Role(BaseModel):
-    name: str
-    permission_set_id: str
-    access_scope_id: str
-    description: str
-    system_default: bool
-
-    def __init__(self, api_data: Any) -> None:
-        # attributes defined within stackrox(ACS) API for GET /v1/roles
-        check_len_attributes(
-            ["name", "permissionSetId", "accessScopeId"],
-            api_data,
-        )
-
-        # traits is populated for system default resources and contains `origin: DEFAULT`
-        # this attribute is used to ignore such resources from reconciliation
-        traits = api_data.get("traits")
-        is_default = traits is not None and traits.get("origin") == "DEFAULT"
-
-        super().__init__(
-            name=api_data["name"],
-            permission_set_id=api_data["permissionSetId"],
-            access_scope_id=api_data["accessScopeId"],
-            description=api_data.get("description", ""),
-            system_default=is_default,
-        )
-
-
-class Group(BaseModel):
-    id: str
-    role_name: str
-    auth_provider_id: str
-    key: str
-    value: str
-
-    def __init__(self, api_data: Any) -> None:
-        # attributes defined within stackrox(ACS) API for GET /v1/groups
-        check_len_attributes(["roleName", "props"], api_data)
-        if api_data["roleName"] != "None":
-            check_len_attributes(
-                ["id", "authProviderId", "key", "value"], api_data["props"]
-            )
-        else:
-            # it is valid for the default None group to contain empty key/value
-            check_len_attributes(["id", "authProviderId"], api_data["props"])
-
-        super().__init__(
-            role_name=api_data["roleName"],
-            id=api_data["props"]["id"],
-            auth_provider_id=api_data["props"]["authProviderId"],
-            key=api_data["props"]["key"],
-            value=api_data["props"]["value"],
-        )
-
-
-class AccessScope(BaseModel):
-    id: str
-    name: str
-    description: str
-    clusters: list[str]
-    namespaces: list[dict[str, str]]
-
-    def __init__(self, api_data: Any) -> None:
-        # attributes defined within stackrox(ACS) API for GET /v1/simpleaccessscopes/{id}
-        unrestricted = False
-        check_len_attributes(["id", "name"], api_data)
-
-        # it is valid for the default Unrestricted access scope to have null 'rules'
-        unrestricted = api_data["name"] == "Unrestricted"
-        if not unrestricted:
-            check_len_attributes(["rules"], api_data)
-
-        super().__init__(
-            id=api_data["id"],
-            name=api_data["name"],
-            clusters=[]
-            if unrestricted
-            else api_data["rules"].get("includedClusters", []),
-            namespaces=[]
-            if unrestricted
-            else api_data["rules"].get("includedNamespaces", []),
-            description=api_data.get("description", ""),
-        )
-
-
-class PermissionSet(BaseModel):
-    id: str
-    name: str
-
-    def __init__(self, api_data: Any) -> None:
-        # attributes defined within stackrox(ACS) API for GET /v1/permissionsets/{id}
-        check_len_attributes(["id", "name"], api_data)
-
-        super().__init__(id=api_data["id"], name=api_data["name"])
-
-
-class RbacResources(BaseModel):
-    roles: list[Role]
-    access_scopes: list[AccessScope]
-    groups: list[Group]
-    permission_sets: list[PermissionSet]
-
-
-def check_len_attributes(attrs: list[Any], api_data: Any) -> None:
-    # generic attribute check function for expected types with valid len()
-    for attr in attrs:
-        value = api_data.get(attr)
-        if value is None or len(value) == 0:
-            raise ValueError(
-                f"Attribute '{attr}' must exist and not be empty\n\t{api_data}"
-            )
-
-
-class AcsApi:
-    def __init__(
-        self,
-        instance: Any,
-        timeout: int = 30,
-    ) -> None:
-        self.base_url = instance["url"]
-        self.token = instance["token"]
-        self.timeout = timeout
-        self.session = requests.Session()
-
-    def __enter__(self) -> Self:
-        return self
-
-    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
-        self.session.close()
-
-    def generic_request(
-        self, path: str, verb: str, json: Optional[Any] = None
-    ) -> requests.Response:
-        url = f"{self.base_url}{path}"
-        headers = {
-            "Authorization": f"Bearer {self.token}",
-            "Content-Type": "application/json",
-        }
-
-        response = self.session.request(
-            verb,
-            url,
-            headers=headers,
-            json=json,
-            timeout=self.timeout,
-        )
-
-        response.raise_for_status()
-        return response
-
-    def get_roles(self) -> list[Role]:
-        response = self.generic_request("/v1/roles", "GET")
-        return [Role(r) for r in response.json()["roles"]]
-
-    def create_role(
-        self, name: str, desc: str, permission_set_id: str, access_scope_id: str
-    ) -> None:
-        json = {
-            "name": name,
-            "description": desc,
-            "permissionSetId": permission_set_id,
-            "accessScopeId": access_scope_id,
-        }
-
-        self.generic_request(f"/v1/roles/{name}", "POST", json)
-
-    def update_role(
-        self, name: str, desc: str, permission_set_id: str, access_scope_id: str
-    ) -> None:
-        json = {
-            "name": name,
-            "description": desc,
-            "permissionSetId": permission_set_id,
-            "accessScopeId": access_scope_id,
-        }
-
-        self.generic_request(f"/v1/roles/{name}", "PUT", json)
-
-    def delete_role(self, name: str) -> None:
-        self.generic_request(f"/v1/roles/{name}", "DELETE")
-
-    def get_groups(self) -> list[Group]:
-        response = self.generic_request("/v1/groups", "GET")
-        return [Group(g) for g in response.json()["groups"]]
-
-    class GroupAdd(BaseModel):
-        role_name: str
-        key: str
-        value: str
-        auth_provider_id: str
-
-    def create_group_batch(self, additions: list[GroupAdd]) -> None:
-        json = {
-            "previousGroups": [],
-            "requiredGroups": [
-                {
-                    "roleName": group.role_name,
-                    "props": {
-                        "id": "",
-                        "authProviderId": group.auth_provider_id,
-                        "key": group.key,
-                        "value": group.value,
-                    },
-                }
-                for group in additions
-            ],
-        }
-
-        self.generic_request("/v1/groupsbatch", "POST", json)
-
-    def delete_group_batch(self, removals: list[Group]) -> None:
-        json = {
-            "previousGroups": [
-                {
-                    "roleName": group.role_name,
-                    "props": {
-                        "id": group.id,
-                        "authProviderId": group.auth_provider_id,
-                        "key": group.key,
-                        "value": group.value,
-                    },
-                }
-                for group in removals
-            ],
-            "requiredGroups": [],
-        }
-
-        self.generic_request("/v1/groupsbatch", "POST", json)
-
-    def update_group_batch(self, old: list[Group], new: list[GroupAdd]) -> None:
-        json = {
-            "previousGroups": [
-                {
-                    "roleName": o.role_name,
-                    "props": {
-                        "id": o.id,
-                        "authProviderId": o.auth_provider_id,
-                        "key": o.key,
-                        "value": o.value,
-                    },
-                }
-                for o in old
-            ],
-            "requiredGroups": [
-                {
-                    "roleName": n.role_name,
-                    "props": {
-                        "id": "",
-                        "authProviderId": n.auth_provider_id,
-                        "key": n.key,
-                        "value": n.value,
-                    },
-                }
-                for n in new
-            ],
-        }
-        self.generic_request("/v1/groupsbatch", "POST", json)
-
-    def get_access_scopes(self) -> list[AccessScope]:
-        response = self.generic_request("/v1/simpleaccessscopes", "GET")
-        return [AccessScope(a) for a in response.json()["accessScopes"]]
-
-    def create_access_scope(
-        self,
-        name: str,
-        desc: str,
-        clusters: list[str],
-        namespaces: list[dict[str, str]],
-    ) -> str:
-        # response is the created access_scope id
-        json = {
-            "name": name,
-            "description": desc,
-            "rules": {
-                "includedClusters": clusters,
-                "includedNamespaces": namespaces,
-            },
-        }
-
-        response = self.generic_request("/v1/simpleaccessscopes", "POST", json)
-
-        return response.json()["id"]
-
-    def delete_access_scope(self, id: str) -> None:
-        self.generic_request(f"/v1/simpleaccessscopes/{id}", "DELETE")
-
-    def update_access_scope(
-        self,
-        id: str,
-        name: str,
-        desc: str,
-        clusters: list[str],
-        namespaces: list[dict[str, str]],
-    ) -> None:
-        json = {
-            "name": name,
-            "description": desc,
-            "rules": {
-                "includedClusters": clusters,
-                "includedNamespaces": namespaces,
-            },
-        }
-
-        self.generic_request(f"/v1/simpleaccessscopes/{id}", "PUT", json)
-
-    def get_permission_sets(self) -> list[PermissionSet]:
-        response = self.generic_request("/v1/permissionsets", "GET")
-        return [PermissionSet(p) for p in response.json()["permissionSets"]]
-
-    def get_rbac_resources(self) -> RbacResources:
-        return RbacResources(
-            roles=self.get_roles(),
-            access_scopes=self.get_access_scopes(),
-            groups=self.get_groups(),
-            permission_sets=self.get_permission_sets(),
-        )