Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make type optional for synthetics basic auth model #933

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.2",
"regenerated": "2022-04-01 13:24:31.665250",
"spec_repo_commit": "b42df806"
"regenerated": "2022-04-04 08:22:32.909165",
"spec_repo_commit": "42159e33"
},
"v2": {
"apigentools_version": "1.6.2",
"regenerated": "2022-04-01 13:24:31.680520",
"spec_repo_commit": "b42df806"
"regenerated": "2022-04-04 08:22:32.923119",
"spec_repo_commit": "42159e33"
}
}
}
5 changes: 2 additions & 3 deletions .generator/schemas/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10456,18 +10456,17 @@ components:
properties:
password:
description: Password to use for the basic authentication.
example: ''
example: PaSSw0RD!
type: string
type:
$ref: '#/components/schemas/SyntheticsBasicAuthWebType'
username:
description: Username to use for the basic authentication.
example: ''
example: my_username
type: string
required:
- password
- username
- type
type: object
SyntheticsBasicAuthWebType:
default: web
Expand Down
4 changes: 3 additions & 1 deletion examples/v1/synthetics/TriggerCITests.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
body = SyntheticsCITestBody(
tests=[
SyntheticsCITest(
basic_auth=SyntheticsBasicAuthWeb(password="", type=SyntheticsBasicAuthWebType("web"), username=""),
basic_auth=SyntheticsBasicAuthWeb(
password="PaSSw0RD!", type=SyntheticsBasicAuthWebType("web"), username="my_username"
),
device_ids=[SyntheticsDeviceID("laptop_large")],
locations=["aws:eu-west-3"],
metadata=SyntheticsCIBatchMetadata(
Expand Down
4 changes: 3 additions & 1 deletion examples/v1/synthetics/UpdateBrowserTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
assertions=[],
config_variables=[SyntheticsConfigVariable(name="VARIABLE_NAME", type=SyntheticsConfigVariableType("text"))],
request=SyntheticsTestRequest(
basic_auth=SyntheticsBasicAuthWeb(password="", type=SyntheticsBasicAuthWebType("web"), username=""),
basic_auth=SyntheticsBasicAuthWeb(
password="PaSSw0RD!", type=SyntheticsBasicAuthWebType("web"), username="my_username"
),
certificate=SyntheticsTestRequestCertificate(
cert=SyntheticsTestRequestCertificateItem(), key=SyntheticsTestRequestCertificateItem()
),
Expand Down
2 changes: 1 addition & 1 deletion src/datadog_api_client/v1/model/synthetics_basic_auth.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions tests/v1/features/synthetics.feature
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Feature: Synthetics
@generated @skip @team:DataDog/synthetics-app
Scenario: Create a browser test returns "- JSON format is wrong" response
Given new "CreateSyntheticsBrowserTest" request
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "", "type": "web", "username": ""}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
When the request is sent
Then the response status is 400 - JSON format is wrong

Expand All @@ -49,7 +49,7 @@ Feature: Synthetics
@generated @skip @team:DataDog/synthetics-app
Scenario: Create a browser test returns "Test quota is reached" response
Given new "CreateSyntheticsBrowserTest" request
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "", "type": "web", "username": ""}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
When the request is sent
Then the response status is 402 Test quota is reached

Expand Down Expand Up @@ -213,23 +213,23 @@ Feature: Synthetics
Scenario: Edit a browser test returns "- JSON format is wrong" response
Given new "UpdateBrowserTest" request
And request contains "public_id" parameter from "REPLACE.ME"
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "", "type": "web", "username": ""}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
When the request is sent
Then the response status is 400 - JSON format is wrong

@generated @skip @team:DataDog/synthetics-app
Scenario: Edit a browser test returns "- Synthetic Monitoring is not activated for the user" response
Given new "UpdateBrowserTest" request
And request contains "public_id" parameter from "REPLACE.ME"
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "", "type": "web", "username": ""}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
When the request is sent
Then the response status is 404 - Synthetic Monitoring is not activated for the user

@generated @skip @team:DataDog/synthetics-app
Scenario: Edit a browser test returns "OK" response
Given new "UpdateBrowserTest" request
And request contains "public_id" parameter from "REPLACE.ME"
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "", "type": "web", "username": ""}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
And body with value {"config": {"assertions": [], "configVariables": [{"name": "VARIABLE_NAME", "type": "text"}], "request": {"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "certificate": {"cert": {}, "key": {}}, "method": "GET", "proxy": {"url": "https://example.com"}, "url": "https://example.com"}, "variables": [{"name": "VARIABLE_NAME", "type": "text"}]}, "locations": ["aws:eu-west-3"], "message": "", "name": "Example test name", "options": {"device_ids": ["laptop_large"], "monitor_options": {}, "retry": {}}, "status": "live", "steps": [{"type": "assertElementContent"}], "tags": ["env:prod"], "type": "browser"}
When the request is sent
Then the response status is 200 OK

Expand Down Expand Up @@ -513,13 +513,13 @@ Feature: Synthetics
@generated @skip @team:DataDog/synthetics-app
Scenario: Trigger tests from CI/CD pipelines returns "JSON format is wrong" response
Given new "TriggerCITests" request
And body with value {"tests": [{"basicAuth": {"password": "", "type": "web", "username": ""}, "deviceIds": ["laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
And body with value {"tests": [{"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "deviceIds": ["laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
When the request is sent
Then the response status is 400 JSON format is wrong

@generated @skip @team:DataDog/synthetics-app
Scenario: Trigger tests from CI/CD pipelines returns "OK" response
Given new "TriggerCITests" request
And body with value {"tests": [{"basicAuth": {"password": "", "type": "web", "username": ""}, "deviceIds": ["laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
And body with value {"tests": [{"basicAuth": {"password": "PaSSw0RD!", "type": "web", "username": "my_username"}, "deviceIds": ["laptop_large"], "locations": ["aws:eu-west-3"], "metadata": {"ci": {"pipeline": {}, "provider": {}}, "git": {}}, "public_id": "aaa-aaa-aaa", "retry": {}}]}
When the request is sent
Then the response status is 200 OK