Skip to content

[FFL-2477] Add saved filters endpoints to Feature Flags API #1732

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.

Sign up for GitHub

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

Open
api-clients-generation-pipeline wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FFL-2477] Add saved filters endpoints to Feature Flags API #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 27 additions & 13 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19568,10 +19568,14 @@ components:
- CONTAINER
- CALLOUTVALUE
Condition:
description: Targeting condition details.
description: |-
Targeting condition details. A condition is either an inline
predicate with `operator`, `attribute`, and `value`, or a reference to a
saved filter with `saved_filter_id`. The inline fields are omitted for saved-filter
references.
properties:
attribute:
description: The user or request attribute to evaluate.
description: The user or request attribute to evaluate. Omitted for saved-filter references.
example: "country"
type: string
created_at:
Expand All @@ -19586,23 +19590,26 @@ components:
type: string
operator:
$ref: "#/components/schemas/ConditionOperator"
saved_filter_id:
description: The ID of the saved filter referenced by this condition, or null for inline conditions.
example: "550e8400-e29b-41d4-a716-446655440090"
format: uuid
nullable: true
type: string
updated_at:
description: The timestamp when the condition was last updated.
example: "2024-01-01T12:00:00Z"
format: date-time
type: string
value:
description: Values used by the selected operator.
description: Values used by the selected operator. Omitted for saved-filter references.
example: ["US", "CA"]
items:
description: Target value for the selected operator.
type: string
type: array
required:
- id
- operator
- attribute
- value
- created_at
- updated_at
type: object
Expand Down Expand Up @@ -19633,25 +19640,32 @@ components:
- IS_NULL
- EQUALS
ConditionRequest:
description: Condition request payload for targeting rules.
description: |-
Condition request payload for targeting rules. A condition is either an inline
predicate with `operator`, `attribute`, and `value`, or a reference to a
saved filter with `saved_filter_id`. The two shapes are mutually exclusive.
properties:
attribute:
description: The user or request attribute to evaluate.
description: The user or request attribute to evaluate. Required for inline conditions; omit when `saved_filter_id` is set.
example: "user_tier"
type: string
operator:
$ref: "#/components/schemas/ConditionOperator"
saved_filter_id:
description: |-
The ID of a saved filter to reference as this condition. Mutually exclusive
with `operator`, `attribute`, and `value`. When set, the saved filter's
targeting rules are evaluated in place of an inline predicate.
example: "550e8400-e29b-41d4-a716-446655440090"
format: uuid
type: string
value:
description: Values used by the selected operator.
description: Values used by the selected operator. Required for inline conditions; omit when `saved_filter_id` is set.
example: ["premium", "enterprise"]
items:
description: Target value for the selected operator.
type: string
type: array
required:
- operator
- attribute
- value
type: object
ConfigCatCredentials:
description: The definition of the `ConfigCatCredentials` object.
Expand Down
12 changes: 7 additions & 5 deletions examples/v2_feature-flags_CreateAllocationsForFeatureFlagInEnvironment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ async fn main() {
)])
.id(Uuid::parse_str("550e8400-e29b-41d4-a716-446655440020").expect("invalid UUID"))
.targeting_rules(vec![TargetingRuleRequest::new(vec![
ConditionRequest::new(
"user_tier".to_string(),
ConditionOperator::ONE_OF,
vec!["premium".to_string(), "enterprise".to_string()],
),
ConditionRequest::new()
.attribute("user_tier".to_string())
.operator(ConditionOperator::ONE_OF)
.saved_filter_id(
Uuid::parse_str("550e8400-e29b-41d4-a716-446655440090").expect("invalid UUID"),
)
.value(vec!["premium".to_string(), "enterprise".to_string()]),
])])
.variant_weights(vec![VariantWeightRequest::new(50.0)
.variant_id(
Expand Down
12 changes: 7 additions & 5 deletions examples/v2_feature-flags_UpdateAllocationsForFeatureFlagInEnvironment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ async fn main() {
)])
.id(Uuid::parse_str("550e8400-e29b-41d4-a716-446655440020").expect("invalid UUID"))
.targeting_rules(vec![TargetingRuleRequest::new(vec![
ConditionRequest::new(
"user_tier".to_string(),
ConditionOperator::ONE_OF,
vec!["premium".to_string(), "enterprise".to_string()],
),
ConditionRequest::new()
.attribute("user_tier".to_string())
.operator(ConditionOperator::ONE_OF)
.saved_filter_id(
Uuid::parse_str("550e8400-e29b-41d4-a716-446655440090").expect("invalid UUID"),
)
.value(vec!["premium".to_string(), "enterprise".to_string()]),
])])
.variant_weights(vec![VariantWeightRequest::new(50.0)
.variant_id(
Expand Down
70 changes: 55 additions & 15 deletions src/datadogV2/model/model_condition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ use serde::{Deserialize, Deserializer, Serialize};
use serde_with::skip_serializing_none;
use std::fmt::{self, Formatter};

/// Targeting condition details.
/// Targeting condition details. A condition is either an inline
/// predicate with `operator`, `attribute`, and `value`, or a reference to a
/// saved filter with `saved_filter_id`. The inline fields are omitted for saved-filter
/// references.
#[non_exhaustive]
#[skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize)]
pub struct Condition {
/// The user or request attribute to evaluate.
/// The user or request attribute to evaluate. Omitted for saved-filter references.
#[serde(rename = "attribute")]
pub attribute: String,
pub attribute: Option<String>,
/// The timestamp when the condition was created.
#[serde(rename = "created_at")]
pub created_at: chrono::DateTime<chrono::Utc>,
Expand All @@ -22,13 +25,20 @@ pub struct Condition {
pub id: uuid::Uuid,
/// The operator used in a targeting condition.
#[serde(rename = "operator")]
pub operator: crate::datadogV2::model::ConditionOperator,
pub operator: Option<crate::datadogV2::model::ConditionOperator>,
/// The ID of the saved filter referenced by this condition, or null for inline conditions.
#[serde(
rename = "saved_filter_id",
default,
with = "::serde_with::rust::double_option"
)]
pub saved_filter_id: Option<Option<uuid::Uuid>>,
/// The timestamp when the condition was last updated.
#[serde(rename = "updated_at")]
pub updated_at: chrono::DateTime<chrono::Utc>,
/// Values used by the selected operator.
/// Values used by the selected operator. Omitted for saved-filter references.
#[serde(rename = "value")]
pub value: Vec<String>,
pub value: Option<Vec<String>>,
#[serde(flatten)]
pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
#[serde(skip)]
Expand All @@ -38,25 +48,43 @@ pub struct Condition {

impl Condition {
pub fn new(
attribute: String,
created_at: chrono::DateTime<chrono::Utc>,
id: uuid::Uuid,
operator: crate::datadogV2::model::ConditionOperator,
updated_at: chrono::DateTime<chrono::Utc>,
value: Vec<String>,
) -> Condition {
Condition {
attribute,
attribute: None,
created_at,
id,
operator,
operator: None,
saved_filter_id: None,
updated_at,
value,
value: None,
additional_properties: std::collections::BTreeMap::new(),
_unparsed: false,
}
}

pub fn attribute(mut self, value: String) -> Self {
self.attribute = Some(value);
self
}

pub fn operator(mut self, value: crate::datadogV2::model::ConditionOperator) -> Self {
self.operator = Some(value);
self
}

pub fn saved_filter_id(mut self, value: Option<uuid::Uuid>) -> Self {
self.saved_filter_id = Some(value);
self
}

pub fn value(mut self, value: Vec<String>) -> Self {
self.value = Some(value);
self
}

pub fn additional_properties(
mut self,
value: std::collections::BTreeMap<String, serde_json::Value>,
Expand Down Expand Up @@ -87,6 +115,7 @@ impl<'de> Deserialize<'de> for Condition {
let mut created_at: Option<chrono::DateTime<chrono::Utc>> = None;
let mut id: Option<uuid::Uuid> = None;
let mut operator: Option<crate::datadogV2::model::ConditionOperator> = None;
let mut saved_filter_id: Option<Option<uuid::Uuid>> = None;
let mut updated_at: Option<chrono::DateTime<chrono::Utc>> = None;
let mut value: Option<Vec<String>> = None;
let mut additional_properties: std::collections::BTreeMap<
Expand All @@ -98,6 +127,9 @@ impl<'de> Deserialize<'de> for Condition {
while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
match k.as_str() {
"attribute" => {
if v.is_null() {
continue;
}
attribute = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"created_at" => {
Expand All @@ -107,6 +139,9 @@ impl<'de> Deserialize<'de> for Condition {
id = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"operator" => {
if v.is_null() {
continue;
}
operator = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
if let Some(ref _operator) = operator {
match _operator {
Expand All @@ -119,10 +154,17 @@ impl<'de> Deserialize<'de> for Condition {
}
}
}
"saved_filter_id" => {
saved_filter_id =
Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"updated_at" => {
updated_at = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
"value" => {
if v.is_null() {
continue;
}
value = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
}
&_ => {
Expand All @@ -132,18 +174,16 @@ impl<'de> Deserialize<'de> for Condition {
}
}
}
let attribute = attribute.ok_or_else(|| M::Error::missing_field("attribute"))?;
let created_at = created_at.ok_or_else(|| M::Error::missing_field("created_at"))?;
let id = id.ok_or_else(|| M::Error::missing_field("id"))?;
let operator = operator.ok_or_else(|| M::Error::missing_field("operator"))?;
let updated_at = updated_at.ok_or_else(|| M::Error::missing_field("updated_at"))?;
let value = value.ok_or_else(|| M::Error::missing_field("value"))?;

let content = Condition {
attribute,
created_at,
id,
operator,
saved_filter_id,
updated_at,
value,
additional_properties,
Expand Down
Loading
Loading