Skip to content

Commit

Permalink
Fix failing tests in CI (#2498)
Browse files Browse the repository at this point in the history
Co-authored-by: ci.datadog-api-spec <[email protected]>
  • Loading branch information
api-clients-generation-pipeline[bot] and ci.datadog-api-spec authored May 20, 2024
1 parent a113f95 commit fe6ccdd
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 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-05-17 20:25:16.081111",
"spec_repo_commit": "77064b00"
"regenerated": "2024-05-20 18:10:24.268068",
"spec_repo_commit": "6340fda5"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-05-17 20:25:16.099343",
"spec_repo_commit": "77064b00"
"regenerated": "2024-05-20 18:10:24.286542",
"spec_repo_commit": "6340fda5"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func main() {
Attributes: datadogV2.SecurityMonitoringSuppressionCreateAttributes{
Description: datadog.PtrString("This rule suppresses low-severity signals in staging environments."),
Enabled: true,
ExpirationDate: datadog.PtrInt64(1703187336000),
ExpirationDate: datadog.PtrInt64(1638443471000),
Name: "Example-Security-Monitoring",
RuleQuery: "type:log_detection source:cloudtrail",
SuppressionQuery: datadog.PtrString("env:staging status:low"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func main() {
Attributes: datadogV2.SecurityMonitoringSuppressionCreateAttributes{
Description: datadog.PtrString("This rule suppresses low-severity signals in staging environments."),
Enabled: true,
ExpirationDate: datadog.PtrInt64(1703187336000),
ExpirationDate: datadog.PtrInt64(1638443471000),
Name: "Example-Security-Monitoring",
RuleQuery: "type:log_detection source:cloudtrail",
DataExclusionQuery: datadog.PtrString("account_id:12345"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-05-10T16:34:35.792Z
2024-05-20T17:07:03.155Z
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: |
{"data":{"attributes":{"description":"This rule suppresses low-severity signals in staging environments.","enabled":true,"expiration_date":1703187336000,"name":"Test-Create_a_suppression_rule_returns_OK_response-1715358875","rule_query":"type:log_detection source:cloudtrail","suppression_query":"env:staging status:low"},"type":"suppressions"}}
{"data":{"attributes":{"description":"This rule suppresses low-severity signals in staging environments.","enabled":true,"expiration_date":1718039223000,"name":"Test-Create_a_suppression_rule_returns_OK_response-1716224823","rule_query":"type:log_detection source:cloudtrail","suppression_query":"env:staging status:low"},"type":"suppressions"}}
form: {}
headers:
Accept:
Expand All @@ -12,9 +12,9 @@ interactions:
method: POST
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions
response:
body: '{"data":{"id":"lzo-uda-vpz","attributes":{"name":"Test-Create_a_suppression_rule_returns_OK_response-1715358875","enabled":true,"description":"This
body: '{"data":{"id":"8qj-mmz-zym","attributes":{"name":"Test-Create_a_suppression_rule_returns_OK_response-1716224823","enabled":true,"description":"This
rule suppresses low-severity signals in staging environments.","rule_query":"type:log_detection
source:cloudtrail","suppression_query":"env:staging status:low","data_exclusion_query":"","expiration_date":1703187336000,"version":1,"creation_date":1715358876178,"update_date":1715358876178,"creator":{"name":null,"handle":"[email protected]"},"updater":{"name":null,"handle":"[email protected]"}},"type":"suppressions"}}
source:cloudtrail","suppression_query":"env:staging status:low","data_exclusion_query":"","expiration_date":1718039223000,"version":1,"creation_date":1716224823374,"update_date":1716224823374,"creator":{"name":null,"handle":"[email protected]"},"updater":{"name":null,"handle":"[email protected]"}},"type":"suppressions"}}
'
code: 200
Expand All @@ -31,7 +31,7 @@ interactions:
- '*/*'
id: 1
method: DELETE
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions/lzo-uda-vpz
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions/8qj-mmz-zym
response:
body: ''
code: 204
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-05-10T16:34:36.621Z
2024-05-20T17:07:12.131Z
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: |
{"data":{"attributes":{"data_exclusion_query":"account_id:12345","description":"This rule suppresses low-severity signals in staging environments.","enabled":true,"expiration_date":1703187336000,"name":"Test-Create_a_suppression_rule_with_an_exclusion_query_returns_OK_response-1715358876","rule_query":"type:log_detection source:cloudtrail"},"type":"suppressions"}}
{"data":{"attributes":{"data_exclusion_query":"account_id:12345","description":"This rule suppresses low-severity signals in staging environments.","enabled":true,"expiration_date":1718039232000,"name":"Test-Create_a_suppression_rule_with_an_exclusion_query_returns_OK_response-1716224832","rule_query":"type:log_detection source:cloudtrail"},"type":"suppressions"}}
form: {}
headers:
Accept:
Expand All @@ -12,9 +12,9 @@ interactions:
method: POST
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions
response:
body: '{"data":{"id":"ted-g18-ebn","attributes":{"name":"Test-Create_a_suppression_rule_with_an_exclusion_query_returns_OK_response-1715358876","enabled":true,"description":"This
body: '{"data":{"id":"i9m-nqb-ets","attributes":{"name":"Test-Create_a_suppression_rule_with_an_exclusion_query_returns_OK_response-1716224832","enabled":true,"description":"This
rule suppresses low-severity signals in staging environments.","rule_query":"type:log_detection
source:cloudtrail","suppression_query":"","data_exclusion_query":"account_id:12345","expiration_date":1703187336000,"version":1,"creation_date":1715358876924,"update_date":1715358876924,"creator":{"name":null,"handle":"[email protected]"},"updater":{"name":null,"handle":"[email protected]"}},"type":"suppressions"}}
source:cloudtrail","suppression_query":"","data_exclusion_query":"account_id:12345","expiration_date":1718039232000,"version":1,"creation_date":1716224832354,"update_date":1716224832355,"creator":{"name":null,"handle":"[email protected]"},"updater":{"name":null,"handle":"[email protected]"}},"type":"suppressions"}}
'
code: 200
Expand All @@ -31,7 +31,7 @@ interactions:
- '*/*'
id: 1
method: DELETE
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions/ted-g18-ebn
url: https://api.datadoghq.com/api/v2/security_monitoring/configuration/suppressions/i9m-nqb-ets
response:
body: ''
code: 204
Expand Down
2 changes: 1 addition & 1 deletion tests/scenarios/features/v1/synthetics.feature
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Feature: Synthetics
When the request is sent
Then the response status is 200 OK

@team:DataDog/synthetics-app
@replay-only @team:DataDog/synthetics-app
Scenario: Create a private location returns "OK" response
Given there is a valid "role" in the system
And new "CreatePrivateLocation" request
Expand Down
4 changes: 2 additions & 2 deletions tests/scenarios/features/v2/security_monitoring.feature
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ Feature: Security Monitoring
@skip-validation @team:DataDog/k9-cloud-security-platform
Scenario: Create a suppression rule returns "OK" response
Given new "CreateSecurityMonitoringSuppression" request
And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": 1703187336000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "suppression_query": "env:staging status:low"}, "type": "suppressions"}}
And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": {{ timestamp('now + 21d') }}000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "suppression_query": "env:staging status:low"}, "type": "suppressions"}}
When the request is sent
Then the response status is 200 OK
And the response "data.type" is equal to "suppressions"
Expand All @@ -184,7 +184,7 @@ Feature: Security Monitoring
@skip-validation @team:DataDog/k9-cloud-security-platform
Scenario: Create a suppression rule with an exclusion query returns "OK" response
Given new "CreateSecurityMonitoringSuppression" request
And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": 1703187336000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "data_exclusion_query": "account_id:12345"}, "type": "suppressions"}}
And body with value {"data": {"attributes": {"description": "This rule suppresses low-severity signals in staging environments.", "enabled": true, "expiration_date": {{ timestamp('now + 21d') }}000, "name": "{{ unique }}", "rule_query": "type:log_detection source:cloudtrail", "data_exclusion_query": "account_id:12345"}, "type": "suppressions"}}
When the request is sent
Then the response status is 200 OK
And the response "data.type" is equal to "suppressions"
Expand Down

0 comments on commit fe6ccdd

Please sign in to comment.