Fix deployment gates OpenAPI spec oneOf ambiguity

.generator/schemas/v2/openapi.yaml

@@ -19700,11 +19700,12 @@ components:
       - id
       type: object
     DeploymentRulesOptions:
-      description: Options for deployment rule response representing either faulty
-        deployment detection or monitor options.
-      oneOf:
+      anyOf:
       - $ref: '#/components/schemas/DeploymentRuleOptionsFaultyDeploymentDetection'
       - $ref: '#/components/schemas/DeploymentRuleOptionsMonitor'
+      description: Options for deployment rule response representing either faulty
+        deployment detection or monitor options. The actual type is determined by
+        the parent's 'type' field.
     DetachCaseRequest:
       description: Request for detaching security findings from their case.
       properties:

features/v2/deployment_gates.feature

@@ -49,7 +49,7 @@ Feature: Deployment Gates
     Given operation "CreateDeploymentRule" enabled
     And new "CreateDeploymentRule" request
     And request contains "gate_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"dry_run": false, "name": "My deployment rule", "options": {"duration": 3600, "excluded_resources": ["resource1", "resource2"]}, "type": "faulty_deployment_detection"}, "type": "deployment_rule"}}
+    And body with value {"data": {"attributes": {"dry_run": false, "name": "My deployment rule", "type": "faulty_deployment_detection"}, "type": "deployment_rule"}}
     When the request is sent
     Then the response status is 400 Bad request.
 
@@ -279,7 +279,7 @@ Feature: Deployment Gates
     And new "UpdateDeploymentRule" request
     And request contains "gate_id" parameter from "REPLACE.ME"
     And request contains "id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"dry_run": false, "name": "Updated deployment rule", "options": {"duration": 3600, "excluded_resources": ["resource1", "resource2"]}}, "type": "deployment_rule"}}
+    And body with value {"data": {"attributes": {"dry_run": false, "name": "Updated deployment rule"}, "type": "deployment_rule"}}
     When the request is sent
     Then the response status is 400 Bad request.
 
@@ -289,7 +289,7 @@ Feature: Deployment Gates
     And new "UpdateDeploymentRule" request
     And request contains "gate_id" parameter from "REPLACE.ME"
     And request contains "id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"dry_run": false, "name": "Updated deployment rule", "options": {"duration": 3600, "excluded_resources": ["resource1", "resource2"]}}, "type": "deployment_rule"}}
+    And body with value {"data": {"attributes": {"dry_run": false, "name": "Updated deployment rule"}, "type": "deployment_rule"}}
     When the request is sent
     Then the response status is 404 Deployment rule not found.
 

services/deployment_gates/src/v2/index.ts

@@ -34,7 +34,6 @@ export { DeploymentRuleResponseDataAttributes } from "./models/DeploymentRuleRes
 export { DeploymentRuleResponseDataAttributesCreatedBy } from "./models/DeploymentRuleResponseDataAttributesCreatedBy";
 export { DeploymentRuleResponseDataAttributesType } from "./models/DeploymentRuleResponseDataAttributesType";
 export { DeploymentRuleResponseDataAttributesUpdatedBy } from "./models/DeploymentRuleResponseDataAttributesUpdatedBy";
-export { DeploymentRulesOptions } from "./models/DeploymentRulesOptions";
 export { HTTPCDGatesBadRequestResponse } from "./models/HTTPCDGatesBadRequestResponse";
 export { HTTPCDGatesNotFoundResponse } from "./models/HTTPCDGatesNotFoundResponse";
 export { HTTPCDRulesNotFoundResponse } from "./models/HTTPCDRulesNotFoundResponse";

services/deployment_gates/src/v2/models/CreateDeploymentRuleParamsDataAttributes.ts

@@ -1,7 +1,5 @@
 import { AttributeTypeMap } from "@datadog/datadog-api-client";
 
-import { DeploymentRulesOptions } from "./DeploymentRulesOptions";
-
 /**
  * Parameters for creating a deployment rule.
  */
@@ -15,9 +13,9 @@ export class CreateDeploymentRuleParamsDataAttributes {
    */
   "name": string;
   /**
-   * Options for deployment rule response representing either faulty deployment detection or monitor options.
+   * Options for deployment rule response representing either faulty deployment detection or monitor options. The actual type is determined by the parent's 'type' field.
    */
-  "options": DeploymentRulesOptions;
+  "options": any;
   /**
    * The type of the deployment rule (faulty_deployment_detection or monitor).
    */
@@ -48,7 +46,7 @@ export class CreateDeploymentRuleParamsDataAttributes {
     },
     options: {
       baseName: "options",
-      type: "DeploymentRulesOptions",
+      type: "any",
       required: true,
     },
     type: {

services/deployment_gates/src/v2/models/DeploymentRuleResponseDataAttributes.ts

@@ -3,7 +3,6 @@ import { AttributeTypeMap } from "@datadog/datadog-api-client";
 import { DeploymentRuleResponseDataAttributesCreatedBy } from "./DeploymentRuleResponseDataAttributesCreatedBy";
 import { DeploymentRuleResponseDataAttributesType } from "./DeploymentRuleResponseDataAttributesType";
 import { DeploymentRuleResponseDataAttributesUpdatedBy } from "./DeploymentRuleResponseDataAttributesUpdatedBy";
-import { DeploymentRulesOptions } from "./DeploymentRulesOptions";
 
 /**
  * Basic information about a deployment rule.
@@ -30,9 +29,9 @@ export class DeploymentRuleResponseDataAttributes {
    */
   "name": string;
   /**
-   * Options for deployment rule response representing either faulty deployment detection or monitor options.
+   * Options for deployment rule response representing either faulty deployment detection or monitor options. The actual type is determined by the parent's 'type' field.
    */
-  "options": DeploymentRulesOptions;
+  "options": any;
   /**
    * The type of the deployment rule.
    */
@@ -88,7 +87,7 @@ export class DeploymentRuleResponseDataAttributes {
     },
     options: {
       baseName: "options",
-      type: "DeploymentRulesOptions",
+      type: "any",
       required: true,
     },
     type: {

services/deployment_gates/src/v2/models/TypingInfo.ts

@@ -44,12 +44,7 @@ export const TypingInfo: ModelTypingInfo = {
     ],
     ListDeploymentRulesDataType: ["list_deployment_rules"],
   },
-  oneOfMap: {
-    DeploymentRulesOptions: [
-      "DeploymentRuleOptionsFaultyDeploymentDetection",
-      "DeploymentRuleOptionsMonitor",
-    ],
-  },
+  oneOfMap: {},
   typeMap: {
     APIErrorResponse: APIErrorResponse,
     CreateDeploymentGateParams: CreateDeploymentGateParams,

services/deployment_gates/src/v2/models/UpdateDeploymentRuleParamsDataAttributes.ts

@@ -1,7 +1,5 @@
 import { AttributeTypeMap } from "@datadog/datadog-api-client";
 
-import { DeploymentRulesOptions } from "./DeploymentRulesOptions";
-
 /**
  * Parameters for updating a deployment rule.
  */
@@ -15,9 +13,9 @@ export class UpdateDeploymentRuleParamsDataAttributes {
    */
   "name": string;
   /**
-   * Options for deployment rule response representing either faulty deployment detection or monitor options.
+   * Options for deployment rule response representing either faulty deployment detection or monitor options. The actual type is determined by the parent's 'type' field.
    */
-  "options": DeploymentRulesOptions;
+  "options": any;
   /**
    * A container for additional, undeclared properties.
    * This is a holder for any undeclared properties as specified with
@@ -45,7 +43,7 @@ export class UpdateDeploymentRuleParamsDataAttributes {
     },
     options: {
       baseName: "options",
-      type: "DeploymentRulesOptions",
+      type: "any",
       required: true,
     },
     additionalProperties: {

services/usage_metering/src/v1/models/MonthlyUsageAttributionValues.ts

@@ -352,83 +352,83 @@ export class MonthlyUsageAttributionValues {
   /**
    * The percentage of Indexed Logs (15-day Retention) usage by tag(s).
    */
-  "logsIndexed15DayPercentage"?: number;
+  "logsIndexed15dayPercentage"?: number;
   /**
    * The total Indexed Logs (15-day Retention) usage by tag(s).
    */
-  "logsIndexed15DayUsage"?: number;
+  "logsIndexed15dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (180-day Retention) usage by tag(s).
    */
-  "logsIndexed180DayPercentage"?: number;
+  "logsIndexed180dayPercentage"?: number;
   /**
    * The total Indexed Logs (180-day Retention) usage by tag(s).
    */
-  "logsIndexed180DayUsage"?: number;
+  "logsIndexed180dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (1-day Retention) usage by tag(s).
    */
-  "logsIndexed1DayPercentage"?: number;
+  "logsIndexed1dayPercentage"?: number;
   /**
    * The total Indexed Logs (1-day Retention) usage by tag(s).
    */
-  "logsIndexed1DayUsage"?: number;
+  "logsIndexed1dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (30-day Retention) usage by tag(s).
    */
-  "logsIndexed30DayPercentage"?: number;
+  "logsIndexed30dayPercentage"?: number;
   /**
    * The total Indexed Logs (30-day Retention) usage by tag(s).
    */
-  "logsIndexed30DayUsage"?: number;
+  "logsIndexed30dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (360-day Retention) usage by tag(s).
    */
-  "logsIndexed360DayPercentage"?: number;
+  "logsIndexed360dayPercentage"?: number;
   /**
    * The total Indexed Logs (360-day Retention) usage by tag(s).
    */
-  "logsIndexed360DayUsage"?: number;
+  "logsIndexed360dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (3-day Retention) usage by tag(s).
    */
-  "logsIndexed3DayPercentage"?: number;
+  "logsIndexed3dayPercentage"?: number;
   /**
    * The total Indexed Logs (3-day Retention) usage by tag(s).
    */
-  "logsIndexed3DayUsage"?: number;
+  "logsIndexed3dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (45-day Retention) usage by tag(s).
    */
-  "logsIndexed45DayPercentage"?: number;
+  "logsIndexed45dayPercentage"?: number;
   /**
    * The total Indexed Logs (45-day Retention) usage by tag(s).
    */
-  "logsIndexed45DayUsage"?: number;
+  "logsIndexed45dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (60-day Retention) usage by tag(s).
    */
-  "logsIndexed60DayPercentage"?: number;
+  "logsIndexed60dayPercentage"?: number;
   /**
    * The total Indexed Logs (60-day Retention) usage by tag(s).
    */
-  "logsIndexed60DayUsage"?: number;
+  "logsIndexed60dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (7-day Retention) usage by tag(s).
    */
-  "logsIndexed7DayPercentage"?: number;
+  "logsIndexed7dayPercentage"?: number;
   /**
    * The total Indexed Logs (7-day Retention) usage by tag(s).
    */
-  "logsIndexed7DayUsage"?: number;
+  "logsIndexed7dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (90-day Retention) usage by tag(s).
    */
-  "logsIndexed90DayPercentage"?: number;
+  "logsIndexed90dayPercentage"?: number;
   /**
    * The total Indexed Logs (90-day Retention) usage by tag(s).
    */
-  "logsIndexed90DayUsage"?: number;
+  "logsIndexed90dayUsage"?: number;
   /**
    * The percentage of Indexed Logs (Custom Retention) usage by tag(s).
    */
@@ -1090,102 +1090,102 @@ export class MonthlyUsageAttributionValues {
       type: "number",
       format: "double",
     },
-    logsIndexed15DayPercentage: {
+    logsIndexed15dayPercentage: {
       baseName: "logs_indexed_15day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed15DayUsage: {
+    logsIndexed15dayUsage: {
       baseName: "logs_indexed_15day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed180DayPercentage: {
+    logsIndexed180dayPercentage: {
       baseName: "logs_indexed_180day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed180DayUsage: {
+    logsIndexed180dayUsage: {
       baseName: "logs_indexed_180day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed1DayPercentage: {
+    logsIndexed1dayPercentage: {
       baseName: "logs_indexed_1day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed1DayUsage: {
+    logsIndexed1dayUsage: {
       baseName: "logs_indexed_1day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed30DayPercentage: {
+    logsIndexed30dayPercentage: {
       baseName: "logs_indexed_30day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed30DayUsage: {
+    logsIndexed30dayUsage: {
       baseName: "logs_indexed_30day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed360DayPercentage: {
+    logsIndexed360dayPercentage: {
       baseName: "logs_indexed_360day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed360DayUsage: {
+    logsIndexed360dayUsage: {
       baseName: "logs_indexed_360day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed3DayPercentage: {
+    logsIndexed3dayPercentage: {
       baseName: "logs_indexed_3day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed3DayUsage: {
+    logsIndexed3dayUsage: {
       baseName: "logs_indexed_3day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed45DayPercentage: {
+    logsIndexed45dayPercentage: {
       baseName: "logs_indexed_45day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed45DayUsage: {
+    logsIndexed45dayUsage: {
       baseName: "logs_indexed_45day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed60DayPercentage: {
+    logsIndexed60dayPercentage: {
       baseName: "logs_indexed_60day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed60DayUsage: {
+    logsIndexed60dayUsage: {
       baseName: "logs_indexed_60day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed7DayPercentage: {
+    logsIndexed7dayPercentage: {
       baseName: "logs_indexed_7day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed7DayUsage: {
+    logsIndexed7dayUsage: {
       baseName: "logs_indexed_7day_usage",
       type: "number",
       format: "double",
     },
-    logsIndexed90DayPercentage: {
+    logsIndexed90dayPercentage: {
       baseName: "logs_indexed_90day_percentage",
       type: "number",
       format: "double",
     },
-    logsIndexed90DayUsage: {
+    logsIndexed90dayUsage: {
       baseName: "logs_indexed_90day_usage",
       type: "number",
       format: "double",