Skip to content

Commit a8d45fa

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Add compression_method field to Log Archives (DataDog#3277)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 40b3b6e commit a8d45fa

8 files changed

Lines changed: 74 additions & 7 deletions

File tree

.generator/schemas/v2/openapi.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41615,6 +41615,8 @@ components:
4161541615
LogsArchiveAttributes:
4161641616
description: The attributes associated with the archive.
4161741617
properties:
41618+
compression_method:
41619+
$ref: "#/components/schemas/LogsArchiveAttributesCompressionMethod"
4161841620
destination:
4161941621
$ref: "#/components/schemas/LogsArchiveDestination"
4162041622
include_tags:
@@ -41652,6 +41654,17 @@ components:
4165241654
- query
4165341655
- destination
4165441656
type: object
41657+
LogsArchiveAttributesCompressionMethod:
41658+
default: GZIP
41659+
description: The type of compression for the archive.
41660+
enum:
41661+
- GZIP
41662+
- ZSTD
41663+
example: GZIP
41664+
type: string
41665+
x-enum-varnames:
41666+
- GZIP
41667+
- ZSTD
4165541668
LogsArchiveCreateRequest:
4165641669
description: The logs archive.
4165741670
properties:
@@ -41661,6 +41674,8 @@ components:
4166141674
LogsArchiveCreateRequestAttributes:
4166241675
description: The attributes associated with the archive.
4166341676
properties:
41677+
compression_method:
41678+
$ref: "#/components/schemas/LogsArchiveAttributesCompressionMethod"
4166441679
destination:
4166541680
$ref: "#/components/schemas/LogsArchiveCreateRequestDestination"
4166641681
include_tags:
@@ -111745,6 +111760,7 @@ paths:
111745111760
value:
111746111761
data:
111747111762
attributes:
111763+
compression_method: GZIP
111748111764
destination:
111749111765
container: container-name
111750111766
storage_account: account-name
@@ -111918,6 +111934,7 @@ paths:
111918111934
value:
111919111935
data:
111920111936
attributes:
111937+
compression_method: GZIP
111921111938
destination:
111922111939
container: container-name
111923111940
storage_account: account-name

examples/v2/logs-archives/CreateLogsArchive.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
body = DatadogAPIClient::V2::LogsArchiveCreateRequest.new({
77
data: DatadogAPIClient::V2::LogsArchiveCreateRequestDefinition.new({
88
attributes: DatadogAPIClient::V2::LogsArchiveCreateRequestAttributes.new({
9+
compression_method: DatadogAPIClient::V2::LogsArchiveAttributesCompressionMethod::GZIP,
910
destination: DatadogAPIClient::V2::LogsArchiveDestinationAzure.new({
1011
container: "container-name",
1112
integration: DatadogAPIClient::V2::LogsArchiveIntegrationAzure.new({

examples/v2/logs-archives/UpdateLogsArchive.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
body = DatadogAPIClient::V2::LogsArchiveCreateRequest.new({
77
data: DatadogAPIClient::V2::LogsArchiveCreateRequestDefinition.new({
88
attributes: DatadogAPIClient::V2::LogsArchiveCreateRequestAttributes.new({
9+
compression_method: DatadogAPIClient::V2::LogsArchiveAttributesCompressionMethod::GZIP,
910
destination: DatadogAPIClient::V2::LogsArchiveDestinationAzure.new({
1011
container: "container-name",
1112
integration: DatadogAPIClient::V2::LogsArchiveIntegrationAzure.new({

features/v2/logs_archives.feature

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ Feature: Logs Archives
1212
@generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
1313
Scenario: Create an archive returns "Bad Request" response
1414
Given new "CreateLogsArchive" request
15-
And body with value {"data": {"attributes": {"destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
15+
And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
1616
When the request is sent
1717
Then the response status is 400 Bad Request
1818

1919
@generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
2020
Scenario: Create an archive returns "OK" response
2121
Given new "CreateLogsArchive" request
22-
And body with value {"data": {"attributes": {"destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
22+
And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
2323
When the request is sent
2424
Then the response status is 200 OK
2525

@@ -150,23 +150,23 @@ Feature: Logs Archives
150150
Scenario: Update an archive returns "Bad Request" response
151151
Given new "UpdateLogsArchive" request
152152
And request contains "archive_id" parameter from "REPLACE.ME"
153-
And body with value {"data": {"attributes": {"destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
153+
And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
154154
When the request is sent
155155
Then the response status is 400 Bad Request
156156

157157
@generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
158158
Scenario: Update an archive returns "Not found" response
159159
Given new "UpdateLogsArchive" request
160160
And request contains "archive_id" parameter from "REPLACE.ME"
161-
And body with value {"data": {"attributes": {"destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
161+
And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
162162
When the request is sent
163163
Then the response status is 404 Not found
164164

165165
@generated @skip @team:DataDog/logs-backend @team:DataDog/logs-forwarding
166166
Scenario: Update an archive returns "OK" response
167167
Given new "UpdateLogsArchive" request
168168
And request contains "archive_id" parameter from "REPLACE.ME"
169-
And body with value {"data": {"attributes": {"destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
169+
And body with value {"data": {"attributes": {"compression_method": "GZIP", "destination": {"container": "container-name", "integration": {"client_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa", "tenant_id": "aaaaaaaa-1a1a-1a1a-1a1a-aaaaaaaaaaaa"}, "storage_account": "account-name", "type": "azure"}, "include_tags": false, "name": "Nginx Archive", "query": "source:nginx", "rehydration_max_scan_size_in_gb": 100, "rehydration_tags": ["team:intake", "team:app"]}, "type": "archives"}}
170170
When the request is sent
171171
Then the response status is 200 OK
172172

lib/datadog_api_client/inflector.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3634,6 +3634,7 @@ def overrides
36343634
"v2.logs_aggregation_function" => "LogsAggregationFunction",
36353635
"v2.logs_archive" => "LogsArchive",
36363636
"v2.logs_archive_attributes" => "LogsArchiveAttributes",
3637+
"v2.logs_archive_attributes_compression_method" => "LogsArchiveAttributesCompressionMethod",
36373638
"v2.logs_archive_create_request" => "LogsArchiveCreateRequest",
36383639
"v2.logs_archive_create_request_attributes" => "LogsArchiveCreateRequestAttributes",
36393640
"v2.logs_archive_create_request_definition" => "LogsArchiveCreateRequestDefinition",

lib/datadog_api_client/v2/models/logs_archive_attributes.rb

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ module DatadogAPIClient::V2
2121
class LogsArchiveAttributes
2222
include BaseGenericModel
2323

24+
# The type of compression for the archive.
25+
attr_accessor :compression_method
26+
2427
# An archive's destination.
2528
attr_accessor :destination
2629

@@ -49,6 +52,7 @@ class LogsArchiveAttributes
4952
# @!visibility private
5053
def self.attribute_map
5154
{
55+
:'compression_method' => :'compression_method',
5256
:'destination' => :'destination',
5357
:'include_tags' => :'include_tags',
5458
:'name' => :'name',
@@ -63,6 +67,7 @@ def self.attribute_map
6367
# @!visibility private
6468
def self.openapi_types
6569
{
70+
:'compression_method' => :'LogsArchiveAttributesCompressionMethod',
6671
:'destination' => :'LogsArchiveDestination',
6772
:'include_tags' => :'Boolean',
6873
:'name' => :'String',
@@ -100,6 +105,10 @@ def initialize(attributes = {})
100105
end
101106
}
102107

108+
if attributes.key?(:'compression_method')
109+
self.compression_method = attributes[:'compression_method']
110+
end
111+
103112
if attributes.key?(:'destination')
104113
self.destination = attributes[:'destination']
105114
end
@@ -186,6 +195,7 @@ def to_hash
186195
def ==(o)
187196
return true if self.equal?(o)
188197
self.class == o.class &&
198+
compression_method == o.compression_method &&
189199
destination == o.destination &&
190200
include_tags == o.include_tags &&
191201
name == o.name &&
@@ -200,7 +210,7 @@ def ==(o)
200210
# @return [Integer] Hash code
201211
# @!visibility private
202212
def hash
203-
[destination, include_tags, name, query, rehydration_max_scan_size_in_gb, rehydration_tags, state, additional_properties].hash
213+
[compression_method, destination, include_tags, name, query, rehydration_max_scan_size_in_gb, rehydration_tags, state, additional_properties].hash
204214
end
205215
end
206216
end
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
=begin
2+
#Datadog API V2 Collection
3+
4+
#Collection of all Datadog Public endpoints.
5+
6+
The version of the OpenAPI document: 1.0
7+
Contact: support@datadoghq.com
8+
Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
9+
10+
Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
11+
This product includes software developed at Datadog (https://www.datadoghq.com/).
12+
Copyright 2020-Present Datadog, Inc.
13+
14+
=end
15+
16+
require 'date'
17+
require 'time'
18+
19+
module DatadogAPIClient::V2
20+
# The type of compression for the archive.
21+
class LogsArchiveAttributesCompressionMethod
22+
include BaseEnumModel
23+
24+
GZIP = "GZIP".freeze
25+
ZSTD = "ZSTD".freeze
26+
end
27+
end

lib/datadog_api_client/v2/models/logs_archive_create_request_attributes.rb

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ module DatadogAPIClient::V2
2121
class LogsArchiveCreateRequestAttributes
2222
include BaseGenericModel
2323

24+
# The type of compression for the archive.
25+
attr_accessor :compression_method
26+
2427
# An archive's destination.
2528
attr_reader :destination
2629

@@ -46,6 +49,7 @@ class LogsArchiveCreateRequestAttributes
4649
# @!visibility private
4750
def self.attribute_map
4851
{
52+
:'compression_method' => :'compression_method',
4953
:'destination' => :'destination',
5054
:'include_tags' => :'include_tags',
5155
:'name' => :'name',
@@ -59,6 +63,7 @@ def self.attribute_map
5963
# @!visibility private
6064
def self.openapi_types
6165
{
66+
:'compression_method' => :'LogsArchiveAttributesCompressionMethod',
6267
:'destination' => :'LogsArchiveCreateRequestDestination',
6368
:'include_tags' => :'Boolean',
6469
:'name' => :'String',
@@ -94,6 +99,10 @@ def initialize(attributes = {})
9499
end
95100
}
96101

102+
if attributes.key?(:'compression_method')
103+
self.compression_method = attributes[:'compression_method']
104+
end
105+
97106
if attributes.key?(:'destination')
98107
self.destination = attributes[:'destination']
99108
end
@@ -187,6 +196,7 @@ def to_hash
187196
def ==(o)
188197
return true if self.equal?(o)
189198
self.class == o.class &&
199+
compression_method == o.compression_method &&
190200
destination == o.destination &&
191201
include_tags == o.include_tags &&
192202
name == o.name &&
@@ -200,7 +210,7 @@ def ==(o)
200210
# @return [Integer] Hash code
201211
# @!visibility private
202212
def hash
203-
[destination, include_tags, name, query, rehydration_max_scan_size_in_gb, rehydration_tags, additional_properties].hash
213+
[compression_method, destination, include_tags, name, query, rehydration_max_scan_size_in_gb, rehydration_tags, additional_properties].hash
204214
end
205215
end
206216
end

0 commit comments

Comments
 (0)