Skip to content

Commit 7af4f08

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
and
ci.datadog-api-spec
authored
GA Security Monitoring Rule Converter (#1700)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 04c87cf commit 7af4f08

File tree

7 files changed

+6
-43
lines changed

7 files changed

+6
-43
lines changed

.apigentools-info

+4-4
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-07-19 17:23:33.461436",
8-
"spec_repo_commit": "e7026d11"
7+
"regenerated": "2024-07-19 18:52:00.199715",
8+
"spec_repo_commit": "be099b30"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-07-19 17:23:33.480228",
13-
"spec_repo_commit": "e7026d11"
12+
"regenerated": "2024-07-19 18:52:00.257896",
13+
"spec_repo_commit": "be099b30"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -33741,8 +33741,6 @@ paths:
3374133741
tags:
3374233742
- Security Monitoring
3374333743
x-codegen-request-body-name: body
33744-
x-unstable: '**Note**: This feature is in private beta. Reach out to support
33745-
to request access.'
3374633744
/api/v2/security_monitoring/rules/test:
3374733745
post:
3374833746
description: Test a rule.
@@ -33931,8 +33929,6 @@ paths:
3393133929
summary: Convert an existing rule from JSON to Terraform
3393233930
tags:
3393333931
- Security Monitoring
33934-
x-unstable: '**Note**: This feature is in private beta. Reach out to support
33935-
to request access.'
3393633932
/api/v2/security_monitoring/rules/{rule_id}/test:
3393733933
post:
3393833934
description: Test an existing rule.

examples/v2/security-monitoring/ConvertExistingSecurityMonitoringRule.ts

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import { client, v2 } from "@datadog/datadog-api-client";
66

77
const configuration = client.createConfiguration();
8-
configuration.unstableOperations["v2.convertExistingSecurityMonitoringRule"] =
9-
true;
108
const apiInstance = new v2.SecurityMonitoringApi(configuration);
119

1210
// there is a valid "security_rule" in the system

examples/v2/security-monitoring/ConvertSecurityMonitoringRuleFromJSONToTerraform.ts

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import { client, v2 } from "@datadog/datadog-api-client";
66

77
const configuration = client.createConfiguration();
8-
configuration.unstableOperations[
9-
"v2.convertSecurityMonitoringRuleFromJSONToTerraform"
10-
] = true;
118
const apiInstance = new v2.SecurityMonitoringApi(configuration);
129

1310
const params: v2.SecurityMonitoringApiConvertSecurityMonitoringRuleFromJSONToTerraformRequest =

features/v2/security_monitoring.feature

+2-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ Feature: Security Monitoring
7373

7474
@team:DataDog/k9-cloud-security-platform
7575
Scenario: Convert a rule from JSON to Terraform returns "OK" response
76-
Given operation "ConvertSecurityMonitoringRuleFromJSONToTerraform" enabled
77-
And new "ConvertSecurityMonitoringRuleFromJSONToTerraform" request
76+
Given new "ConvertSecurityMonitoringRuleFromJSONToTerraform" request
7877
And body with value {"name":"{{ unique }}", "queries":[{"query":"@test:true","aggregation":"count","groupByFields":[],"distinctFields":[],"metric":""}],"filters":[],"cases":[{"name":"","status":"info","condition":"a > 0","notifications":[]}],"options":{"evaluationWindow":900,"keepAlive":3600,"maxSignalDuration":86400},"message":"Test rule","tags":[],"isEnabled":true, "type":"log_detection"}
7978
When the request is sent
8079
Then the response status is 200 OK
@@ -96,8 +95,7 @@ Feature: Security Monitoring
9695

9796
@team:DataDog/k9-cloud-security-platform
9897
Scenario: Convert an existing rule from JSON to Terraform returns "OK" response
99-
Given operation "ConvertExistingSecurityMonitoringRule" enabled
100-
And new "ConvertExistingSecurityMonitoringRule" request
98+
Given new "ConvertExistingSecurityMonitoringRule" request
10199
And there is a valid "security_rule" in the system
102100
And request contains "rule_id" parameter from "security_rule.id"
103101
When the request is sent

packages/datadog-api-client-common/configuration.ts

-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ export function createConfiguration(
247247
"v2.updateIncidentTodo": false,
248248
"v2.queryScalarData": false,
249249
"v2.queryTimeseriesData": false,
250-
"v2.convertExistingSecurityMonitoringRule": false,
251-
"v2.convertSecurityMonitoringRuleFromJSONToTerraform": false,
252250
"v2.getFinding": false,
253251
"v2.listFindings": false,
254252
"v2.muteFindings": false,

packages/datadog-api-client-v2/apis/SecurityMonitoringApi.ts

-24
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,6 @@ export class SecurityMonitoringApiRequestFactory extends BaseAPIRequestFactory {
6060
): Promise<RequestContext> {
6161
const _config = _options || this.configuration;
6262

63-
logger.warn(
64-
"Using unstable operation 'convertExistingSecurityMonitoringRule'"
65-
);
66-
if (
67-
!_config.unstableOperations["v2.convertExistingSecurityMonitoringRule"]
68-
) {
69-
throw new Error(
70-
"Unstable operation 'convertExistingSecurityMonitoringRule' is disabled"
71-
);
72-
}
73-
7463
// verify required parameter 'ruleId' is not null or undefined
7564
if (ruleId === null || ruleId === undefined) {
7665
throw new RequiredError(
@@ -111,19 +100,6 @@ export class SecurityMonitoringApiRequestFactory extends BaseAPIRequestFactory {
111100
): Promise<RequestContext> {
112101
const _config = _options || this.configuration;
113102

114-
logger.warn(
115-
"Using unstable operation 'convertSecurityMonitoringRuleFromJSONToTerraform'"
116-
);
117-
if (
118-
!_config.unstableOperations[
119-
"v2.convertSecurityMonitoringRuleFromJSONToTerraform"
120-
]
121-
) {
122-
throw new Error(
123-
"Unstable operation 'convertSecurityMonitoringRuleFromJSONToTerraform' is disabled"
124-
);
125-
}
126-
127103
// verify required parameter 'body' is not null or undefined
128104
if (body === null || body === undefined) {
129105
throw new RequiredError(

0 commit comments

Comments
 (0)