From 5aaea802351e0402bdb629f06b7e6cba51f6c5f5 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Mon, 24 Aug 2026 11:25:15 +0000 Subject: [PATCH] Regenerate client from commit 6dc3a80 of spec repo --- .generator/schemas/v2/openapi.yaml | 26 ++++++++++++-- docs/datadog_api_client.v2.model.rst | 7 ++++ .../v2/model/asset_operating_system.py | 11 +++++- .../v2/model/scanned_asset_metadata.py | 10 +++++- .../v2/model/scanned_asset_metadata_type.py | 35 +++++++++++++++++++ .../v2/model/spec_version.py | 5 ++- .../v2/model/vulnerability_type.py | 8 ++++- src/datadog_api_client/v2/models/__init__.py | 2 ++ 8 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 src/datadog_api_client/v2/model/scanned_asset_metadata_type.py diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 9b5a962d17..e5cc997783 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -10910,6 +10910,10 @@ components: description: Operating system name. example: ubuntu type: string + version: + description: Operating system version. + example: "24.04" + type: string required: - name type: object @@ -94632,8 +94636,11 @@ components: description: The ID of the scanned asset metadata. example: "Host|i-0fc7edef1ab26d7ef" type: string + type: + $ref: "#/components/schemas/ScannedAssetMetadataType" required: - id + - type - attributes type: object ScannedAssetMetadataAsset: @@ -94688,6 +94695,14 @@ components: required: - timestamp type: object + ScannedAssetMetadataType: + description: The JSON:API type. + enum: + - scanned-assets-metadata + example: scanned-assets-metadata + type: string + x-enum-varnames: + - SCANNED_ASSETS_METADATA ScannedAssetsMetadata: description: The expected response schema when listing scanned assets metadata. properties: @@ -107359,7 +107374,8 @@ components: - "1.3" - "1.4" - "1.5" - example: "1.5" + - "1.6" + example: "1.6" type: string x-enum-varnames: - ONE_ZERO @@ -107368,6 +107384,7 @@ components: - ONE_THREE - ONE_FOUR - ONE_FIVE + - ONE_SIX SplitAPIKey: description: The definition of the `SplitAPIKey` object. properties: @@ -121376,10 +121393,12 @@ components: - ReflectionInjection - RiskyLicense - SessionRewriting + - SessionRewritting - SessionTimeout - SqlInjection - Ssrf - StackTraceLeak + - TemplateInjection - TrustBoundaryViolation - Unmaintained - UntrustedDeserialization @@ -121421,10 +121440,12 @@ components: - REFLECTION_INJECTION - RISKY_LICENSE - SESSION_REWRITING + - SESSION_REWRITTING - SESSION_TIMEOUT - SQL_INJECTION - SSRF - STACK_TRACE_LEAK + - TEMPLATE_INJECTION - TRUST_BOUNDARY_VIOLATION - UNMAINTAINED - UNTRUSTED_DESERIALIZATION @@ -194101,7 +194122,7 @@ paths: dependencies: [] metadata: {} serialNumber: urn:uuid:abc-123 - specVersion: "1.5" + specVersion: "1.6" version: 1 id: "github.com/datadog/datadog-agent" type: sboms @@ -194247,6 +194268,7 @@ paths: last_success: env: prod id: "Host|i-0fc7edef1ab26d7ef" + type: scanned-assets-metadata schema: $ref: "#/components/schemas/ScannedAssetsMetadata" description: OK diff --git a/docs/datadog_api_client.v2.model.rst b/docs/datadog_api_client.v2.model.rst index 56b4374ab4..011c62ebdb 100644 --- a/docs/datadog_api_client.v2.model.rst +++ b/docs/datadog_api_client.v2.model.rst @@ -40646,6 +40646,13 @@ datadog\_api\_client.v2.model.scanned\_asset\_metadata\_last\_success module :members: :show-inheritance: +datadog\_api\_client.v2.model.scanned\_asset\_metadata\_type module +------------------------------------------------------------------- + +.. automodule:: datadog_api_client.v2.model.scanned_asset_metadata_type + :members: + :show-inheritance: + datadog\_api\_client.v2.model.scanned\_assets\_metadata module -------------------------------------------------------------- diff --git a/src/datadog_api_client/v2/model/asset_operating_system.py b/src/datadog_api_client/v2/model/asset_operating_system.py index d484bbe93c..33286a1327 100644 --- a/src/datadog_api_client/v2/model/asset_operating_system.py +++ b/src/datadog_api_client/v2/model/asset_operating_system.py @@ -19,14 +19,18 @@ def openapi_types(_): return { "description": (str,), "name": (str,), + "version": (str,), } attribute_map = { "description": "description", "name": "name", + "version": "version", } - def __init__(self_, name: str, description: Union[str, UnsetType] = unset, **kwargs): + def __init__( + self_, name: str, description: Union[str, UnsetType] = unset, version: Union[str, UnsetType] = unset, **kwargs + ): """ Asset operating system. @@ -35,9 +39,14 @@ def __init__(self_, name: str, description: Union[str, UnsetType] = unset, **kwa :param name: Operating system name. :type name: str + + :param version: Operating system version. + :type version: str, optional """ if description is not unset: kwargs["description"] = description + if version is not unset: + kwargs["version"] = version super().__init__(kwargs) self_.name = name diff --git a/src/datadog_api_client/v2/model/scanned_asset_metadata.py b/src/datadog_api_client/v2/model/scanned_asset_metadata.py index a948f2ca9f..96a7a50097 100644 --- a/src/datadog_api_client/v2/model/scanned_asset_metadata.py +++ b/src/datadog_api_client/v2/model/scanned_asset_metadata.py @@ -13,24 +13,28 @@ if TYPE_CHECKING: from datadog_api_client.v2.model.scanned_asset_metadata_attributes import ScannedAssetMetadataAttributes + from datadog_api_client.v2.model.scanned_asset_metadata_type import ScannedAssetMetadataType class ScannedAssetMetadata(ModelNormal): @cached_property def openapi_types(_): from datadog_api_client.v2.model.scanned_asset_metadata_attributes import ScannedAssetMetadataAttributes + from datadog_api_client.v2.model.scanned_asset_metadata_type import ScannedAssetMetadataType return { "attributes": (ScannedAssetMetadataAttributes,), "id": (str,), + "type": (ScannedAssetMetadataType,), } attribute_map = { "attributes": "attributes", "id": "id", + "type": "type", } - def __init__(self_, attributes: ScannedAssetMetadataAttributes, id: str, **kwargs): + def __init__(self_, attributes: ScannedAssetMetadataAttributes, id: str, type: ScannedAssetMetadataType, **kwargs): """ The metadata of a scanned asset. @@ -39,8 +43,12 @@ def __init__(self_, attributes: ScannedAssetMetadataAttributes, id: str, **kwarg :param id: The ID of the scanned asset metadata. :type id: str + + :param type: The JSON:API type. + :type type: ScannedAssetMetadataType """ super().__init__(kwargs) self_.attributes = attributes self_.id = id + self_.type = type diff --git a/src/datadog_api_client/v2/model/scanned_asset_metadata_type.py b/src/datadog_api_client/v2/model/scanned_asset_metadata_type.py new file mode 100644 index 0000000000..e17f0efc5a --- /dev/null +++ b/src/datadog_api_client/v2/model/scanned_asset_metadata_type.py @@ -0,0 +1,35 @@ +# Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. +# This product includes software developed at Datadog (https://www.datadoghq.com/). +# Copyright 2019-Present Datadog, Inc. +from __future__ import annotations + + +from datadog_api_client.model_utils import ( + ModelSimple, + cached_property, +) + +from typing import ClassVar + + +class ScannedAssetMetadataType(ModelSimple): + """ + The JSON:API type. + + :param value: If omitted defaults to "scanned-assets-metadata". Must be one of ["scanned-assets-metadata"]. + :type value: str + """ + + allowed_values = { + "scanned-assets-metadata", + } + SCANNED_ASSETS_METADATA: ClassVar["ScannedAssetMetadataType"] + + @cached_property + def openapi_types(_): + return { + "value": (str,), + } + + +ScannedAssetMetadataType.SCANNED_ASSETS_METADATA = ScannedAssetMetadataType("scanned-assets-metadata") diff --git a/src/datadog_api_client/v2/model/spec_version.py b/src/datadog_api_client/v2/model/spec_version.py index 5d885873bb..1e907e627c 100644 --- a/src/datadog_api_client/v2/model/spec_version.py +++ b/src/datadog_api_client/v2/model/spec_version.py @@ -16,7 +16,7 @@ class SpecVersion(ModelSimple): """ The version of the CycloneDX specification a BOM conforms to. - :param value: Must be one of ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5"]. + :param value: Must be one of ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6"]. :type value: str """ @@ -27,6 +27,7 @@ class SpecVersion(ModelSimple): "1.3", "1.4", "1.5", + "1.6", } ONE_ZERO: ClassVar["SpecVersion"] ONE_ONE: ClassVar["SpecVersion"] @@ -34,6 +35,7 @@ class SpecVersion(ModelSimple): ONE_THREE: ClassVar["SpecVersion"] ONE_FOUR: ClassVar["SpecVersion"] ONE_FIVE: ClassVar["SpecVersion"] + ONE_SIX: ClassVar["SpecVersion"] @cached_property def openapi_types(_): @@ -48,3 +50,4 @@ def openapi_types(_): SpecVersion.ONE_THREE = SpecVersion("1.3") SpecVersion.ONE_FOUR = SpecVersion("1.4") SpecVersion.ONE_FIVE = SpecVersion("1.5") +SpecVersion.ONE_SIX = SpecVersion("1.6") diff --git a/src/datadog_api_client/v2/model/vulnerability_type.py b/src/datadog_api_client/v2/model/vulnerability_type.py index 50f04cd11d..5152b05bb5 100644 --- a/src/datadog_api_client/v2/model/vulnerability_type.py +++ b/src/datadog_api_client/v2/model/vulnerability_type.py @@ -16,7 +16,7 @@ class VulnerabilityType(ModelSimple): """ The vulnerability type. - :param value: Must be one of ["AdminConsoleActive", "CodeInjection", "CommandInjection", "ComponentWithKnownVulnerability", "DangerousWorkflows", "DefaultAppDeployed", "DefaultHtmlEscapeInvalid", "DirectoryListingLeak", "EmailHtmlInjection", "EndOfLife", "HardcodedPassword", "HardcodedSecret", "HeaderInjection", "HstsHeaderMissing", "InsecureAuthProtocol", "InsecureCookie", "InsecureJspLayout", "LdapInjection", "MaliciousPackage", "MandatoryRemediation", "NoHttpOnlyCookie", "NoSameSiteCookie", "NoSqlMongoDbInjection", "PathTraversal", "ReflectionInjection", "RiskyLicense", "SessionRewriting", "SessionTimeout", "SqlInjection", "Ssrf", "StackTraceLeak", "TrustBoundaryViolation", "Unmaintained", "UntrustedDeserialization", "UnvalidatedRedirect", "VerbTampering", "WeakCipher", "WeakHash", "WeakRandomness", "XContentTypeHeaderMissing", "XPathInjection", "Xss"]. + :param value: Must be one of ["AdminConsoleActive", "CodeInjection", "CommandInjection", "ComponentWithKnownVulnerability", "DangerousWorkflows", "DefaultAppDeployed", "DefaultHtmlEscapeInvalid", "DirectoryListingLeak", "EmailHtmlInjection", "EndOfLife", "HardcodedPassword", "HardcodedSecret", "HeaderInjection", "HstsHeaderMissing", "InsecureAuthProtocol", "InsecureCookie", "InsecureJspLayout", "LdapInjection", "MaliciousPackage", "MandatoryRemediation", "NoHttpOnlyCookie", "NoSameSiteCookie", "NoSqlMongoDbInjection", "PathTraversal", "ReflectionInjection", "RiskyLicense", "SessionRewriting", "SessionRewritting", "SessionTimeout", "SqlInjection", "Ssrf", "StackTraceLeak", "TemplateInjection", "TrustBoundaryViolation", "Unmaintained", "UntrustedDeserialization", "UnvalidatedRedirect", "VerbTampering", "WeakCipher", "WeakHash", "WeakRandomness", "XContentTypeHeaderMissing", "XPathInjection", "Xss"]. :type value: str """ @@ -48,10 +48,12 @@ class VulnerabilityType(ModelSimple): "ReflectionInjection", "RiskyLicense", "SessionRewriting", + "SessionRewritting", "SessionTimeout", "SqlInjection", "Ssrf", "StackTraceLeak", + "TemplateInjection", "TrustBoundaryViolation", "Unmaintained", "UntrustedDeserialization", @@ -91,10 +93,12 @@ class VulnerabilityType(ModelSimple): REFLECTION_INJECTION: ClassVar["VulnerabilityType"] RISKY_LICENSE: ClassVar["VulnerabilityType"] SESSION_REWRITING: ClassVar["VulnerabilityType"] + SESSION_REWRITTING: ClassVar["VulnerabilityType"] SESSION_TIMEOUT: ClassVar["VulnerabilityType"] SQL_INJECTION: ClassVar["VulnerabilityType"] SSRF: ClassVar["VulnerabilityType"] STACK_TRACE_LEAK: ClassVar["VulnerabilityType"] + TEMPLATE_INJECTION: ClassVar["VulnerabilityType"] TRUST_BOUNDARY_VIOLATION: ClassVar["VulnerabilityType"] UNMAINTAINED: ClassVar["VulnerabilityType"] UNTRUSTED_DESERIALIZATION: ClassVar["VulnerabilityType"] @@ -141,10 +145,12 @@ def openapi_types(_): VulnerabilityType.REFLECTION_INJECTION = VulnerabilityType("ReflectionInjection") VulnerabilityType.RISKY_LICENSE = VulnerabilityType("RiskyLicense") VulnerabilityType.SESSION_REWRITING = VulnerabilityType("SessionRewriting") +VulnerabilityType.SESSION_REWRITTING = VulnerabilityType("SessionRewritting") VulnerabilityType.SESSION_TIMEOUT = VulnerabilityType("SessionTimeout") VulnerabilityType.SQL_INJECTION = VulnerabilityType("SqlInjection") VulnerabilityType.SSRF = VulnerabilityType("Ssrf") VulnerabilityType.STACK_TRACE_LEAK = VulnerabilityType("StackTraceLeak") +VulnerabilityType.TEMPLATE_INJECTION = VulnerabilityType("TemplateInjection") VulnerabilityType.TRUST_BOUNDARY_VIOLATION = VulnerabilityType("TrustBoundaryViolation") VulnerabilityType.UNMAINTAINED = VulnerabilityType("Unmaintained") VulnerabilityType.UNTRUSTED_DESERIALIZATION = VulnerabilityType("UntrustedDeserialization") diff --git a/src/datadog_api_client/v2/models/__init__.py b/src/datadog_api_client/v2/models/__init__.py index b168aca54c..37196cdfe0 100644 --- a/src/datadog_api_client/v2/models/__init__.py +++ b/src/datadog_api_client/v2/models/__init__.py @@ -8285,6 +8285,7 @@ from datadog_api_client.v2.model.scanned_asset_metadata_asset import ScannedAssetMetadataAsset from datadog_api_client.v2.model.scanned_asset_metadata_attributes import ScannedAssetMetadataAttributes from datadog_api_client.v2.model.scanned_asset_metadata_last_success import ScannedAssetMetadataLastSuccess +from datadog_api_client.v2.model.scanned_asset_metadata_type import ScannedAssetMetadataType from datadog_api_client.v2.model.scanned_assets_metadata import ScannedAssetsMetadata from datadog_api_client.v2.model.schedule import Schedule from datadog_api_client.v2.model.schedule_create_request import ScheduleCreateRequest @@ -16774,6 +16775,7 @@ "ScannedAssetMetadataAsset", "ScannedAssetMetadataAttributes", "ScannedAssetMetadataLastSuccess", + "ScannedAssetMetadataType", "ScannedAssetsMetadata", "Schedule", "ScheduleCreateRequest",