Skip to content
Merged
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
2 changes: 2 additions & 0 deletions crates/expressions/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,15 @@ mod tests {
(
"required".into(),
Variable {
description: None,
default: None,
secret: false,
},
),
(
"default".into(),
Variable {
description: None,
default: Some("default-value".into()),
secret: false,
},
Expand Down
1 change: 1 addition & 0 deletions crates/loader/src/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ fn locked_variable(variable: v2::Variable) -> Result<locked::Variable> {
"must be `required` OR have a `default`"
);
Ok(locked::Variable {
description: variable.description,
default: variable.default.clone(),
secret: variable.secret,
})
Expand Down
3 changes: 3 additions & 0 deletions crates/locked-app/src/locked.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,9 @@ pub struct LockedTrigger {
/// A Variable specifies a custom configuration variable.
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Variable {
/// A brief description of the variable.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
/// The variable's default value. If unset, the variable is required.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<String>,
Expand Down
7 changes: 7 additions & 0 deletions crates/manifest/src/schema/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ use super::json_schema;
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
#[serde(deny_unknown_fields)]
pub struct Variable {
/// A brief description of the variable.
///
/// Example: `description = "This is a variable"`
///
/// Learn more: https://spinframework.dev/variables#adding-variables-to-your-applications
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
/// Whether a value must be supplied at runtime. If not specified, required defaults
/// to `false`, and `default` must be provided.
///
Expand Down
1 change: 1 addition & 0 deletions crates/manifest/tests/ui/maximal.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"variables": {
"var_one": {
"description": "Test me like one of your French strings!",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course, Rose! 🌹

"default": "Default"
},
"var_two": {
Expand Down
2 changes: 1 addition & 1 deletion crates/manifest/tests/ui/maximal.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global_option = true
lint_level = "savage"

[variables]
var_one = { default = "Default" }
var_one = { description = "Test me like one of your French strings!", default = "Default" }
var_two = { required = true, secret = true }

[[trigger.fake]]
Expand Down
Loading