Skip to content

Commit

Permalink
allow variables in port (#2092)
Browse files Browse the repository at this point in the history
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
  • Loading branch information
api-clients-generation-pipeline[bot] and ci.datadog-api-spec committed Aug 22, 2024
1 parent ca32b49 commit 29cebb6
Show file tree
Hide file tree
Showing 26 changed files with 94 additions and 96 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-21 21:09:58.342654",
"spec_repo_commit": "46829234"
"regenerated": "2024-08-22 19:11:03.731350",
"spec_repo_commit": "9ce6b1ec"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-21 21:09:58.367635",
"spec_repo_commit": "46829234"
"regenerated": "2024-08-22 19:11:03.748705",
"spec_repo_commit": "9ce6b1ec"
}
}
}
8 changes: 2 additions & 6 deletions .generator/schemas/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16237,10 +16237,7 @@ components:
type: string
dnsServerPort:
description: DNS server port to use for DNS tests.
format: int32
maximum: 65535
minimum: 1
type: integer
type: string
files:
description: Files to be used as part of the request in the test.
items:
Expand Down Expand Up @@ -16280,8 +16277,7 @@ components:
type: boolean
port:
description: Port to use when performing the test.
format: int64
type: integer
type: string
proxy:
$ref: '#/components/schemas/SyntheticsTestRequestProxy'
query:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
],
request=SyntheticsTestRequest(
host="datadoghq.com",
port=443,
port="443",
),
),
locations=[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
],
request=SyntheticsTestRequest(
host="grpcbin.test.k6.io",
port=9000,
port="9000",
service="grpcbin.GRPCBin",
method="Index",
message="{}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
request=SyntheticsTestRequest(
host="localhost",
port=50051,
port="50051",
service="Hello",
method="GET",
message="",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
request=SyntheticsTestRequest(
host="https://datadoghq.com",
message="message",
port=443,
port="443",
),
),
locations=[
Expand Down
16 changes: 6 additions & 10 deletions src/datadog_api_client/v1/model/synthetics_test_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@

class SyntheticsTestRequest(ModelNormal):
validations = {
"dns_server_port": {
"inclusive_maximum": 65535,
"inclusive_minimum": 1,
},
"number_of_packets": {
"inclusive_maximum": 10,
"inclusive_minimum": 0,
Expand Down Expand Up @@ -66,7 +62,7 @@ def openapi_types(_):
"compressed_json_descriptor": (str,),
"compressed_proto_file": (str,),
"dns_server": (str,),
"dns_server_port": (int,),
"dns_server_port": (str,),
"files": ([SyntheticsTestRequestBodyFile],),
"follow_redirects": (bool,),
"headers": (SyntheticsTestHeaders,),
Expand All @@ -78,7 +74,7 @@ def openapi_types(_):
"no_saving_response_body": (bool,),
"number_of_packets": (int,),
"persist_cookies": (bool,),
"port": (int,),
"port": (str,),
"proxy": (SyntheticsTestRequestProxy,),
"query": (dict,),
"servername": (str,),
Expand Down Expand Up @@ -142,7 +138,7 @@ def __init__(
compressed_json_descriptor: Union[str, UnsetType] = unset,
compressed_proto_file: Union[str, UnsetType] = unset,
dns_server: Union[str, UnsetType] = unset,
dns_server_port: Union[int, UnsetType] = unset,
dns_server_port: Union[str, UnsetType] = unset,
files: Union[List[SyntheticsTestRequestBodyFile], UnsetType] = unset,
follow_redirects: Union[bool, UnsetType] = unset,
headers: Union[SyntheticsTestHeaders, UnsetType] = unset,
Expand All @@ -154,7 +150,7 @@ def __init__(
no_saving_response_body: Union[bool, UnsetType] = unset,
number_of_packets: Union[int, UnsetType] = unset,
persist_cookies: Union[bool, UnsetType] = unset,
port: Union[int, UnsetType] = unset,
port: Union[str, UnsetType] = unset,
proxy: Union[SyntheticsTestRequestProxy, UnsetType] = unset,
query: Union[dict, UnsetType] = unset,
servername: Union[str, UnsetType] = unset,
Expand Down Expand Up @@ -198,7 +194,7 @@ def __init__(
:type dns_server: str, optional
:param dns_server_port: DNS server port to use for DNS tests.
:type dns_server_port: int, optional
:type dns_server_port: str, optional
:param files: Files to be used as part of the request in the test.
:type files: [SyntheticsTestRequestBodyFile], optional
Expand Down Expand Up @@ -234,7 +230,7 @@ def __init__(
:type persist_cookies: bool, optional
:param port: Port to use when performing the test.
:type port: int, optional
:type port: str, optional
:param proxy: The proxy to perform the test.
:type proxy: SyntheticsTestRequestProxy, optional
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-08-14T08:58:43.057Z
2024-08-21T13:17:18.467Z
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ interactions:
- request:
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
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
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
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"}'
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
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"}'
headers:
accept:
- application/json
Expand All @@ -13,18 +13,20 @@ interactions:
uri: https://api.datadoghq.com/api/v1/synthetics/tests/api
response:
body:
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
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
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
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":"frog@datadoghq.com","email":"frog@datadoghq.com"},"deleted_at":null,"monitor_id":151290037,"org_id":321813,"modified_by":{"name":null,"handle":"frog@datadoghq.com","email":"frog@datadoghq.com"}}'
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
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
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
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
Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com"},"deleted_at":null,"monitor_id":151908777,"org_id":321813,"modified_by":{"name":"CI
Account","handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","email":"team-intg-tools-libs-spam@datadoghq.com"}}'
headers:
content-type:
- application/json
status:
code: 200
message: OK
- request:
body: '{"description":"","is_fido":true,"name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1723625923","tags":[]}'
body: '{"description":"","is_fido":true,"name":"GLOBAL_VARIABLE_FIDO_PAYLOAD_TESTCREATEAFIDOGLOBALVARIABLERETURNSOKRESPONSE1724246238","tags":[]}'
headers:
accept:
- application/json
Expand All @@ -34,7 +36,7 @@ interactions:
uri: https://api.datadoghq.com/api/v1/synthetics/variables
response:
body:
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}}
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}}
'
headers:
Expand All @@ -49,7 +51,7 @@ interactions:
accept:
- '*/*'
method: DELETE
uri: https://api.datadoghq.com/api/v1/synthetics/variables/bf2cc5f0-2529-433c-b892-84e83e13a759
uri: https://api.datadoghq.com/api/v1/synthetics/variables/07e4657c-34e0-4815-b906-449c9f28ab5a
response:
body:
string: ''
Expand All @@ -60,7 +62,7 @@ interactions:
code: 200
message: OK
- request:
body: '{"public_ids":["ntf-3e2-mti"]}'
body: '{"public_ids":["yvw-pgh-sk7"]}'
headers:
accept:
- application/json
Expand All @@ -70,7 +72,7 @@ interactions:
uri: https://api.datadoghq.com/api/v1/synthetics/tests/delete
response:
body:
string: '{"deleted_tests":[{"public_id":"ntf-3e2-mti","deleted_at":"2024-08-14T08:58:45.504158+00:00"}]}
string: '{"deleted_tests":[{"public_id":"yvw-pgh-sk7","deleted_at":"2024-08-21T13:17:21.136962+00:00"}]}
'
headers:
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-08-01T17:00:57.470Z
2024-08-21T13:12:21.158Z
Loading

0 comments on commit 29cebb6

Please sign in to comment.