diff --git a/.apigentools-info b/.apigentools-info index 58193d7ee9c3..a64729853653 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.4.1.dev6", - "regenerated": "2021-03-23 14:01:30.773317", - "spec_repo_commit": "7e667f1" + "regenerated": "2021-03-23 15:41:49.644923", + "spec_repo_commit": "1906d5b" }, "v2": { "apigentools_version": "1.4.1.dev6", - "regenerated": "2021-03-23 14:01:44.126537", - "spec_repo_commit": "7e667f1" + "regenerated": "2021-03-23 15:42:03.671644", + "spec_repo_commit": "1906d5b" } } } \ No newline at end of file diff --git a/data/v1/openapi.yaml b/data/v1/openapi.yaml index 4f5abbb13f2e..c70ef69b9ce2 100644 --- a/data/v1/openapi.yaml +++ b/data/v1/openapi.yaml @@ -10181,10 +10181,24 @@ components: description: Contains the custom metric name. type: string type: object + UsageTopAvgMetricsMetadata: + description: The object containing document metadata. + properties: + day: + description: The day value from the user request that contains the returned + usage data. (If day was used the request) + month: + description: The month value from the user request that contains the returned + usage data. (If month was used the request) + pagination: + $ref: '#/components/schemas/UsageAttributionPagination' + type: object UsageTopAvgMetricsResponse: description: Response containing the number of hourly recorded custom metrics for a given organization. properties: + metadata: + $ref: '#/components/schemas/UsageTopAvgMetricsMetadata' usage: description: Number of hourly recorded custom metrics for a given organization. items: @@ -18490,14 +18504,24 @@ paths: /api/v1/usage/top_avg_metrics: get: description: Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) - by hourly average. + by hourly average. Use the month parameter to get a month-to-date data resolution + or use the day parameter to get a daily resolution. One of the two is required, + and only one of the two is allowed. operationId: GetUsageTopAvgMetrics parameters: - description: 'Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] - for usage beginning at this hour.' + for usage beginning at this hour. (Either month or day should be specified, + but not both)' in: query name: month - required: true + schema: + format: date-time + type: string + - description: 'Datetime in ISO-8601 format, UTC, precise to day: [YYYY-MM-DD] + for usage beginning at this hour. (Either month or day should be specified, + but not both)' + in: query + name: day schema: format: date-time type: string diff --git a/docs/v1/README.md b/docs/v1/README.md index f49e3c4cad46..2e4fafe8781b 100644 --- a/docs/v1/README.md +++ b/docs/v1/README.md @@ -712,6 +712,7 @@ Class | Method | HTTP request | Description - [DatadogAPIClient::V1::UsageTimeseriesHour](UsageTimeseriesHour.md) - [DatadogAPIClient::V1::UsageTimeseriesResponse](UsageTimeseriesResponse.md) - [DatadogAPIClient::V1::UsageTopAvgMetricsHour](UsageTopAvgMetricsHour.md) + - [DatadogAPIClient::V1::UsageTopAvgMetricsMetadata](UsageTopAvgMetricsMetadata.md) - [DatadogAPIClient::V1::UsageTopAvgMetricsResponse](UsageTopAvgMetricsResponse.md) - [DatadogAPIClient::V1::UsageTraceHour](UsageTraceHour.md) - [DatadogAPIClient::V1::UsageTraceResponse](UsageTraceResponse.md) diff --git a/docs/v1/UsageMeteringApi.md b/docs/v1/UsageMeteringApi.md index 23439c6772dd..7154d9313ee5 100644 --- a/docs/v1/UsageMeteringApi.md +++ b/docs/v1/UsageMeteringApi.md @@ -2217,11 +2217,11 @@ end ## get_usage_top_avg_metrics -> get_usage_top_avg_metrics(month, opts) +> get_usage_top_avg_metrics(opts) Get top custom metrics by hourly average -Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. +Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. Use the month parameter to get a month-to-date data resolution or use the day parameter to get a daily resolution. One of the two is required, and only one of the two is allowed. ### Examples @@ -2242,15 +2242,16 @@ DatadogAPIClient::V1.configure do |config| end api_instance = DatadogAPIClient::V1::UsageMeteringApi.new -month = Time.parse('2013-10-20T19:20:30+01:00') # Time | Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. opts = { + month: Time.parse('2013-10-20T19:20:30+01:00'), # Time | Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. (Either month or day should be specified, but not both) + day: Time.parse('2013-10-20T19:20:30+01:00'), # Time | Datetime in ISO-8601 format, UTC, precise to day: [YYYY-MM-DD] for usage beginning at this hour. (Either month or day should be specified, but not both) names: ['inner_example'], # Array | Comma-separated list of metric names. limit: 56 # Integer | Maximum number of results to return (between 1 and 5000) - defaults to 500 results if limit not specified. } begin # Get top custom metrics by hourly average - result = api_instance.get_usage_top_avg_metrics(month, opts) + result = api_instance.get_usage_top_avg_metrics(opts) p result rescue DatadogAPIClient::V1::ApiError => e puts "Error when calling UsageMeteringApi->get_usage_top_avg_metrics: #{e}" @@ -2261,12 +2262,12 @@ end This returns an Array which contains the response data, status code and headers. -> , Integer, Hash)> get_usage_top_avg_metrics_with_http_info(month, opts) +> , Integer, Hash)> get_usage_top_avg_metrics_with_http_info(opts) ```ruby begin # Get top custom metrics by hourly average - data, status_code, headers = api_instance.get_usage_top_avg_metrics_with_http_info(month, opts) + data, status_code, headers = api_instance.get_usage_top_avg_metrics_with_http_info(opts) p status_code # => 2xx p headers # => { ... } p data # => @@ -2279,7 +2280,8 @@ end | Name | Type | Description | Notes | | ---- | ---- | ----------- | ----- | -| **month** | **Time** | Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. | | +| **month** | **Time** | Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. (Either month or day should be specified, but not both) | [optional] | +| **day** | **Time** | Datetime in ISO-8601 format, UTC, precise to day: [YYYY-MM-DD] for usage beginning at this hour. (Either month or day should be specified, but not both) | [optional] | | **names** | **Array<String>** | Comma-separated list of metric names. | [optional] | | **limit** | **Integer** | Maximum number of results to return (between 1 and 5000) - defaults to 500 results if limit not specified. | [optional][default to 500] | diff --git a/docs/v1/UsageTopAvgMetricsMetadata.md b/docs/v1/UsageTopAvgMetricsMetadata.md new file mode 100644 index 000000000000..3d0e34da5fdd --- /dev/null +++ b/docs/v1/UsageTopAvgMetricsMetadata.md @@ -0,0 +1,22 @@ +# DatadogAPIClient::V1::UsageTopAvgMetricsMetadata + +## Properties + +| Name | Type | Description | Notes | +| ---- | ---- | ----------- | ----- | +| **day** | **Object** | The day value from the user request that contains the returned usage data. (If day was used the request) | [optional] | +| **month** | **Object** | The month value from the user request that contains the returned usage data. (If month was used the request) | [optional] | +| **pagination** | [**UsageAttributionPagination**](UsageAttributionPagination.md) | | [optional] | + +## Example + +```ruby +require 'datadog_api_client/v1' + +instance = DatadogAPIClient::V1::UsageTopAvgMetricsMetadata.new( + day: null, + month: null, + pagination: null +) +``` + diff --git a/docs/v1/UsageTopAvgMetricsResponse.md b/docs/v1/UsageTopAvgMetricsResponse.md index 7544bd1fbef2..8f8714a09c45 100644 --- a/docs/v1/UsageTopAvgMetricsResponse.md +++ b/docs/v1/UsageTopAvgMetricsResponse.md @@ -4,6 +4,7 @@ | Name | Type | Description | Notes | | ---- | ---- | ----------- | ----- | +| **metadata** | [**UsageTopAvgMetricsMetadata**](UsageTopAvgMetricsMetadata.md) | | [optional] | | **usage** | [**Array<UsageTopAvgMetricsHour>**](UsageTopAvgMetricsHour.md) | Number of hourly recorded custom metrics for a given organization. | [optional] | ## Example @@ -12,6 +13,7 @@ require 'datadog_api_client/v1' instance = DatadogAPIClient::V1::UsageTopAvgMetricsResponse.new( + metadata: null, usage: null ) ``` diff --git a/lib/datadog_api_client/v1.rb b/lib/datadog_api_client/v1.rb index 1a6671614eb1..112f3eb5fc91 100644 --- a/lib/datadog_api_client/v1.rb +++ b/lib/datadog_api_client/v1.rb @@ -466,6 +466,7 @@ require 'datadog_api_client/v1/models/usage_timeseries_hour' require 'datadog_api_client/v1/models/usage_timeseries_response' require 'datadog_api_client/v1/models/usage_top_avg_metrics_hour' +require 'datadog_api_client/v1/models/usage_top_avg_metrics_metadata' require 'datadog_api_client/v1/models/usage_top_avg_metrics_response' require 'datadog_api_client/v1/models/usage_trace_hour' require 'datadog_api_client/v1/models/usage_trace_response' diff --git a/lib/datadog_api_client/v1/api/usage_metering_api.rb b/lib/datadog_api_client/v1/api/usage_metering_api.rb index a49fc783d5ed..e9d6701c730f 100644 --- a/lib/datadog_api_client/v1/api/usage_metering_api.rb +++ b/lib/datadog_api_client/v1/api/usage_metering_api.rb @@ -2113,25 +2113,27 @@ def get_usage_timeseries_with_http_info(start_hr, opts = {}) end # Get top custom metrics by hourly average - # Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. - # @param month [Time] Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. + # Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. Use the month parameter to get a month-to-date data resolution or use the day parameter to get a daily resolution. One of the two is required, and only one of the two is allowed. # @param [Hash] opts the optional parameters + # @option opts [Time] :month Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. (Either month or day should be specified, but not both) + # @option opts [Time] :day Datetime in ISO-8601 format, UTC, precise to day: [YYYY-MM-DD] for usage beginning at this hour. (Either month or day should be specified, but not both) # @option opts [Array] :names Comma-separated list of metric names. # @option opts [Integer] :limit Maximum number of results to return (between 1 and 5000) - defaults to 500 results if limit not specified. (default to 500) # @return [UsageTopAvgMetricsResponse] - def get_usage_top_avg_metrics(month, opts = {}) - data, _status_code, _headers = get_usage_top_avg_metrics_with_http_info(month, opts) + def get_usage_top_avg_metrics(opts = {}) + data, _status_code, _headers = get_usage_top_avg_metrics_with_http_info(opts) data end # Get top custom metrics by hourly average - # Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. - # @param month [Time] Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. + # Get top [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/) by hourly average. Use the month parameter to get a month-to-date data resolution or use the day parameter to get a daily resolution. One of the two is required, and only one of the two is allowed. # @param [Hash] opts the optional parameters + # @option opts [Time] :month Datetime in ISO-8601 format, UTC, precise to month: [YYYY-MM] for usage beginning at this hour. (Either month or day should be specified, but not both) + # @option opts [Time] :day Datetime in ISO-8601 format, UTC, precise to day: [YYYY-MM-DD] for usage beginning at this hour. (Either month or day should be specified, but not both) # @option opts [Array] :names Comma-separated list of metric names. # @option opts [Integer] :limit Maximum number of results to return (between 1 and 5000) - defaults to 500 results if limit not specified. # @return [Array<(UsageTopAvgMetricsResponse, Integer, Hash)>] UsageTopAvgMetricsResponse data, response status code and response headers - def get_usage_top_avg_metrics_with_http_info(month, opts = {}) + def get_usage_top_avg_metrics_with_http_info(opts = {}) if @api_client.config.unstable_operations.has_key?(:get_usage_top_avg_metrics) unstable_enabled = @api_client.config.unstable_operations[:get_usage_top_avg_metrics] @@ -2145,10 +2147,6 @@ def get_usage_top_avg_metrics_with_http_info(month, opts = {}) if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: UsageMeteringApi.get_usage_top_avg_metrics ...' end - # verify the required parameter 'month' is set - if @api_client.config.client_side_validation && month.nil? - fail ArgumentError, "Missing the required parameter 'month' when calling UsageMeteringApi.get_usage_top_avg_metrics" - end if @api_client.config.client_side_validation && !opts[:'limit'].nil? && opts[:'limit'] > 5000 fail ArgumentError, 'invalid value for "opts[:"limit"]" when calling UsageMeteringApi.get_usage_top_avg_metrics, must be smaller than or equal to 5000.' end @@ -2162,7 +2160,8 @@ def get_usage_top_avg_metrics_with_http_info(month, opts = {}) # query parameters query_params = opts[:query_params] || {} - query_params[:'month'] = month + query_params[:'month'] = opts[:'month'] if !opts[:'month'].nil? + query_params[:'day'] = opts[:'day'] if !opts[:'day'].nil? query_params[:'names'] = @api_client.build_collection_param(opts[:'names'], :multi) if !opts[:'names'].nil? query_params[:'limit'] = opts[:'limit'] if !opts[:'limit'].nil? diff --git a/lib/datadog_api_client/v1/models/usage_top_avg_metrics_metadata.rb b/lib/datadog_api_client/v1/models/usage_top_avg_metrics_metadata.rb new file mode 100644 index 000000000000..465b0420c627 --- /dev/null +++ b/lib/datadog_api_client/v1/models/usage_top_avg_metrics_metadata.rb @@ -0,0 +1,244 @@ +=begin +#Datadog API V1 Collection + +#Collection of all Datadog Public endpoints. + +The version of the OpenAPI document: 1.0 +Contact: support@datadoghq.com +Generated by: https://openapi-generator.tech + + 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 2020-Present Datadog, Inc. + +=end + +require 'date' +require 'time' + +module DatadogAPIClient::V1 + # The object containing document metadata. + class UsageTopAvgMetricsMetadata + # The day value from the user request that contains the returned usage data. (If day was used the request) + attr_accessor :day + + # The month value from the user request that contains the returned usage data. (If month was used the request) + attr_accessor :month + + attr_accessor :pagination + + # Attribute mapping from ruby-style variable name to JSON key. + def self.attribute_map + { + :'day' => :'day', + :'month' => :'month', + :'pagination' => :'pagination' + } + end + + # Returns all the JSON keys this model knows about + def self.acceptable_attributes + attribute_map.values + end + + # Attribute type mapping. + def self.openapi_types + { + :'day' => :'Object', + :'month' => :'Object', + :'pagination' => :'UsageAttributionPagination' + } + end + + # List of attributes with nullable: true + def self.openapi_nullable + Set.new([ + :'day', + :'month', + ]) + end + + # Initializes the object + # @param [Hash] attributes Model attributes in the form of hash + def initialize(attributes = {}) + if (!attributes.is_a?(Hash)) + fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::UsageTopAvgMetricsMetadata` initialize method" + end + + # 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)) + fail ArgumentError, "`#{k}` is not a valid attribute in `DatadogAPIClient::V1::UsageTopAvgMetricsMetadata`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect + end + h[k.to_sym] = v + } + + if attributes.key?(:'day') + self.day = attributes[:'day'] + end + + if attributes.key?(:'month') + self.month = attributes[:'month'] + end + + if attributes.key?(:'pagination') + self.pagination = attributes[:'pagination'] + end + end + + # Show invalid properties with the reasons. Usually used together with valid? + # @return Array for valid properties with the reasons + def list_invalid_properties + invalid_properties = Array.new + invalid_properties + end + + # Check to see if the all the properties in the model are valid + # @return true if the model is valid + def valid? + true + end + + # Checks equality by comparing each attribute. + # @param [Object] Object to be compared + def ==(o) + return true if self.equal?(o) + self.class == o.class && + day == o.day && + month == o.month && + pagination == o.pagination + end + + # @see the `==` method + # @param [Object] Object to be compared + def eql?(o) + self == o + end + + # Calculates hash code according to all attributes. + # @return [Integer] Hash code + def hash + [day, month, pagination].hash + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def self.build_from_hash(attributes) + new.build_from_hash(attributes) + end + + # Builds the object from hash + # @param [Hash] attributes Model attributes in the form of hash + # @return [Object] Returns the model itself + def build_from_hash(attributes) + return nil unless attributes.is_a?(Hash) + self.class.openapi_types.each_pair do |key, type| + if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key) + self.send("#{key}=", nil) + elsif type =~ /\AArray<(.*)>/i + # check to ensure the input is an array given that the attribute + # is documented as an array but the input is not + if attributes[self.class.attribute_map[key]].is_a?(Array) + self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) }) + end + elsif !attributes[self.class.attribute_map[key]].nil? + self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]])) + end + end + + self + end + + # Deserializes the data based on type + # @param string type Data type + # @param string value Value to be deserialized + # @return [Object] Deserialized data + def _deserialize(type, value) + case type.to_sym + when :Time + Time.parse(value) + when :Date + Date.parse(value) + when :String + value.to_s + when :Integer + value.to_i + when :Float + value.to_f + when :Boolean + if value.to_s =~ /\A(true|t|yes|y|1)\z/i + true + else + false + end + when :Object + # generic object (usually a Hash), return directly + value + when /\AArray<(?.+)>\z/ + inner_type = Regexp.last_match[:inner_type] + value.map { |v| _deserialize(inner_type, v) } + when /\AHash<(?.+?), (?.+)>\z/ + k_type = Regexp.last_match[:k_type] + v_type = Regexp.last_match[:v_type] + {}.tap do |hash| + value.each do |k, v| + hash[_deserialize(k_type, k)] = _deserialize(v_type, v) + end + end + else # model + # models (e.g. Pet) or oneOf + klass = DatadogAPIClient::V1.const_get(type) + klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value) + end + end + + # Returns the string representation of the object + # @return [String] String presentation of the object + def to_s + to_hash.to_s + end + + # to_body is an alias to to_hash (backward compatibility) + # @return [Hash] Returns the object in the form of hash + def to_body + to_hash + end + + # Returns the object in the form of hash + # @return [Hash] Returns the object in the form of hash + 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}")) + end + + hash[param] = _to_hash(value) + end + hash + end + + # Outputs non-array value in the form of hash + # For object, use to_hash. Otherwise, just return the value + # @param [Object] value Any valid value + # @return [Hash] Returns the value in the form of hash + def _to_hash(value) + if value.is_a?(Array) + value.compact.map { |v| _to_hash(v) } + elsif value.is_a?(Hash) + {}.tap do |hash| + value.each { |k, v| hash[k] = _to_hash(v) } + end + elsif value.respond_to? :to_hash + value.to_hash + else + value + end + end + + end + +end diff --git a/lib/datadog_api_client/v1/models/usage_top_avg_metrics_response.rb b/lib/datadog_api_client/v1/models/usage_top_avg_metrics_response.rb index f3b32d119a46..64e499514f42 100644 --- a/lib/datadog_api_client/v1/models/usage_top_avg_metrics_response.rb +++ b/lib/datadog_api_client/v1/models/usage_top_avg_metrics_response.rb @@ -19,12 +19,15 @@ module DatadogAPIClient::V1 # Response containing the number of hourly recorded custom metrics for a given organization. class UsageTopAvgMetricsResponse + attr_accessor :metadata + # Number of hourly recorded custom metrics for a given organization. attr_accessor :usage # Attribute mapping from ruby-style variable name to JSON key. def self.attribute_map { + :'metadata' => :'metadata', :'usage' => :'usage' } end @@ -37,6 +40,7 @@ def self.acceptable_attributes # Attribute type mapping. def self.openapi_types { + :'metadata' => :'UsageTopAvgMetricsMetadata', :'usage' => :'Array' } end @@ -62,6 +66,10 @@ def initialize(attributes = {}) h[k.to_sym] = v } + if attributes.key?(:'metadata') + self.metadata = attributes[:'metadata'] + end + if attributes.key?(:'usage') if (value = attributes[:'usage']).is_a?(Array) self.usage = value @@ -87,6 +95,7 @@ def valid? def ==(o) return true if self.equal?(o) self.class == o.class && + metadata == o.metadata && usage == o.usage end @@ -99,7 +108,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [usage].hash + [metadata, usage].hash end # Builds the object from hash diff --git a/spec/v1/models/usage_top_avg_metrics_metadata_spec.rb b/spec/v1/models/usage_top_avg_metrics_metadata_spec.rb new file mode 100644 index 000000000000..1a12c7325514 --- /dev/null +++ b/spec/v1/models/usage_top_avg_metrics_metadata_spec.rb @@ -0,0 +1,49 @@ +=begin +#Datadog API V1 Collection + +#Collection of all Datadog Public endpoints. + +The version of the OpenAPI document: 1.0 +Contact: support@datadoghq.com +Generated by: https://openapi-generator.tech + + 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 2020-Present Datadog, Inc. + +=end + +require 'spec_helper' +require 'json' +require 'date' + +# Unit tests for DatadogAPIClient::V1::UsageTopAvgMetricsMetadata +# Automatically generated by openapi-generator (https://openapi-generator.tech) +# Please update as you see appropriate +describe DatadogAPIClient::V1::UsageTopAvgMetricsMetadata do + let(:instance) { DatadogAPIClient::V1::UsageTopAvgMetricsMetadata.new } + + describe 'test an instance of UsageTopAvgMetricsMetadata' do + it 'should create an instance of UsageTopAvgMetricsMetadata' do + expect(instance).to be_instance_of(DatadogAPIClient::V1::UsageTopAvgMetricsMetadata) + end + end + describe 'test attribute "day"' do + it 'should work' do + # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + end + end + + describe 'test attribute "month"' do + it 'should work' do + # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + end + end + + describe 'test attribute "pagination"' do + it 'should work' do + # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers + end + end + +end