cribl-control-plane 0.2.1rc4__py3-none-any.whl → 0.2.1rc6__py3-none-any.whl

cribl_control_plane/models/inputelastic.py

@@ -7,7 +7,7 @@ from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
-from typing import List, Optional
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputElasticMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputElasticTLSSettingsServerSideTypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -139,6 +133,10 @@ class InputElasticTLSSettingsServerSideTypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputElasticMinimumTLSVersion]
     max_version: NotRequired[InputElasticMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputElasticTLSSettingsServerSideTypedDict(TypedDict):
 class InputElasticTLSSettingsServerSide(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -176,6 +161,17 @@ class InputElasticTLSSettingsServerSide(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputElasticMinimumTLSVersion],
@@ -250,12 +246,6 @@ class InputElasticAuthenticationMethod(str, Enum, metaclass=utils.OpenEnumMeta):
 class InputElasticProxyModeTypedDict(TypedDict):
     enabled: NotRequired[bool]
     r"""Enable proxying of non-bulk API requests to an external Elastic server. Enable this only if you understand the implications. See [Cribl Docs](https://docs.cribl.io/stream/sources-elastic/#proxy-mode) for more details."""
-    auth_type: NotRequired[InputElasticAuthenticationMethod]
-    r"""Enter credentials directly, or select a stored secret"""
-    username: NotRequired[str]
-    password: NotRequired[str]
-    credentials_secret: NotRequired[str]
-    r"""Select or create a secret that references your credentials"""
     url: NotRequired[str]
     r"""URL of the Elastic server to proxy non-bulk requests to, such as http://elastic:9200"""
     reject_unauthorized: NotRequired[bool]
@@ -264,30 +254,14 @@ class InputElasticProxyModeTypedDict(TypedDict):
     r"""List of headers to remove from the request to proxy"""
     timeout_sec: NotRequired[float]
     r"""Amount of time, in seconds, to wait for a proxy request to complete before canceling it"""
+    auth_type: NotRequired[InputElasticAuthenticationMethod]
+    r"""Enter credentials directly, or select a stored secret"""
 
 
 class InputElasticProxyMode(BaseModel):
     enabled: Optional[bool] = False
     r"""Enable proxying of non-bulk API requests to an external Elastic server. Enable this only if you understand the implications. See [Cribl Docs](https://docs.cribl.io/stream/sources-elastic/#proxy-mode) for more details."""
 
-    auth_type: Annotated[
-        Annotated[
-            Optional[InputElasticAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authType"),
-    ] = InputElasticAuthenticationMethod.NONE
-    r"""Enter credentials directly, or select a stored secret"""
-
-    username: Optional[str] = None
-
-    password: Optional[str] = None
-
-    credentials_secret: Annotated[
-        Optional[str], pydantic.Field(alias="credentialsSecret")
-    ] = None
-    r"""Select or create a secret that references your credentials"""
-
     url: Optional[str] = None
     r"""URL of the Elastic server to proxy non-bulk requests to, such as http://elastic:9200"""
 
@@ -304,6 +278,15 @@ class InputElasticProxyMode(BaseModel):
     timeout_sec: Annotated[Optional[float], pydantic.Field(alias="timeoutSec")] = 60
     r"""Amount of time, in seconds, to wait for a proxy request to complete before canceling it"""
 
+    auth_type: Annotated[
+        Annotated[
+            Optional[InputElasticAuthenticationMethod],
+            PlainValidator(validate_open_enum(False)),
+        ],
+        pydantic.Field(alias="authType"),
+    ] = InputElasticAuthenticationMethod.NONE
+    r"""Enter credentials directly, or select a stored secret"""
+
 
 class InputElasticTypedDict(TypedDict):
     type: InputElasticType

cribl_control_plane/models/inputeventhub.py

@@ -107,15 +107,6 @@ class InputEventhubPq(BaseModel):
     ] = None
 
 
-class InputEventhubAuthTypeAuthenticationMethod(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
-    r"""Enter password directly, or select a stored secret"""
-
-    MANUAL = "manual"
-    SECRET = "secret"
-
-
 class InputEventhubSASLMechanism(str, Enum, metaclass=utils.OpenEnumMeta):
     # PLAIN
     PLAIN = "plain"
@@ -123,57 +114,11 @@ class InputEventhubSASLMechanism(str, Enum, metaclass=utils.OpenEnumMeta):
     OAUTHBEARER = "oauthbearer"
 
 
-class InputEventhubClientSecretAuthTypeAuthenticationMethod(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
-    MANUAL = "manual"
-    SECRET = "secret"
-    CERTIFICATE = "certificate"
-
-
-class InputEventhubMicrosoftEntraIDAuthenticationEndpoint(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
-    r"""Endpoint used to acquire authentication tokens from Azure"""
-
-    HTTPS_LOGIN_MICROSOFTONLINE_COM = "https://login.microsoftonline.com"
-    HTTPS_LOGIN_MICROSOFTONLINE_US = "https://login.microsoftonline.us"
-    HTTPS_LOGIN_PARTNER_MICROSOFTONLINE_CN = "https://login.partner.microsoftonline.cn"
-
-
 class InputEventhubAuthenticationTypedDict(TypedDict):
     r"""Authentication parameters to use when connecting to brokers. Using TLS is highly recommended."""
 
     disabled: NotRequired[bool]
-    auth_type: NotRequired[InputEventhubAuthTypeAuthenticationMethod]
-    r"""Enter password directly, or select a stored secret"""
-    password: NotRequired[str]
-    r"""Connection-string primary key, or connection-string secondary key, from the Event Hubs workspace"""
-    text_secret: NotRequired[str]
-    r"""Select or create a stored text secret"""
     mechanism: NotRequired[InputEventhubSASLMechanism]
-    username: NotRequired[str]
-    r"""The username for authentication. For Event Hubs, this should always be $ConnectionString."""
-    client_secret_auth_type: NotRequired[
-        InputEventhubClientSecretAuthTypeAuthenticationMethod
-    ]
-    client_secret: NotRequired[str]
-    r"""client_secret to pass in the OAuth request parameter"""
-    client_text_secret: NotRequired[str]
-    r"""Select or create a stored text secret"""
-    certificate_name: NotRequired[str]
-    r"""Select or create a stored certificate"""
-    cert_path: NotRequired[str]
-    priv_key_path: NotRequired[str]
-    passphrase: NotRequired[str]
-    oauth_endpoint: NotRequired[InputEventhubMicrosoftEntraIDAuthenticationEndpoint]
-    r"""Endpoint used to acquire authentication tokens from Azure"""
-    client_id: NotRequired[str]
-    r"""client_id to pass in the OAuth request parameter"""
-    tenant_id: NotRequired[str]
-    r"""Directory ID (tenant identifier) in Azure Active Directory"""
-    scope: NotRequired[str]
-    r"""Scope to pass in the OAuth request parameter"""
 
 
 class InputEventhubAuthentication(BaseModel):
@@ -181,73 +126,10 @@ class InputEventhubAuthentication(BaseModel):
 
     disabled: Optional[bool] = False
 
-    auth_type: Annotated[
-        Annotated[
-            Optional[InputEventhubAuthTypeAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authType"),
-    ] = InputEventhubAuthTypeAuthenticationMethod.MANUAL
-    r"""Enter password directly, or select a stored secret"""
-
-    password: Optional[str] = None
-    r"""Connection-string primary key, or connection-string secondary key, from the Event Hubs workspace"""
-
-    text_secret: Annotated[Optional[str], pydantic.Field(alias="textSecret")] = None
-    r"""Select or create a stored text secret"""
-
     mechanism: Annotated[
         Optional[InputEventhubSASLMechanism], PlainValidator(validate_open_enum(False))
     ] = InputEventhubSASLMechanism.PLAIN
 
-    username: Optional[str] = "$ConnectionString"
-    r"""The username for authentication. For Event Hubs, this should always be $ConnectionString."""
-
-    client_secret_auth_type: Annotated[
-        Annotated[
-            Optional[InputEventhubClientSecretAuthTypeAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="clientSecretAuthType"),
-    ] = InputEventhubClientSecretAuthTypeAuthenticationMethod.MANUAL
-
-    client_secret: Annotated[Optional[str], pydantic.Field(alias="clientSecret")] = None
-    r"""client_secret to pass in the OAuth request parameter"""
-
-    client_text_secret: Annotated[
-        Optional[str], pydantic.Field(alias="clientTextSecret")
-    ] = None
-    r"""Select or create a stored text secret"""
-
-    certificate_name: Annotated[
-        Optional[str], pydantic.Field(alias="certificateName")
-    ] = None
-    r"""Select or create a stored certificate"""
-
-    cert_path: Annotated[Optional[str], pydantic.Field(alias="certPath")] = None
-
-    priv_key_path: Annotated[Optional[str], pydantic.Field(alias="privKeyPath")] = None
-
-    passphrase: Optional[str] = None
-
-    oauth_endpoint: Annotated[
-        Annotated[
-            Optional[InputEventhubMicrosoftEntraIDAuthenticationEndpoint],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="oauthEndpoint"),
-    ] = InputEventhubMicrosoftEntraIDAuthenticationEndpoint.HTTPS_LOGIN_MICROSOFTONLINE_COM
-    r"""Endpoint used to acquire authentication tokens from Azure"""
-
-    client_id: Annotated[Optional[str], pydantic.Field(alias="clientId")] = None
-    r"""client_id to pass in the OAuth request parameter"""
-
-    tenant_id: Annotated[Optional[str], pydantic.Field(alias="tenantId")] = None
-    r"""Directory ID (tenant identifier) in Azure Active Directory"""
-
-    scope: Optional[str] = None
-    r"""Scope to pass in the OAuth request parameter"""
-
 
 class InputEventhubTLSSettingsClientSideTypedDict(TypedDict):
     disabled: NotRequired[bool]

cribl_control_plane/models/inputfirehose.py

@@ -7,7 +7,7 @@ from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
-from typing import List, Optional
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputFirehoseMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputFirehoseTLSSettingsServerSideTypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -139,6 +133,10 @@ class InputFirehoseTLSSettingsServerSideTypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputFirehoseMinimumTLSVersion]
     max_version: NotRequired[InputFirehoseMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputFirehoseTLSSettingsServerSideTypedDict(TypedDict):
 class InputFirehoseTLSSettingsServerSide(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -176,6 +161,17 @@ class InputFirehoseTLSSettingsServerSide(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputFirehoseMinimumTLSVersion],

cribl_control_plane/models/inputgrafana.py

@@ -7,7 +7,7 @@ from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
-from typing import List, Optional, Union
+from typing import Any, List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputGrafanaMaximumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -139,6 +133,10 @@ class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputGrafanaMinimumTLSVersion2]
     max_version: NotRequired[InputGrafanaMaximumTLSVersion2]
 
@@ -146,19 +144,6 @@ class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
 class InputGrafanaTLSSettingsServerSide2(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -176,6 +161,17 @@ class InputGrafanaTLSSettingsServerSide2(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputGrafanaMinimumTLSVersion2],
@@ -757,12 +753,6 @@ class InputGrafanaMaximumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -773,6 +763,10 @@ class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputGrafanaMinimumTLSVersion1]
     max_version: NotRequired[InputGrafanaMaximumTLSVersion1]
 
@@ -780,19 +774,6 @@ class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
 class InputGrafanaTLSSettingsServerSide1(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -810,6 +791,17 @@ class InputGrafanaTLSSettingsServerSide1(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputGrafanaMinimumTLSVersion1],

cribl_control_plane/models/inputhttp.py

@@ -7,7 +7,7 @@ from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
-from typing import List, Optional
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputHTTPMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputHTTPTLSSettingsServerSideTypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -139,6 +133,10 @@ class InputHTTPTLSSettingsServerSideTypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputHTTPMinimumTLSVersion]
     max_version: NotRequired[InputHTTPMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputHTTPTLSSettingsServerSideTypedDict(TypedDict):
 class InputHTTPTLSSettingsServerSide(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -176,6 +161,17 @@ class InputHTTPTLSSettingsServerSide(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputHTTPMinimumTLSVersion],

cribl_control_plane/models/inputhttpraw.py

@@ -7,7 +7,7 @@ from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
-from typing import List, Optional
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputHTTPRawMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputHTTPRawTLSSettingsServerSideTypedDict(TypedDict):
     disabled: NotRequired[bool]
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-    common_name_regex: NotRequired[str]
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -139,6 +133,10 @@ class InputHTTPRawTLSSettingsServerSideTypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    reject_unauthorized: NotRequired[Any]
+    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputHTTPRawMinimumTLSVersion]
     max_version: NotRequired[InputHTTPRawMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputHTTPRawTLSSettingsServerSideTypedDict(TypedDict):
 class InputHTTPRawTLSSettingsServerSide(BaseModel):
     disabled: Optional[bool] = True
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's)"""
-
-    common_name_regex: Annotated[
-        Optional[str], pydantic.Field(alias="commonNameRegex")
-    ] = "/.*/"
-    r"""Regex matching allowable common names in peer certificates' subject attribute"""
-
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -176,6 +161,17 @@ class InputHTTPRawTLSSettingsServerSide(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    reject_unauthorized: Annotated[
+        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
+    ] = None
+
+    common_name_regex: Annotated[
+        Optional[Any], pydantic.Field(alias="commonNameRegex")
+    ] = None
+
     min_version: Annotated[
         Annotated[
             Optional[InputHTTPRawMinimumTLSVersion],