From baf181addc524a35088fe749c1e230d8dea8498f Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 2 Apr 2025 20:49:56 +0000 Subject: [PATCH] Regenerate client from commit 9ea284b5 of spec repo --- .apigentools-info | 8 ++++---- .generator/schemas/v2/openapi.yaml | 15 +++++++++++++++ .../v2/software-catalog/UpsertCatalogEntity.rb | 1 + features/v2/software_catalog.feature | 4 ++-- .../v2/models/entity_v3_datastore_spec.rb | 14 +++++++++++++- .../v2/models/entity_v3_queue_spec.rb | 14 +++++++++++++- .../v2/models/entity_v3_service_spec.rb | 14 +++++++++++++- 7 files changed, 61 insertions(+), 9 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index 7fd1d12b9f9e..a97406ac69f1 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-02 19:55:38.978560", - "spec_repo_commit": "1cc45c45" + "regenerated": "2025-04-02 20:49:26.546832", + "spec_repo_commit": "9ea284b5" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-02 19:55:38.997117", - "spec_repo_commit": "1cc45c45" + "regenerated": "2025-04-02 20:49:26.563500", + "spec_repo_commit": "9ea284b5" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 1072d1213efc..b5a66e5d9755 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -12431,6 +12431,11 @@ components: additionalProperties: false description: The definition of Entity V3 Datastore Spec object. properties: + componentOf: + description: A list of components the datastore is a part of + items: + type: string + type: array lifecycle: description: The lifecycle state of the datastore. minLength: 1 @@ -12629,6 +12634,11 @@ components: additionalProperties: false description: The definition of Entity V3 Queue Spec object. properties: + componentOf: + description: A list of components the queue is a part of + items: + type: string + type: array lifecycle: description: The lifecycle state of the queue. minLength: 1 @@ -12694,6 +12704,11 @@ components: additionalProperties: false description: The definition of Entity V3 Service Spec object. properties: + componentOf: + description: A list of components the service is a part of + items: + type: string + type: array dependsOn: description: A list of components the service depends on. items: diff --git a/examples/v2/software-catalog/UpsertCatalogEntity.rb b/examples/v2/software-catalog/UpsertCatalogEntity.rb index b80578c3f695..3cc6c910fff7 100644 --- a/examples/v2/software-catalog/UpsertCatalogEntity.rb +++ b/examples/v2/software-catalog/UpsertCatalogEntity.rb @@ -62,6 +62,7 @@ ], }), spec: DatadogAPIClient::V2::EntityV3ServiceSpec.new({ + component_of: [], depends_on: [], languages: [], }), diff --git a/features/v2/software_catalog.feature b/features/v2/software_catalog.feature index 282607a38344..fd8e62bad35d 100644 --- a/features/v2/software_catalog.feature +++ b/features/v2/software_catalog.feature @@ -10,14 +10,14 @@ Feature: Software Catalog @generated @skip @team:DataDog/service-catalog Scenario: Create or update entities returns "ACCEPTED" response Given new "UpsertCatalogEntity" request - And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}} + And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}} When the request is sent Then the response status is 202 ACCEPTED @generated @skip @team:DataDog/service-catalog Scenario: Create or update entities returns "Bad Request" response Given new "UpsertCatalogEntity" request - And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"dependsOn": [], "languages": []}} + And body with value {"apiVersion": "v3", "datadog": {"codeLocations": [{"paths": []}], "events": [{}], "logs": [{}], "performanceData": {"tags": []}, "pipelines": {"fingerprints": []}}, "integrations": {"opsgenie": {"serviceURL": "https://www.opsgenie.com/service/shopping-cart"}, "pagerduty": {"serviceURL": "https://www.pagerduty.com/service-directory/Pshopping-cart"}}, "kind": "service", "metadata": {"additionalOwners": [{"name": ""}], "contacts": [{"contact": "https://slack/", "type": "slack"}], "id": "4b163705-23c0-4573-b2fb-f6cea2163fcb", "inheritFrom": "application:default/myapp", "links": [{"name": "mylink", "type": "link", "url": "https://mylink"}], "name": "myService", "namespace": "default", "tags": ["this:tag", "that:tag"]}, "spec": {"componentOf": [], "dependsOn": [], "languages": []}} When the request is sent Then the response status is 400 Bad Request diff --git a/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb index 9c8bc69b59e9..0ca8010f57f3 100644 --- a/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb +++ b/lib/datadog_api_client/v2/models/entity_v3_datastore_spec.rb @@ -21,6 +21,9 @@ module DatadogAPIClient::V2 class EntityV3DatastoreSpec include BaseGenericModel + # A list of components the datastore is a part of + attr_accessor :component_of + # The lifecycle state of the datastore. attr_reader :lifecycle @@ -34,6 +37,7 @@ class EntityV3DatastoreSpec # @!visibility private def self.attribute_map { + :'component_of' => :'componentOf', :'lifecycle' => :'lifecycle', :'tier' => :'tier', :'type' => :'type' @@ -44,6 +48,7 @@ def self.attribute_map # @!visibility private def self.openapi_types { + :'component_of' => :'Array', :'lifecycle' => :'String', :'tier' => :'String', :'type' => :'String' @@ -66,6 +71,12 @@ def initialize(attributes = {}) h[k.to_sym] = v } + if attributes.key?(:'component_of') + if (value = attributes[:'component_of']).is_a?(Array) + self.component_of = value + end + end + if attributes.key?(:'lifecycle') self.lifecycle = attributes[:'lifecycle'] end @@ -114,6 +125,7 @@ def tier=(tier) def ==(o) return true if self.equal?(o) self.class == o.class && + component_of == o.component_of && lifecycle == o.lifecycle && tier == o.tier && type == o.type @@ -123,7 +135,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [lifecycle, tier, type].hash + [component_of, lifecycle, tier, type].hash end end end diff --git a/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb index dc009bafc18e..14f972c12b71 100644 --- a/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb +++ b/lib/datadog_api_client/v2/models/entity_v3_queue_spec.rb @@ -21,6 +21,9 @@ module DatadogAPIClient::V2 class EntityV3QueueSpec include BaseGenericModel + # A list of components the queue is a part of + attr_accessor :component_of + # The lifecycle state of the queue. attr_reader :lifecycle @@ -34,6 +37,7 @@ class EntityV3QueueSpec # @!visibility private def self.attribute_map { + :'component_of' => :'componentOf', :'lifecycle' => :'lifecycle', :'tier' => :'tier', :'type' => :'type' @@ -44,6 +48,7 @@ def self.attribute_map # @!visibility private def self.openapi_types { + :'component_of' => :'Array', :'lifecycle' => :'String', :'tier' => :'String', :'type' => :'String' @@ -66,6 +71,12 @@ def initialize(attributes = {}) h[k.to_sym] = v } + if attributes.key?(:'component_of') + if (value = attributes[:'component_of']).is_a?(Array) + self.component_of = value + end + end + if attributes.key?(:'lifecycle') self.lifecycle = attributes[:'lifecycle'] end @@ -114,6 +125,7 @@ def tier=(tier) def ==(o) return true if self.equal?(o) self.class == o.class && + component_of == o.component_of && lifecycle == o.lifecycle && tier == o.tier && type == o.type @@ -123,7 +135,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [lifecycle, tier, type].hash + [component_of, lifecycle, tier, type].hash end end end diff --git a/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb b/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb index 9b88daaf2e1e..4602e1a5fbf7 100644 --- a/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb +++ b/lib/datadog_api_client/v2/models/entity_v3_service_spec.rb @@ -21,6 +21,9 @@ module DatadogAPIClient::V2 class EntityV3ServiceSpec include BaseGenericModel + # A list of components the service is a part of + attr_accessor :component_of + # A list of components the service depends on. attr_accessor :depends_on @@ -40,6 +43,7 @@ class EntityV3ServiceSpec # @!visibility private def self.attribute_map { + :'component_of' => :'componentOf', :'depends_on' => :'dependsOn', :'languages' => :'languages', :'lifecycle' => :'lifecycle', @@ -52,6 +56,7 @@ def self.attribute_map # @!visibility private def self.openapi_types { + :'component_of' => :'Array', :'depends_on' => :'Array', :'languages' => :'Array', :'lifecycle' => :'String', @@ -76,6 +81,12 @@ def initialize(attributes = {}) h[k.to_sym] = v } + if attributes.key?(:'component_of') + if (value = attributes[:'component_of']).is_a?(Array) + self.component_of = value + end + end + if attributes.key?(:'depends_on') if (value = attributes[:'depends_on']).is_a?(Array) self.depends_on = value @@ -136,6 +147,7 @@ def tier=(tier) def ==(o) return true if self.equal?(o) self.class == o.class && + component_of == o.component_of && depends_on == o.depends_on && languages == o.languages && lifecycle == o.lifecycle && @@ -147,7 +159,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [depends_on, languages, lifecycle, tier, type].hash + [component_of, depends_on, languages, lifecycle, tier, type].hash end end end