Regenerate client from commit 63a241d of spec repo

Author: ci.datadog-api-spec

.generator/schemas/v1/openapi.yaml

@@ -19420,7 +19420,7 @@ components:
           description: The description of the widget.
           type: string
         requests:
-          description: One or more Topology requests.
+          description: One Topology request.
           items:
             $ref: "#/components/schemas/TopologyRequest"
           minItems: 1
@@ -19449,10 +19449,14 @@ components:
       x-enum-varnames:
         - TOPOLOGY_MAP
     TopologyQuery:
+      description: A topology data source query.
+      oneOf:
+        - $ref: "#/components/schemas/TopologyQueryDataStreamsOrServiceMap"
+    TopologyQueryDataStreamsOrServiceMap:
       description: Query to service-based topology data sources like the service map or data streams.
       properties:
         data_source:
-          $ref: "#/components/schemas/TopologyQueryDataSource"
+          $ref: "#/components/schemas/TopologyQueryDataStreamsOrServiceMapDataSource"
         filters:
           description: Your environment and primary tag (or * if enabled for your account).
           example: ["env:prod", "az:us-east"]
@@ -19461,16 +19465,24 @@ components:
             type: string
           minItems: 1
           type: array
+        query_string:
+          description: A search string for filtering services, used in `data_streams` queries only. When set, this replaces the `service` field
+          example: "service:myservice"
+          type: string
         service:
           description: Name of the service
-          example: myService
+          example: myservice
           type: string
+      required:
+        - data_source
+        - filters
       type: object
-    TopologyQueryDataSource:
+    TopologyQueryDataStreamsOrServiceMapDataSource:
       description: Name of the data source
       enum:
         - data_streams
         - service_map
+      example: data_streams
       type: string
       x-enum-varnames:
         - DATA_STREAMS

cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.frozen

@@ -0,0 +1 @@
+2026-03-20T18:16:51.929Z

cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.yml

@@ -22,8 +22,8 @@
         requests: [
           DatadogAPIClient::V1::TopologyRequest.new({
             request_type: DatadogAPIClient::V1::TopologyRequestType::TOPOLOGY,
-            query: DatadogAPIClient::V1::TopologyQuery.new({
-              data_source: DatadogAPIClient::V1::TopologyQueryDataSource::SERVICE_MAP,
+            query: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMap.new({
+              data_source: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMapDataSource::SERVICE_MAP,
               service: "",
               filters: [
                 "env:none",

examples/v1/dashboards/CreateDashboard_2652180930.rb

@@ -0,0 +1,42 @@
+# Create a new dashboard with topology_map data_streams widget
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V1::DashboardsAPI.new
+
+body = DatadogAPIClient::V1::Dashboard.new({
+  title: "Example-Dashboard",
+  description: "",
+  widgets: [
+    DatadogAPIClient::V1::Widget.new({
+      layout: DatadogAPIClient::V1::WidgetLayout.new({
+        x: 0,
+        y: 0,
+        width: 47,
+        height: 15,
+      }),
+      definition: DatadogAPIClient::V1::TopologyMapWidgetDefinition.new({
+        title: "",
+        title_size: "16",
+        title_align: DatadogAPIClient::V1::WidgetTextAlign::LEFT,
+        type: DatadogAPIClient::V1::TopologyMapWidgetDefinitionType::TOPOLOGY_MAP,
+        requests: [
+          DatadogAPIClient::V1::TopologyRequest.new({
+            request_type: DatadogAPIClient::V1::TopologyRequestType::TOPOLOGY,
+            query: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMap.new({
+              data_source: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMapDataSource::DATA_STREAMS,
+              service: "",
+              filters: [
+                "env:prod",
+              ],
+              query_string: "service:myservice",
+            }),
+          }),
+        ],
+      }),
+    }),
+  ],
+  template_variables: [],
+  layout_type: DatadogAPIClient::V1::DashboardLayoutType::FREE,
+  notify_list: [],
+})
+p api_instance.create_dashboard(body)

examples/v1/dashboards/CreateDashboard_2815497946.rb

@@ -1089,6 +1089,19 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
+  @team:DataDog/dashboards-backend
+  Scenario: Create a new dashboard with topology_map data_streams widget
+    Given new "CreateDashboard" request
+    And body from file "dashboards_json_payload/topology_map_widget_data_streams.json"
+    When the request is sent
+    Then the response status is 200 OK
+    And the response "widgets[0].definition.type" is equal to "topology_map"
+    And the response "widgets[0].definition.requests[0].request_type" is equal to "topology"
+    And the response "widgets[0].definition.requests[0].query.data_source" is equal to "data_streams"
+    And the response "widgets[0].definition.requests[0].query.service" is equal to ""
+    And the response "widgets[0].definition.requests[0].query.filters" is equal to ["env:prod"]
+    And the response "widgets[0].definition.requests[0].query.query_string" is equal to "service:myservice"
+
   @team:DataDog/dashboards-backend
   Scenario: Create a new dashboard with topology_map widget
     Given new "CreateDashboard" request

features/v1/dashboards.feature

@@ -0,0 +1,34 @@
+{
+  "title": "{{ unique }}",
+  "description": "",
+  "widgets": [
+    {
+      "layout": {
+        "x": 0,
+        "y": 0,
+        "width": 47,
+        "height": 15
+      },
+      "definition": {
+        "title": "",
+        "title_size": "16",
+        "title_align": "left",
+        "type": "topology_map",
+        "requests": [
+          {
+            "request_type": "topology",
+            "query": {
+              "data_source": "data_streams",
+              "service": "",
+              "filters": ["env:prod"],
+              "query_string": "service:myservice"
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "template_variables": [],
+  "layout_type": "free",
+  "notify_list": []
+}

features/v1/dashboards_json_payload/topology_map_widget_data_streams.json

@@ -865,7 +865,8 @@ def overrides
           "v1.topology_map_widget_definition" => "TopologyMapWidgetDefinition",
           "v1.topology_map_widget_definition_type" => "TopologyMapWidgetDefinitionType",
           "v1.topology_query" => "TopologyQuery",
-          "v1.topology_query_data_source" => "TopologyQueryDataSource",
+          "v1.topology_query_data_streams_or_service_map" => "TopologyQueryDataStreamsOrServiceMap",
+          "v1.topology_query_data_streams_or_service_map_data_source" => "TopologyQueryDataStreamsOrServiceMapDataSource",
           "v1.topology_request" => "TopologyRequest",
           "v1.topology_request_type" => "TopologyRequestType",
           "v1.tree_map_color_by" => "TreeMapColorBy",

lib/datadog_api_client/inflector.rb

@@ -27,7 +27,7 @@ class TopologyMapWidgetDefinition
     # The description of the widget.
     attr_accessor :description
 
-    # One or more Topology requests.
+    # One Topology request.
     attr_reader :requests
 
     # Title of your widget.

lib/datadog_api_client/v1/models/topology_map_widget_definition.rb

@@ -17,129 +17,46 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # Query to service-based topology data sources like the service map or data streams.
-  class TopologyQuery
-    include BaseGenericModel
-
-    # Name of the data source
-    attr_accessor :data_source
-
-    # Your environment and primary tag (or * if enabled for your account).
-    attr_reader :filters
-
-    # Name of the service
-    attr_accessor :service
-
-    attr_accessor :additional_properties
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    # @!visibility private
-    def self.attribute_map
-      {
-        :'data_source' => :'data_source',
-        :'filters' => :'filters',
-        :'service' => :'service'
-      }
-    end
-
-    # Attribute type mapping.
-    # @!visibility private
-    def self.openapi_types
-      {
-        :'data_source' => :'TopologyQueryDataSource',
-        :'filters' => :'Array<String>',
-        :'service' => :'String'
-      }
-    end
-
-    # Initializes the object
-    # @param attributes [Hash] Model attributes in the form of hash
-    # @!visibility private
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TopologyQuery` initialize method"
-      end
-
-      self.additional_properties = {}
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
-        end
-      }
-
-      if attributes.key?(:'data_source')
-        self.data_source = attributes[:'data_source']
+  # A topology data source query.
+  module TopologyQuery
+    class << self
+      include BaseOneOfModel
+      include BaseOneOfModelNoDiscriminator
+
+      # List of class defined in oneOf (OpenAPI v3)
+      def openapi_one_of
+        [
+          :'TopologyQueryDataStreamsOrServiceMap'
+        ]
       end
-
-      if attributes.key?(:'filters')
-        if (value = attributes[:'filters']).is_a?(Array)
-          self.filters = value
+      # Builds the object
+      # @param data [Mixed] Data to be matched against the list of oneOf items
+      # @return [Object] Returns the model or the data itself
+      def build(data)
+        # Go through the list of oneOf items and attempt to identify the appropriate one.
+        # Note:
+        # - We do not attempt to check whether exactly one item matches.
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_one_of.each do |klass|
+          begin
+            next if klass == :AnyType # "nullable: true"
+            typed_data = find_and_cast_into_type(klass, data)
+            next if typed_data.respond_to?(:_unparsed) && typed_data._unparsed
+            return typed_data if typed_data
+          rescue # rescue all errors so we keep iterating even if the current item lookup raises
+          end
         end
-      end
 
-      if attributes.key?(:'service')
-        self.service = attributes[:'service']
-      end
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    # @!visibility private
-    def valid?
-      return false if !@filters.nil? && @filters.length < 1
-      true
-    end
-
-    # Custom attribute writer method with validation
-    # @param filters [Object] Object to be assigned
-    # @!visibility private
-    def filters=(filters)
-      if !filters.nil? && filters.length < 1
-        fail ArgumentError, 'invalid value for "filters", number of items must be greater than or equal to 1.'
-      end
-      @filters = filters
-    end
-
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        if openapi_one_of.include?(:AnyType)
+          data
+        else
+          self._unparsed = true
+          DatadogAPIClient::UnparsedObject.new(data)
         end
-
-        hash[param] = _to_hash(value)
       end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param o [Object] Object to be compared
-    # @!visibility private
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          data_source == o.data_source &&
-          filters == o.filters &&
-          service == o.service &&
-          additional_properties == o.additional_properties
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    # @!visibility private
-    def hash
-      [data_source, filters, service, additional_properties].hash
     end
   end
 end