Skip to content

Commit 29cebb6

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
allow variables in port (#2092)
Co-authored-by: ci.datadog-api-spec <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
1 parent ca32b49 commit 29cebb6

File tree

26 files changed

+94
-96
lines changed

26 files changed

+94
-96
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-08-21 21:09:58.342654",
8-
"spec_repo_commit": "46829234"
7+
"regenerated": "2024-08-22 19:11:03.731350",
8+
"spec_repo_commit": "9ce6b1ec"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-08-21 21:09:58.367635",
13-
"spec_repo_commit": "46829234"
12+
"regenerated": "2024-08-22 19:11:03.748705",
13+
"spec_repo_commit": "9ce6b1ec"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16237,10 +16237,7 @@ components:
1623716237
type: string
1623816238
dnsServerPort:
1623916239
description: DNS server port to use for DNS tests.
16240-
format: int32
16241-
maximum: 65535
16242-
minimum: 1
16243-
type: integer
16240+
type: string
1624416241
files:
1624516242
description: Files to be used as part of the request in the test.
1624616243
items:
@@ -16280,8 +16277,7 @@ components:
1628016277
type: boolean
1628116278
port:
1628216279
description: Port to use when performing the test.
16283-
format: int64
16284-
type: integer
16280+
type: string
1628516281
proxy:
1628616282
$ref: '#/components/schemas/SyntheticsTestRequestProxy'
1628716283
query:

examples/v1/synthetics/CreateSyntheticsAPITest_1072503741.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
request=SyntheticsTestRequest(
2727
host="datadoghq.com",
28-
port=443,
28+
port="443",
2929
),
3030
),
3131
locations=[

examples/v1/synthetics/CreateSyntheticsAPITest_1279271422.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
],
100100
request=SyntheticsTestRequest(
101101
host="grpcbin.test.k6.io",
102-
port=9000,
102+
port="9000",
103103
service="grpcbin.GRPCBin",
104104
method="Index",
105105
message="{}",

examples/v1/synthetics/CreateSyntheticsAPITest_1402674167.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
],
3939
request=SyntheticsTestRequest(
4040
host="localhost",
41-
port=50051,
41+
port="50051",
4242
service="Hello",
4343
method="GET",
4444
message="",

examples/v1/synthetics/CreateSyntheticsAPITest_3829801148.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
request=SyntheticsTestRequest(
3434
host="https://datadoghq.com",
3535
message="message",
36-
port=443,
36+
port="443",
3737
),
3838
),
3939
locations=[

src/datadog_api_client/v1/model/synthetics_test_request.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333

3434
class SyntheticsTestRequest(ModelNormal):
3535
validations = {
36-
"dns_server_port": {
37-
"inclusive_maximum": 65535,
38-
"inclusive_minimum": 1,
39-
},
4036
"number_of_packets": {
4137
"inclusive_maximum": 10,
4238
"inclusive_minimum": 0,
@@ -66,7 +62,7 @@ def openapi_types(_):
6662
"compressed_json_descriptor": (str,),
6763
"compressed_proto_file": (str,),
6864
"dns_server": (str,),
69-
"dns_server_port": (int,),
65+
"dns_server_port": (str,),
7066
"files": ([SyntheticsTestRequestBodyFile],),
7167
"follow_redirects": (bool,),
7268
"headers": (SyntheticsTestHeaders,),
@@ -78,7 +74,7 @@ def openapi_types(_):
7874
"no_saving_response_body": (bool,),
7975
"number_of_packets": (int,),
8076
"persist_cookies": (bool,),
81-
"port": (int,),
77+
"port": (str,),
8278
"proxy": (SyntheticsTestRequestProxy,),
8379
"query": (dict,),
8480
"servername": (str,),
@@ -142,7 +138,7 @@ def __init__(
142138
compressed_json_descriptor: Union[str, UnsetType] = unset,
143139
compressed_proto_file: Union[str, UnsetType] = unset,
144140
dns_server: Union[str, UnsetType] = unset,
145-
dns_server_port: Union[int, UnsetType] = unset,
141+
dns_server_port: Union[str, UnsetType] = unset,
146142
files: Union[List[SyntheticsTestRequestBodyFile], UnsetType] = unset,
147143
follow_redirects: Union[bool, UnsetType] = unset,
148144
headers: Union[SyntheticsTestHeaders, UnsetType] = unset,
@@ -154,7 +150,7 @@ def __init__(
154150
no_saving_response_body: Union[bool, UnsetType] = unset,
155151
number_of_packets: Union[int, UnsetType] = unset,
156152
persist_cookies: Union[bool, UnsetType] = unset,
157-
port: Union[int, UnsetType] = unset,
153+
port: Union[str, UnsetType] = unset,
158154
proxy: Union[SyntheticsTestRequestProxy, UnsetType] = unset,
159155
query: Union[dict, UnsetType] = unset,
160156
servername: Union[str, UnsetType] = unset,
@@ -198,7 +194,7 @@ def __init__(
198194
:type dns_server: str, optional
199195
200196
:param dns_server_port: DNS server port to use for DNS tests.
201-
:type dns_server_port: int, optional
197+
:type dns_server_port: str, optional
202198
203199
:param files: Files to be used as part of the request in the test.
204200
:type files: [SyntheticsTestRequestBodyFile], optional
@@ -234,7 +230,7 @@ def __init__(
234230
:type persist_cookies: bool, optional
235231
236232
:param port: Port to use when performing the test.
237-
:type port: int, optional
233+
:type port: str, optional
238234
239235
:param proxy: The proxy to perform the test.
240236
:type proxy: SyntheticsTestRequestProxy, optional
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-08-14T08:58:43.057Z
1+
2024-08-21T13:17:18.467Z

tests/v1/cassettes/test_scenarios/test_create_a_fido_global_variable_returns_ok_response.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ interactions:
22
- request:
33
body: '{"config":{"configVariables":[{"example":"content-type","name":"PROPERTY","pattern":"content-type","type":"text"}],"steps":[{"allowFailure":true,"assertions":[{"operator":"is","target":200,"type":"statusCode"}],"extractedValues":[{"field":"server","name":"EXTRACTED_VALUE","parser":{"type":"raw"},"secure":true,"type":"http_header"}],"isCritical":true,"name":"request
44
is sent","request":{"httpVersion":"http2","method":"GET","timeout":10,"url":"https://datadoghq.com"},"retry":{"count":5,"interval":1000},"subtype":"http"},{"name":"Wait","subtype":"wait","value":1},{"allowFailure":false,"assertions":[{"operator":"lessThan","target":1000,"type":"responseTime"}],"extractedValues":[],"isCritical":true,"name":"GRPC
5-
CALL","request":{"callType":"unary","compressedJsonDescriptor":"eJy1lU1z2yAQhv+Lzj74I3ETH506bQ7OZOSm1w4Wa4epBARQppqM/3v5koCJJdvtxCdW77vPssCO3zMKUgHOFu/ZXvBiS6hZho/f8qe7pftYgXphWJrlA8XwxywEvNba+6PhkC2yVcVVswYp0R6ykRYlZ1SCV21SDrxsssPIeS9FJKqGfK2rqnmmSBwhWa2XlKgtaQPiDcRGCUDVfwGD2sKUqKEtc1cSoOrsMlaMOec1sySYCCgUYRSVLv2zSva2u+FQkB0pVkIw8bFuIudOOn3pOaKYVT3Iy97Pd0AYhOx5QcMsnxvRHlnuLf8ETDd3CNtrv2nejkDpRnANCmGkkFn/hsYzpBKE7jVbufgnKnV9HRM9zRPDDKPttYT61n0TdWkAAjggk9AhuxIeaXd69CYTcsGw7cBTakLVbNpRzGEgyWjkSOpMbZXkhGL6oX30R49qt3GoHrap7i0XdD41WQ+2icCNm5p1hmFqnHNlcla0riKmDZ183crDxChjbnurtxHPRE784sVhWvDfGP+SsTKibU3o5NtWHuZFGZOxP6P5VXqIOvaOSec4eYohyd7NslHuJbd1bewds85xYrNxkr2d+5IhFWF3NvaO684xjE2S5ulY+tu64Pna0fCPJgzw6vF5/WucLcYjt5xoq19O3UDptOg/OamJQRaCcPPnMTQ2QDFn+uhPvUfnCrMc99upyQY4Ui9Dlc/YoG3R/v4Cs9YE+g==","host":"grpcbin.test.k6.io","message":"{}","metadata":{},"method":"Index","port":9000,"service":"grpcbin.GRPCBin"},"retry":{"count":0,"interval":300},"subtype":"grpc"}]},"locations":["aws:us-east-2"],"message":"BDD
6-
test payload: synthetics_api_test_multi_step_payload.json","name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1723625923","options":{"accept_self_signed":false,"allow_insecure":true,"follow_redirects":true,"min_failure_duration":10,"min_location_failed":1,"monitor_name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1723625923","monitor_priority":5,"retry":{"count":3,"interval":1000},"tick_every":60},"subtype":"multi","tags":["testing:api"],"type":"api"}'
5+
CALL","request":{"callType":"unary","compressedJsonDescriptor":"eJy1lU1z2yAQhv+Lzj74I3ETH506bQ7OZOSm1w4Wa4epBARQppqM/3v5koCJJdvtxCdW77vPssCO3zMKUgHOFu/ZXvBiS6hZho/f8qe7pftYgXphWJrlA8XwxywEvNba+6PhkC2yVcVVswYp0R6ykRYlZ1SCV21SDrxsssPIeS9FJKqGfK2rqnmmSBwhWa2XlKgtaQPiDcRGCUDVfwGD2sKUqKEtc1cSoOrsMlaMOec1sySYCCgUYRSVLv2zSva2u+FQkB0pVkIw8bFuIudOOn3pOaKYVT3Iy97Pd0AYhOx5QcMsnxvRHlnuLf8ETDd3CNtrv2nejkDpRnANCmGkkFn/hsYzpBKE7jVbufgnKnV9HRM9zRPDDKPttYT61n0TdWkAAjggk9AhuxIeaXd69CYTcsGw7cBTakLVbNpRzGEgyWjkSOpMbZXkhGL6oX30R49qt3GoHrap7i0XdD41WQ+2icCNm5p1hmFqnHNlcla0riKmDZ183crDxChjbnurtxHPRE784sVhWvDfGP+SsTKibU3o5NtWHuZFGZOxP6P5VXqIOvaOSec4eYohyd7NslHuJbd1bewds85xYrNxkr2d+5IhFWF3NvaO684xjE2S5ulY+tu64Pna0fCPJgzw6vF5/WucLcYjt5xoq19O3UDptOg/OamJQRaCcPPnMTQ2QDFn+uhPvUfnCrMc99upyQY4Ui9Dlc/YoG3R/v4Cs9YE+g==","host":"grpcbin.test.k6.io","message":"{}","metadata":{},"method":"Index","port":"9000","service":"grpcbin.GRPCBin"},"retry":{"count":0,"interval":300},"subtype":"grpc"}]},"locations":["aws:us-east-2"],"message":"BDD
6+
test payload: synthetics_api_test_multi_step_payload.json","name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1724246238","options":{"accept_self_signed":false,"allow_insecure":true,"follow_redirects":true,"min_failure_duration":10,"min_location_failed":1,"monitor_name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1724246238","monitor_priority":5,"retry":{"count":3,"interval":1000},"tick_every":60},"subtype":"multi","tags":["testing:api"],"type":"api"}'
77
headers:
88
accept:
99
- application/json
@@ -13,18 +13,20 @@ interactions:
1313
uri: https://api.datadoghq.com/api/v1/synthetics/tests/api
1414
response:
1515
body:
16-
string: '{"public_id":"ntf-3e2-mti","name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1723625923","status":"live","type":"api","tags":["testing:api"],"created_at":"2024-08-14T08:58:43.764902+00:00","modified_at":"2024-08-14T08:58:43.764902+00:00","config":{"configVariables":[{"example":"content-type","name":"PROPERTY","pattern":"content-type","type":"text"}],"steps":[{"allowFailure":true,"assertions":[{"operator":"is","target":200,"type":"statusCode"}],"extractedValues":[{"field":"server","name":"EXTRACTED_VALUE","parser":{"type":"raw"},"secure":true,"type":"http_header"}],"isCritical":true,"name":"request
17-
is sent","request":{"httpVersion":"http2","method":"GET","timeout":10,"url":"https://datadoghq.com"},"retry":{"count":5,"interval":1000},"subtype":"http","id":"tj8-4ij-ddd"},{"name":"Wait","subtype":"wait","value":1,"id":"w3m-csm-75k"},{"allowFailure":false,"assertions":[{"operator":"lessThan","target":1000,"type":"responseTime"}],"extractedValues":[],"isCritical":true,"name":"GRPC
18-
CALL","request":{"callType":"unary","compressedJsonDescriptor":"eJy1lU1z2yAQhv+Lzj74I3ETH506bQ7OZOSm1w4Wa4epBARQppqM/3v5koCJJdvtxCdW77vPssCO3zMKUgHOFu/ZXvBiS6hZho/f8qe7pftYgXphWJrlA8XwxywEvNba+6PhkC2yVcVVswYp0R6ykRYlZ1SCV21SDrxsssPIeS9FJKqGfK2rqnmmSBwhWa2XlKgtaQPiDcRGCUDVfwGD2sKUqKEtc1cSoOrsMlaMOec1sySYCCgUYRSVLv2zSva2u+FQkB0pVkIw8bFuIudOOn3pOaKYVT3Iy97Pd0AYhOx5QcMsnxvRHlnuLf8ETDd3CNtrv2nejkDpRnANCmGkkFn/hsYzpBKE7jVbufgnKnV9HRM9zRPDDKPttYT61n0TdWkAAjggk9AhuxIeaXd69CYTcsGw7cBTakLVbNpRzGEgyWjkSOpMbZXkhGL6oX30R49qt3GoHrap7i0XdD41WQ+2icCNm5p1hmFqnHNlcla0riKmDZ183crDxChjbnurtxHPRE784sVhWvDfGP+SsTKibU3o5NtWHuZFGZOxP6P5VXqIOvaOSec4eYohyd7NslHuJbd1bewds85xYrNxkr2d+5IhFWF3NvaO684xjE2S5ulY+tu64Pna0fCPJgzw6vF5/WucLcYjt5xoq19O3UDptOg/OamJQRaCcPPnMTQ2QDFn+uhPvUfnCrMc99upyQY4Ui9Dlc/YoG3R/v4Cs9YE+g==","host":"grpcbin.test.k6.io","message":"{}","metadata":{},"method":"Index","port":9000,"service":"grpcbin.GRPCBin"},"retry":{"count":0,"interval":300},"subtype":"grpc","id":"h3x-7i4-rcp"}]},"message":"BDD
19-
test payload: synthetics_api_test_multi_step_payload.json","options":{"accept_self_signed":false,"allow_insecure":true,"follow_redirects":true,"min_failure_duration":10,"min_location_failed":1,"monitor_name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1723625923","monitor_priority":5,"retry":{"count":3,"interval":1000},"tick_every":60},"locations":["aws:us-east-2"],"subtype":"multi","created_by":{"name":null,"handle":"[email protected]","email":"[email protected]"},"deleted_at":null,"monitor_id":151290037,"org_id":321813,"modified_by":{"name":null,"handle":"[email protected]","email":"[email protected]"}}'
16+
string: '{"public_id":"yvw-pgh-sk7","name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1724246238","status":"live","type":"api","tags":["testing:api"],"created_at":"2024-08-21T13:17:19.015080+00:00","modified_at":"2024-08-21T13:17:19.015080+00:00","config":{"configVariables":[{"example":"content-type","name":"PROPERTY","pattern":"content-type","type":"text"}],"steps":[{"allowFailure":true,"assertions":[{"operator":"is","target":200,"type":"statusCode"}],"extractedValues":[{"field":"server","name":"EXTRACTED_VALUE","parser":{"type":"raw"},"secure":true,"type":"http_header"}],"isCritical":true,"name":"request
17+
is sent","request":{"httpVersion":"http2","method":"GET","timeout":10,"url":"https://datadoghq.com"},"retry":{"count":5,"interval":1000},"subtype":"http","id":"gam-njf-7gp"},{"name":"Wait","subtype":"wait","value":1,"id":"y9u-9hp-bqu"},{"allowFailure":false,"assertions":[{"operator":"lessThan","target":1000,"type":"responseTime"}],"extractedValues":[],"isCritical":true,"name":"GRPC
18+
CALL","request":{"callType":"unary","compressedJsonDescriptor":"eJy1lU1z2yAQhv+Lzj74I3ETH506bQ7OZOSm1w4Wa4epBARQppqM/3v5koCJJdvtxCdW77vPssCO3zMKUgHOFu/ZXvBiS6hZho/f8qe7pftYgXphWJrlA8XwxywEvNba+6PhkC2yVcVVswYp0R6ykRYlZ1SCV21SDrxsssPIeS9FJKqGfK2rqnmmSBwhWa2XlKgtaQPiDcRGCUDVfwGD2sKUqKEtc1cSoOrsMlaMOec1sySYCCgUYRSVLv2zSva2u+FQkB0pVkIw8bFuIudOOn3pOaKYVT3Iy97Pd0AYhOx5QcMsnxvRHlnuLf8ETDd3CNtrv2nejkDpRnANCmGkkFn/hsYzpBKE7jVbufgnKnV9HRM9zRPDDKPttYT61n0TdWkAAjggk9AhuxIeaXd69CYTcsGw7cBTakLVbNpRzGEgyWjkSOpMbZXkhGL6oX30R49qt3GoHrap7i0XdD41WQ+2icCNm5p1hmFqnHNlcla0riKmDZ183crDxChjbnurtxHPRE784sVhWvDfGP+SsTKibU3o5NtWHuZFGZOxP6P5VXqIOvaOSec4eYohyd7NslHuJbd1bewds85xYrNxkr2d+5IhFWF3NvaO684xjE2S5ulY+tu64Pna0fCPJgzw6vF5/WucLcYjt5xoq19O3UDptOg/OamJQRaCcPPnMTQ2QDFn+uhPvUfnCrMc99upyQY4Ui9Dlc/YoG3R/v4Cs9YE+g==","host":"grpcbin.test.k6.io","message":"{}","metadata":{},"method":"Index","port":"9000","service":"grpcbin.GRPCBin"},"retry":{"count":0,"interval":300},"subtype":"grpc","id":"bcb-fqr-bhg"}]},"message":"BDD
19+
test payload: synthetics_api_test_multi_step_payload.json","options":{"accept_self_signed":false,"allow_insecure":true,"follow_redirects":true,"min_failure_duration":10,"min_location_failed":1,"monitor_name":"Test-Create_a_FIDO_global_variable_returns_OK_response-1724246238","monitor_priority":5,"retry":{"count":3,"interval":1000},"tick_every":60},"locations":["aws:us-east-2"],"subtype":"multi","created_by":{"name":"CI
20+
Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"[email protected]"},"deleted_at":null,"monitor_id":151908777,"org_id":321813,"modified_by":{"name":"CI
21+
Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"[email protected]"}}'
2022
headers:
2123
content-type:
2224
- application/json
2325
status:
2426
code: 200
2527
message: OK
2628
- request:
27-
body: '{"description":"","is_fido":true,"name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1723625923","tags":[]}'
29+
body: '{"description":"","is_fido":true,"name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1724246238","tags":[]}'
2830
headers:
2931
accept:
3032
- application/json
@@ -34,7 +36,7 @@ interactions:
3436
uri: https://api.datadoghq.com/api/v1/synthetics/variables
3537
response:
3638
body:
37-
string: '{"id":"bf2cc5f0-2529-433c-b892-84e83e13a759","name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1723625923","description":"","type":"variable","tags":[],"last_error":null,"is_fido":true,"value":{"secure":true}}
39+
string: '{"id":"07e4657c-34e0-4815-b906-449c9f28ab5a","name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1724246238","description":"","type":"variable","tags":[],"last_error":null,"is_fido":true,"value":{"secure":true}}
3840
3941
'
4042
headers:
@@ -49,7 +51,7 @@ interactions:
4951
accept:
5052
- '*/*'
5153
method: DELETE
52-
uri: https://api.datadoghq.com/api/v1/synthetics/variables/bf2cc5f0-2529-433c-b892-84e83e13a759
54+
uri: https://api.datadoghq.com/api/v1/synthetics/variables/07e4657c-34e0-4815-b906-449c9f28ab5a
5355
response:
5456
body:
5557
string: ''
@@ -60,7 +62,7 @@ interactions:
6062
code: 200
6163
message: OK
6264
- request:
63-
body: '{"public_ids":["ntf-3e2-mti"]}'
65+
body: '{"public_ids":["yvw-pgh-sk7"]}'
6466
headers:
6567
accept:
6668
- application/json
@@ -70,7 +72,7 @@ interactions:
7072
uri: https://api.datadoghq.com/api/v1/synthetics/tests/delete
7173
response:
7274
body:
73-
string: '{"deleted_tests":[{"public_id":"ntf-3e2-mti","deleted_at":"2024-08-14T08:58:45.504158+00:00"}]}
75+
string: '{"deleted_tests":[{"public_id":"yvw-pgh-sk7","deleted_at":"2024-08-21T13:17:21.136962+00:00"}]}
7476
7577
'
7678
headers:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-08-01T17:00:57.470Z
1+
2024-08-21T13:12:21.158Z

0 commit comments

Comments
 (0)