cribl-control-plane 0.0.36__py3-none-any.whl → 0.0.37a1__py3-none-any.whl

cribl_control_plane/models/gitrevertparams.py

@@ -8,13 +8,13 @@ from typing_extensions import NotRequired, TypedDict
 
 class GitRevertParamsTypedDict(TypedDict):
     commit: str
+    message: str
     force: NotRequired[bool]
-    message: NotRequired[str]
 
 
 class GitRevertParams(BaseModel):
     commit: str
 
-    force: Optional[bool] = None
+    message: str
 
-    message: Optional[str] = None
+    force: Optional[bool] = None

cribl_control_plane/models/input.py

@@ -64,30 +64,31 @@ from .inputwef import InputWef, InputWefTypedDict
 from .inputwindowsmetrics import InputWindowsMetrics, InputWindowsMetricsTypedDict
 from .inputwineventlogs import InputWinEventLogs, InputWinEventLogsTypedDict
 from .inputwiz import InputWiz, InputWizTypedDict
-from .inputwizwebhook import InputWizWebhook, InputWizWebhookTypedDict
 from .inputzscalerhec import InputZscalerHec, InputZscalerHecTypedDict
+from cribl_control_plane.utils import get_discriminator
+from pydantic import Discriminator, Tag
 from typing import Union
-from typing_extensions import TypeAliasType
+from typing_extensions import Annotated, TypeAliasType
 
 
 InputTypedDict = TypeAliasType(
     "InputTypedDict",
     Union[
-        InputDatagenTypedDict,
         InputKubeEventsTypedDict,
+        InputDatagenTypedDict,
         InputCriblTypedDict,
         InputCriblmetricsTypedDict,
         InputKubeMetricsTypedDict,
         InputCollectionTypedDict,
         InputSystemStateTypedDict,
+        InputWindowsMetricsTypedDict,
         InputModelDrivenTelemetryTypedDict,
         InputSystemMetricsTypedDict,
-        InputWindowsMetricsTypedDict,
         InputJournalFilesTypedDict,
-        InputWinEventLogsTypedDict,
+        InputKubeLogsTypedDict,
         InputRawUDPTypedDict,
+        InputWinEventLogsTypedDict,
         InputExecTypedDict,
-        InputKubeLogsTypedDict,
         InputMetricsTypedDict,
         InputSnmpTypedDict,
         InputCriblTCPTypedDict,
@@ -103,22 +104,23 @@ InputTypedDict = TypeAliasType(
         InputOffice365MgmtTypedDict,
         InputFileTypedDict,
         InputSplunkTypedDict,
-        InputWefTypedDict,
         InputAppscopeTypedDict,
+        InputGrafanaTypedDict,
+        InputWefTypedDict,
         InputHTTPRawTypedDict,
-        InputWizWebhookTypedDict,
-        InputHTTPTypedDict,
         InputCriblLakeHTTPTypedDict,
-        InputAzureBlobTypedDict,
-        InputSqsTypedDict,
+        InputHTTPTypedDict,
         InputZscalerHecTypedDict,
-        InputKinesisTypedDict,
+        InputSyslogTypedDict,
+        InputSqsTypedDict,
+        InputAzureBlobTypedDict,
         InputConfluentCloudTypedDict,
+        InputKinesisTypedDict,
         InputEventhubTypedDict,
         InputKafkaTypedDict,
         InputElasticTypedDict,
-        InputOffice365MsgTraceTypedDict,
         InputSplunkHecTypedDict,
+        InputOffice365MsgTraceTypedDict,
         InputPrometheusRwTypedDict,
         InputLokiTypedDict,
         InputPrometheusTypedDict,
@@ -130,73 +132,70 @@ InputTypedDict = TypeAliasType(
         InputMskTypedDict,
         InputS3InventoryTypedDict,
         InputSplunkSearchTypedDict,
-        InputSyslogTypedDict,
-        InputGrafanaTypedDict,
     ],
 )
 
 
-Input = TypeAliasType(
-    "Input",
+Input = Annotated[
     Union[
-        InputDatagen,
-        InputKubeEvents,
-        InputCribl,
-        InputCriblmetrics,
-        InputKubeMetrics,
-        InputCollection,
-        InputSystemState,
-        InputModelDrivenTelemetry,
-        InputSystemMetrics,
-        InputWindowsMetrics,
-        InputJournalFiles,
-        InputWinEventLogs,
-        InputRawUDP,
-        InputExec,
-        InputKubeLogs,
-        InputMetrics,
-        InputSnmp,
-        InputCriblTCP,
-        InputNetflow,
-        InputTcpjson,
-        InputGooglePubsub,
-        InputOffice365Service,
-        InputWiz,
-        InputTCP,
-        InputFirehose,
-        InputCriblHTTP,
-        InputDatadogAgent,
-        InputOffice365Mgmt,
-        InputFile,
-        InputSplunk,
-        InputWef,
-        InputAppscope,
-        InputHTTPRaw,
-        InputWizWebhook,
-        InputHTTP,
-        InputCriblLakeHTTP,
-        InputAzureBlob,
-        InputSqs,
-        InputZscalerHec,
-        InputKinesis,
-        InputConfluentCloud,
-        InputEventhub,
-        InputKafka,
-        InputElastic,
-        InputOffice365MsgTrace,
-        InputSplunkHec,
-        InputPrometheusRw,
-        InputLoki,
-        InputPrometheus,
-        InputCrowdstrike,
-        InputEdgePrometheus,
-        InputOpenTelemetry,
-        InputS3,
-        InputSecurityLake,
-        InputMsk,
-        InputS3Inventory,
-        InputSplunkSearch,
-        InputSyslog,
-        InputGrafana,
+        Annotated[InputCollection, Tag("collection")],
+        Annotated[InputKafka, Tag("kafka")],
+        Annotated[InputMsk, Tag("msk")],
+        Annotated[InputHTTP, Tag("http")],
+        Annotated[InputSplunk, Tag("splunk")],
+        Annotated[InputSplunkSearch, Tag("splunk_search")],
+        Annotated[InputSplunkHec, Tag("splunk_hec")],
+        Annotated[InputAzureBlob, Tag("azure_blob")],
+        Annotated[InputElastic, Tag("elastic")],
+        Annotated[InputConfluentCloud, Tag("confluent_cloud")],
+        Annotated[InputGrafana, Tag("grafana")],
+        Annotated[InputLoki, Tag("loki")],
+        Annotated[InputPrometheusRw, Tag("prometheus_rw")],
+        Annotated[InputPrometheus, Tag("prometheus")],
+        Annotated[InputEdgePrometheus, Tag("edge_prometheus")],
+        Annotated[InputOffice365Mgmt, Tag("office365_mgmt")],
+        Annotated[InputOffice365Service, Tag("office365_service")],
+        Annotated[InputOffice365MsgTrace, Tag("office365_msg_trace")],
+        Annotated[InputEventhub, Tag("eventhub")],
+        Annotated[InputExec, Tag("exec")],
+        Annotated[InputFirehose, Tag("firehose")],
+        Annotated[InputGooglePubsub, Tag("google_pubsub")],
+        Annotated[InputCribl, Tag("cribl")],
+        Annotated[InputCriblTCP, Tag("cribl_tcp")],
+        Annotated[InputCriblHTTP, Tag("cribl_http")],
+        Annotated[InputCriblLakeHTTP, Tag("cribl_lake_http")],
+        Annotated[InputTcpjson, Tag("tcpjson")],
+        Annotated[InputSystemMetrics, Tag("system_metrics")],
+        Annotated[InputSystemState, Tag("system_state")],
+        Annotated[InputKubeMetrics, Tag("kube_metrics")],
+        Annotated[InputKubeLogs, Tag("kube_logs")],
+        Annotated[InputKubeEvents, Tag("kube_events")],
+        Annotated[InputWindowsMetrics, Tag("windows_metrics")],
+        Annotated[InputCrowdstrike, Tag("crowdstrike")],
+        Annotated[InputDatadogAgent, Tag("datadog_agent")],
+        Annotated[InputDatagen, Tag("datagen")],
+        Annotated[InputHTTPRaw, Tag("http_raw")],
+        Annotated[InputKinesis, Tag("kinesis")],
+        Annotated[InputCriblmetrics, Tag("criblmetrics")],
+        Annotated[InputMetrics, Tag("metrics")],
+        Annotated[InputS3, Tag("s3")],
+        Annotated[InputS3Inventory, Tag("s3_inventory")],
+        Annotated[InputSnmp, Tag("snmp")],
+        Annotated[InputOpenTelemetry, Tag("open_telemetry")],
+        Annotated[InputModelDrivenTelemetry, Tag("model_driven_telemetry")],
+        Annotated[InputSqs, Tag("sqs")],
+        Annotated[InputSyslog, Tag("syslog")],
+        Annotated[InputFile, Tag("file")],
+        Annotated[InputTCP, Tag("tcp")],
+        Annotated[InputAppscope, Tag("appscope")],
+        Annotated[InputWef, Tag("wef")],
+        Annotated[InputWinEventLogs, Tag("win_event_logs")],
+        Annotated[InputRawUDP, Tag("raw_udp")],
+        Annotated[InputJournalFiles, Tag("journal_files")],
+        Annotated[InputWiz, Tag("wiz")],
+        Annotated[InputNetflow, Tag("netflow")],
+        Annotated[InputSecurityLake, Tag("security_lake")],
+        Annotated[InputZscalerHec, Tag("zscaler_hec")],
     ],
-)
+    Discriminator(lambda m: get_discriminator(m, "type", "type")),
+]