Skip to content
Open
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
47 changes: 47 additions & 0 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60504,6 +60504,7 @@ components:
- $ref: "#/components/schemas/SendSlackMessageAction"
- $ref: "#/components/schemas/SendTeamsMessageAction"
- $ref: "#/components/schemas/TriggerWorkflowAutomationAction"
- $ref: "#/components/schemas/RoutingRuleEscalationPolicyAction"
RoutingRuleAttributes:
description: Defines the configurable attributes of a routing rule, such as actions, query, time restriction, and urgency.
properties:
Expand All @@ -60521,6 +60522,52 @@ components:
urgency:
$ref: "#/components/schemas/Urgency"
type: object
RoutingRuleEscalationPolicyAction:
description: "Triggers an escalation policy."
properties:
ack_timeout_minutes:
description: "The number of minutes before an acknowledged page is re-triggered."
example: 30
format: int64
type: integer
policy_id:
description: "The ID of the escalation policy to route to."
example: "00000000-0000-0000-0000-000000000000"
type: string
support_hours:
$ref: "#/components/schemas/RoutingRuleEscalationPolicyActionSupportHours"
type:
$ref: "#/components/schemas/RoutingRuleEscalationPolicyActionType"
urgency:
$ref: "#/components/schemas/Urgency"
required:
- type
- policy_id
type: object
RoutingRuleEscalationPolicyActionSupportHours:
description: "Support hours during which the escalation policy will be executed. Outside of these hours, the escalation policy will be on hold and triggered once the next support hours window starts."
properties:
restrictions:
description: "The list of support hours time windows."
items:
$ref: "#/components/schemas/TimeRestriction"
type: array
time_zone:
description: "The time zone in which the support hours are expressed."
example: ""
type: string
required:
- time_zone
type: object
RoutingRuleEscalationPolicyActionType:
default: escalation_policy
description: "Indicates that the action routes to an escalation policy. This action can be set once per routing rule, and cannot be combined with the legacy top-level `policy_id` field on the routing rule."
enum:
- escalation_policy
example: escalation_policy
type: string
x-enum-varnames:
- ESCALATION_POLICY
RoutingRuleRelationships:
description: Specifies relationships for a routing rule, linking to associated policy resources.
properties:
Expand Down
15 changes: 8 additions & 7 deletions examples/v2/on-call/SetOnCallTeamRoutingRules.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.datadog.api.client.v2.api.OnCallApi;
import com.datadog.api.client.v2.api.OnCallApi.SetOnCallTeamRoutingRulesOptionalParameters;
import com.datadog.api.client.v2.model.RoutingRuleAction;
import com.datadog.api.client.v2.model.SendSlackMessageAction;
import com.datadog.api.client.v2.model.SendSlackMessageActionType;
import com.datadog.api.client.v2.model.RoutingRuleEscalationPolicyAction;
import com.datadog.api.client.v2.model.RoutingRuleEscalationPolicyActionType;
import com.datadog.api.client.v2.model.TeamRoutingRules;
import com.datadog.api.client.v2.model.TeamRoutingRulesRequest;
import com.datadog.api.client.v2.model.TeamRoutingRulesRequestData;
Expand Down Expand Up @@ -43,12 +43,13 @@ public static void main(String[] args) {
.actions(
Collections.singletonList(
new RoutingRuleAction(
new SendSlackMessageAction()
.channel("channel")
new RoutingRuleEscalationPolicyAction()
.type(
SendSlackMessageActionType
.SEND_SLACK_MESSAGE)
.workspace("workspace"))))
RoutingRuleEscalationPolicyActionType
.ESCALATION_POLICY)
.policyId(ESCALATION_POLICY_DATA_ID)
.urgency(Urgency.LOW)
.ackTimeoutMinutes(30L))))
.query("tags.service:test")
.timeRestriction(
new TimeRestrictions()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,52 @@ public RoutingRuleAction deserialize(JsonParser jp, DeserializationContext ctxt)
Level.FINER, "Input data does not match schema 'TriggerWorkflowAutomationAction'", e);
}

// deserialize RoutingRuleEscalationPolicyAction
try {
boolean attemptParsing = true;
// ensure that we respect type coercion as set on the client ObjectMapper
if (RoutingRuleEscalationPolicyAction.class.equals(Integer.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Long.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Float.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Double.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Boolean.class)
|| RoutingRuleEscalationPolicyAction.class.equals(String.class)) {
attemptParsing = typeCoercion;
if (!attemptParsing) {
attemptParsing |=
((RoutingRuleEscalationPolicyAction.class.equals(Integer.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Long.class))
&& token == JsonToken.VALUE_NUMBER_INT);
attemptParsing |=
((RoutingRuleEscalationPolicyAction.class.equals(Float.class)
|| RoutingRuleEscalationPolicyAction.class.equals(Double.class))
&& (token == JsonToken.VALUE_NUMBER_FLOAT
|| token == JsonToken.VALUE_NUMBER_INT));
attemptParsing |=
(RoutingRuleEscalationPolicyAction.class.equals(Boolean.class)
&& (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
attemptParsing |=
(RoutingRuleEscalationPolicyAction.class.equals(String.class)
&& token == JsonToken.VALUE_STRING);
}
}
if (attemptParsing) {
tmp = tree.traverse(jp.getCodec()).readValueAs(RoutingRuleEscalationPolicyAction.class);
// TODO: there is no validation against JSON schema constraints
// (min, max, enum, pattern...), this does not perform a strict JSON
// validation, which means the 'match' count may be higher than it should be.
if (!((RoutingRuleEscalationPolicyAction) tmp).unparsed) {
deserialized = tmp;
match++;
}
log.log(Level.FINER, "Input data matches schema 'RoutingRuleEscalationPolicyAction'");
}
} catch (Exception e) {
// deserialization failed, continue
log.log(
Level.FINER, "Input data does not match schema 'RoutingRuleEscalationPolicyAction'", e);
}

RoutingRuleAction ret = new RoutingRuleAction();
if (match == 1) {
ret.setActualInstance(deserialized);
Expand Down Expand Up @@ -256,11 +302,19 @@ public RoutingRuleAction(TriggerWorkflowAutomationAction o) {
setActualInstance(o);
}

public RoutingRuleAction(RoutingRuleEscalationPolicyAction o) {
super("oneOf", Boolean.FALSE);
setActualInstance(o);
}

static {
schemas.put("SendSlackMessageAction", new GenericType<SendSlackMessageAction>() {});
schemas.put("SendTeamsMessageAction", new GenericType<SendTeamsMessageAction>() {});
schemas.put(
"TriggerWorkflowAutomationAction", new GenericType<TriggerWorkflowAutomationAction>() {});
schemas.put(
"RoutingRuleEscalationPolicyAction",
new GenericType<RoutingRuleEscalationPolicyAction>() {});
JSON.registerDescendants(RoutingRuleAction.class, Collections.unmodifiableMap(schemas));
}

Expand All @@ -272,7 +326,7 @@ public Map<String, GenericType> getSchemas() {
/**
* Set the instance that matches the oneOf child schema, check the instance parameter is valid
* against the oneOf child schemas: SendSlackMessageAction, SendTeamsMessageAction,
* TriggerWorkflowAutomationAction
* TriggerWorkflowAutomationAction, RoutingRuleEscalationPolicyAction
*
* <p>It could be an instance of the 'oneOf' schemas. The oneOf child schemas may themselves be a
* composed schema (allOf, anyOf, oneOf).
Expand All @@ -292,22 +346,27 @@ public void setActualInstance(Object instance) {
super.setActualInstance(instance);
return;
}
if (JSON.isInstanceOf(
RoutingRuleEscalationPolicyAction.class, instance, new HashSet<Class<?>>())) {
super.setActualInstance(instance);
return;
}

if (JSON.isInstanceOf(UnparsedObject.class, instance, new HashSet<Class<?>>())) {
super.setActualInstance(instance);
return;
}
throw new RuntimeException(
"Invalid instance type. Must be SendSlackMessageAction, SendTeamsMessageAction,"
+ " TriggerWorkflowAutomationAction");
+ " TriggerWorkflowAutomationAction, RoutingRuleEscalationPolicyAction");
}

/**
* Get the actual instance, which can be the following: SendSlackMessageAction,
* SendTeamsMessageAction, TriggerWorkflowAutomationAction
* SendTeamsMessageAction, TriggerWorkflowAutomationAction, RoutingRuleEscalationPolicyAction
*
* @return The actual instance (SendSlackMessageAction, SendTeamsMessageAction,
* TriggerWorkflowAutomationAction)
* TriggerWorkflowAutomationAction, RoutingRuleEscalationPolicyAction)
*/
@Override
public Object getActualInstance() {
Expand Down Expand Up @@ -347,4 +406,16 @@ public TriggerWorkflowAutomationAction getTriggerWorkflowAutomationAction()
throws ClassCastException {
return (TriggerWorkflowAutomationAction) super.getActualInstance();
}

/**
* Get the actual instance of `RoutingRuleEscalationPolicyAction`. If the actual instance is not
* `RoutingRuleEscalationPolicyAction`, the ClassCastException will be thrown.
*
* @return The actual instance of `RoutingRuleEscalationPolicyAction`
* @throws ClassCastException if the instance is not `RoutingRuleEscalationPolicyAction`
*/
public RoutingRuleEscalationPolicyAction getRoutingRuleEscalationPolicyAction()
throws ClassCastException {
return (RoutingRuleEscalationPolicyAction) super.getActualInstance();
}
}
Loading
Loading