qontract-reconcile 0.10.0__py3-none-any.whl → 0.10.1.dev1203__py3-none-any.whl

reconcile/glitchtip_project_dsn/integration.py

@@ -3,10 +3,7 @@ from collections.abc import (
     Callable,
     Iterable,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from sretoolbox.utils import threaded
 
@@ -20,14 +17,13 @@ from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     DEFINITION as GLITCHTIP_PROJECT_DEFINITION,
 )
-from reconcile.gql_definitions.glitchtip.glitchtip_project import GlitchtipProjectsV1
+from reconcile.gql_definitions.glitchtip.glitchtip_project import GlitchtipProjectV1
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     query as glitchtip_project_query,
 )
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
-from reconcile.typed_queries.glitchtip_settings import get_glitchtip_settings
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
@@ -43,6 +39,7 @@ from reconcile.utils.oc_map import (
 )
 from reconcile.utils.openshift_resource import OpenshiftResource as OR
 from reconcile.utils.openshift_resource import ResourceInventory
+from reconcile.utils.rest_api_base import BearerTokenAuth
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 
@@ -73,7 +70,7 @@ def glitchtip_project_dsn_secret(project: Project, key: ProjectKey) -> dict[str,
 
 
 def fetch_current_state(
-    project: GlitchtipProjectsV1,
+    project: GlitchtipProjectV1,
     oc_map: OCMap,
     ri: ResourceInventory,
 ) -> None:
@@ -110,19 +107,20 @@ def fetch_current_state(
 
 
 def fetch_desired_state(
-    glitchtip_projects: Iterable[GlitchtipProjectsV1],
+    glitchtip_projects: Iterable[GlitchtipProjectV1],
     ri: ResourceInventory,
     glitchtip_client: GlitchtipClient,
 ) -> None:
     for glitchtip_project in glitchtip_projects:
         org = Organization(name=glitchtip_project.organization.name)
         project = Project(name=glitchtip_project.name)
-        if project not in glitchtip_client.projects(organization_slug=org.slug):
-            logging.info(f"Project {project.name} does not exist (yet). Skipping.")
+        try:
+            key = glitchtip_client.project_key(
+                organization_slug=org.slug, project_slug=project.slug
+            )
+        except ValueError:
+            logging.info(f"Project {project.name} does not have a key (yet). Skipping.")
             continue
-        key = glitchtip_client.project_key(
-            organization_slug=org.slug, project_slug=project.slug
-        )
         secret = glitchtip_project_dsn_secret(project, key)
         openshift_resource = OR(
             body=secret,
@@ -144,7 +142,7 @@ def fetch_desired_state(
             )
 
 
-def projects_query(query_func: Callable) -> list[GlitchtipProjectsV1]:
+def projects_query(query_func: Callable) -> list[GlitchtipProjectV1]:
     glitchtip_projects = []
     for project in (
         glitchtip_project_query(query_func=query_func).glitchtip_projects or []
@@ -168,14 +166,13 @@ def projects_query(query_func: Callable) -> list[GlitchtipProjectsV1]:
 def run(
     dry_run: bool,
     thread_pool_size: int = 10,
-    internal: Optional[bool] = None,
+    internal: bool | None = None,
     use_jump_host: bool = True,
-    instance: Optional[str] = None,
-    defer: Optional[Callable] = None,
+    instance: str | None = None,
+    defer: Callable | None = None,
 ) -> None:
     # settings
     vault_settings = get_app_interface_vault_settings()
-    read_timeout, max_retries, _ = get_glitchtip_settings()
 
     # data
     gqlapi = gql.get_api()
@@ -205,33 +202,36 @@ def run(
         if instance and glitchtip_instance.name != instance:
             continue
 
-        glitchtip_client = GlitchtipClient(
+        with GlitchtipClient(
             host=glitchtip_instance.console_url,
-            token=secret_reader.read_secret(glitchtip_instance.automation_token),
-            read_timeout=read_timeout,
-            max_retries=max_retries,
-        )
-        threaded.run(
-            fetch_current_state,
-            [
-                p
-                for p in glitchtip_projects
-                if p.organization.instance.name == glitchtip_instance.name
-            ],
-            thread_pool_size,
-            oc_map=oc_map,
-            ri=ri,
-        )
-        fetch_desired_state(
-            glitchtip_projects=[
-                p
-                for p in glitchtip_projects
-                if p.organization.instance.name == glitchtip_instance.name
-            ],
-            ri=ri,
-            glitchtip_client=glitchtip_client,
-        )
+            auth=BearerTokenAuth(
+                secret_reader.read_secret(glitchtip_instance.automation_token)
+            ),
+            read_timeout=glitchtip_instance.read_timeout,
+            max_retries=glitchtip_instance.max_retries,
+        ) as glitchtip_client:
+            threaded.run(
+                fetch_current_state,
+                [
+                    p
+                    for p in glitchtip_projects
+                    if p.organization.instance.name == glitchtip_instance.name
+                ],
+                thread_pool_size,
+                oc_map=oc_map,
+                ri=ri,
+            )
+            fetch_desired_state(
+                glitchtip_projects=[
+                    p
+                    for p in glitchtip_projects
+                    if p.organization.instance.name == glitchtip_instance.name
+                ],
+                ri=ri,
+                glitchtip_client=glitchtip_client,
+            )
 
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     # create/update/delete all secrets
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 

reconcile/gql_definitions/acs/acs_instances.py

@@ -0,0 +1,83 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
+
+
+DEFINITION = """
+fragment VaultSecret on VaultSecret_v1 {
+    path
+    field
+    version
+    format
+}
+
+query AcsInstance {
+  instances: acs_instance_v1 {
+    url
+    credentials {
+      ... VaultSecret
+    }
+    authProvider {
+      name
+      id
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class AcsInstanceAuthProviderV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    q_id: str = Field(..., alias="id")
+
+
+class AcsInstanceV1(ConfiguredBaseModel):
+    url: str = Field(..., alias="url")
+    credentials: VaultSecret = Field(..., alias="credentials")
+    auth_provider: AcsInstanceAuthProviderV1 = Field(..., alias="authProvider")
+
+
+class AcsInstanceQueryData(ConfiguredBaseModel):
+    instances: Optional[list[AcsInstanceV1]] = Field(..., alias="instances")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AcsInstanceQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AcsInstanceQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AcsInstanceQueryData(**raw_data)

reconcile/gql_definitions/acs/acs_policies.py

@@ -0,0 +1,239 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query AcsPolicy {
+  acs_policies: acs_policy_v1 {
+   	name
+    description
+    severity
+    integrations {
+      notifiers {
+        jira {
+          escalationPolicy {
+            name
+            channels {
+              jiraBoard {
+                name
+                server {
+                  serverUrl
+                }
+                severityPriorityMappings {
+                  name
+                  mappings {
+                    severity
+                    priority
+                  }
+                }
+                issueType
+                issueSecurityId
+                disable {
+                  integrations
+                }
+              }
+              jiraComponent
+              jiraLabels
+            }
+          }
+        }
+      }
+    }
+    categories
+    scope {
+      level
+      ... on AcsPolicyScopeCluster_v1 {
+				clusters {
+          name
+        }        
+      }
+      ... on AcsPolicyScopeNamespace_v1 {
+       	namespaces {
+          name
+          cluster {
+            name
+          }
+        }
+      }
+    }
+	  conditions {
+      policyField
+      ... on AcsPolicyConditionsCvss_v1 {
+        comparison
+        score
+      }
+      ... on AcsPolicyConditionsSeverity_v1 {
+        comparison
+        level
+      }
+      ... on AcsPolicyConditionsCve_v1 {
+        fixable
+      }
+      ... on AcsPolicyConditionsImageTag_v1 {
+        tags
+        negate
+      }
+      ... on AcsPolicyConditionsImageAge_v1 {
+        days
+      }
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class JiraServerV1(ConfiguredBaseModel):
+    server_url: str = Field(..., alias="serverUrl")
+
+
+class SeverityPriorityMappingV1(ConfiguredBaseModel):
+    severity: str = Field(..., alias="severity")
+    priority: str = Field(..., alias="priority")
+
+
+class JiraSeverityPriorityMappingsV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    mappings: list[SeverityPriorityMappingV1] = Field(..., alias="mappings")
+
+
+class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
+    integrations: Optional[list[str]] = Field(..., alias="integrations")
+
+
+class JiraBoardV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    server: JiraServerV1 = Field(..., alias="server")
+    severity_priority_mappings: JiraSeverityPriorityMappingsV1 = Field(..., alias="severityPriorityMappings")
+    issue_type: Optional[str] = Field(..., alias="issueType")
+    issue_security_id: Optional[str] = Field(..., alias="issueSecurityId")
+    disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
+
+
+class AppEscalationPolicyChannelsV1(ConfiguredBaseModel):
+    jira_board: list[JiraBoardV1] = Field(..., alias="jiraBoard")
+    jira_component: Optional[str] = Field(..., alias="jiraComponent")
+    jira_labels: Optional[list[str]] = Field(..., alias="jiraLabels")
+
+
+class AppEscalationPolicyV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
+
+
+class AcsPolicyIntegrationNotifierJiraV1(ConfiguredBaseModel):
+    escalation_policy: AppEscalationPolicyV1 = Field(..., alias="escalationPolicy")
+
+
+class AcsPolicyIntegrationNotifiersV1(ConfiguredBaseModel):
+    jira: Optional[AcsPolicyIntegrationNotifierJiraV1] = Field(..., alias="jira")
+
+
+class AcsPolicyIntegrationsV1(ConfiguredBaseModel):
+    notifiers: Optional[AcsPolicyIntegrationNotifiersV1] = Field(..., alias="notifiers")
+
+
+class AcsPolicyScopeV1(ConfiguredBaseModel):
+    level: str = Field(..., alias="level")
+
+
+class ClusterV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class AcsPolicyScopeClusterV1(AcsPolicyScopeV1):
+    clusters: list[ClusterV1] = Field(..., alias="clusters")
+
+
+class NamespaceV1_ClusterV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class NamespaceV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    cluster: NamespaceV1_ClusterV1 = Field(..., alias="cluster")
+
+
+class AcsPolicyScopeNamespaceV1(AcsPolicyScopeV1):
+    namespaces: list[NamespaceV1] = Field(..., alias="namespaces")
+
+
+class AcsPolicyConditionsV1(ConfiguredBaseModel):
+    policy_field: str = Field(..., alias="policyField")
+
+
+class AcsPolicyConditionsCvssV1(AcsPolicyConditionsV1):
+    comparison: str = Field(..., alias="comparison")
+    score: int = Field(..., alias="score")
+
+
+class AcsPolicyConditionsSeverityV1(AcsPolicyConditionsV1):
+    comparison: str = Field(..., alias="comparison")
+    level: str = Field(..., alias="level")
+
+
+class AcsPolicyConditionsCveV1(AcsPolicyConditionsV1):
+    fixable: bool = Field(..., alias="fixable")
+
+
+class AcsPolicyConditionsImageTagV1(AcsPolicyConditionsV1):
+    tags: list[str] = Field(..., alias="tags")
+    negate: Optional[bool] = Field(..., alias="negate")
+
+
+class AcsPolicyConditionsImageAgeV1(AcsPolicyConditionsV1):
+    days: int = Field(..., alias="days")
+
+
+class AcsPolicyV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    description: Optional[str] = Field(..., alias="description")
+    severity: str = Field(..., alias="severity")
+    integrations: Optional[AcsPolicyIntegrationsV1] = Field(..., alias="integrations")
+    categories: list[str] = Field(..., alias="categories")
+    scope: Union[AcsPolicyScopeClusterV1, AcsPolicyScopeNamespaceV1, AcsPolicyScopeV1] = Field(..., alias="scope")
+    conditions: list[Union[AcsPolicyConditionsCvssV1, AcsPolicyConditionsSeverityV1, AcsPolicyConditionsImageTagV1, AcsPolicyConditionsCveV1, AcsPolicyConditionsImageAgeV1, AcsPolicyConditionsV1]] = Field(..., alias="conditions")
+
+
+class AcsPolicyQueryData(ConfiguredBaseModel):
+    acs_policies: Optional[list[AcsPolicyV1]] = Field(..., alias="acs_policies")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AcsPolicyQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AcsPolicyQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AcsPolicyQueryData(**raw_data)

reconcile/gql_definitions/acs/acs_rbac.py

@@ -0,0 +1,111 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+
+DEFINITION = """
+query AcsRbac  {
+  acs_rbacs: users_v1 {
+    org_username
+    roles {
+      name
+      oidc_permissions {
+        name
+        description
+        service
+        ... on OidcPermissionAcs_v1 {
+          permission_set
+          clusters {
+            name
+          }
+          namespaces {
+            name
+            cluster {
+              name
+            }
+          }
+        }
+      }
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class OidcPermissionV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    description: str = Field(..., alias="description")
+    service: str = Field(..., alias="service")
+
+
+class ClusterV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class NamespaceV1_ClusterV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class NamespaceV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    cluster: NamespaceV1_ClusterV1 = Field(..., alias="cluster")
+
+
+class OidcPermissionAcsV1(OidcPermissionV1):
+    permission_set: str = Field(..., alias="permission_set")
+    clusters: Optional[list[ClusterV1]] = Field(..., alias="clusters")
+    namespaces: Optional[list[NamespaceV1]] = Field(..., alias="namespaces")
+
+
+class RoleV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    oidc_permissions: Optional[list[Union[OidcPermissionAcsV1, OidcPermissionV1]]] = Field(..., alias="oidc_permissions")
+
+
+class UserV1(ConfiguredBaseModel):
+    org_username: str = Field(..., alias="org_username")
+    roles: Optional[list[RoleV1]] = Field(..., alias="roles")
+
+
+class AcsRbacQueryData(ConfiguredBaseModel):
+    acs_rbacs: Optional[list[UserV1]] = Field(..., alias="acs_rbacs")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AcsRbacQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AcsRbacQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AcsRbacQueryData(**raw_data)