Skip to content
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.

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

Add reference() function to get output from a resource #354

Merged
merged 5 commits into from
Mar 9, 2024
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
12 changes: 12 additions & 0 deletions dsc/examples/reference.dsc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Simple example showing how to reference output from a resource to use in another
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: os
type: Microsoft/OSInfo
properties: {}
- name: Echo
type: Test/Echo
properties:
output: "[concat('The OS is ', reference(resourceId('Microsoft/OSInfo','os')).actualState.family)]"
dependsOn:
- "[resourceId('Microsoft/OSInfo','os')]"
20 changes: 20 additions & 0 deletions dsc/tests/dsc_reference.tests.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

Describe 'Tests for config using reference function' {
It 'Reference works' {
$out = dsc config get -p $PSScriptRoot/../examples/reference.dsc.yaml | ConvertFrom-Json
$LASTEXITCODE | Should -Be 0
$os = if ($IsWindows) {
'Windows'
}
elseif ($IsLinux) {
'Linux'
}
else {
'macOS'
}

$out.results[1].result.actualState.Output | Should -BeExactly "The OS is $os"
}
}
4 changes: 2 additions & 2 deletions dsc_lib/src/configure/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::collections::HashMap;
pub struct Context {
pub parameters: HashMap<String, Value>,
pub _variables: HashMap<String, Value>,
pub _outputs: HashMap<String, Value>, // This is eventually for References function to get output from resources
pub outputs: HashMap<String, Value>, // this is used by the `reference()` function to retrieve output
}

impl Context {
Expand All @@ -16,7 +16,7 @@ impl Context {
Self {
parameters: HashMap::new(),
_variables: HashMap::new(),
_outputs: HashMap::new(),
outputs: HashMap::new(),
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions dsc_lib/src/configure/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ impl Configurator {
let filter = add_metadata(&dsc_resource.kind, properties)?;
trace!("filter: {filter}");
let get_result = dsc_resource.get(&filter)?;
self.context.outputs.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&get_result)?);
let resource_result = config_result::ResourceGetResult {
name: resource.name.clone(),
resource_type: resource.resource_type.clone(),
Expand Down Expand Up @@ -280,6 +281,7 @@ impl Configurator {
let desired = add_metadata(&dsc_resource.kind, properties)?;
trace!("desired: {desired}");
let set_result = dsc_resource.set(&desired, skip_test)?;
self.context.outputs.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&set_result)?);
let resource_result = config_result::ResourceSetResult {
name: resource.name.clone(),
resource_type: resource.resource_type.clone(),
Expand Down Expand Up @@ -320,6 +322,7 @@ impl Configurator {
let expected = add_metadata(&dsc_resource.kind, properties)?;
trace!("expected: {expected}");
let test_result = dsc_resource.test(&expected)?;
self.context.outputs.insert(format!("{}:{}", resource.resource_type, resource.name), serde_json::to_value(&test_result)?);
let resource_result = config_result::ResourceTestResult {
name: resource.name.clone(),
resource_type: resource.resource_type.clone(),
Expand Down
2 changes: 2 additions & 0 deletions dsc_lib/src/functions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub mod envvar;
pub mod mod_function;
pub mod mul;
pub mod parameters;
pub mod reference;
pub mod resource_id;
pub mod sub;

Expand Down Expand Up @@ -68,6 +69,7 @@ impl FunctionDispatcher {
functions.insert("mod".to_string(), Box::new(mod_function::Mod{}));
functions.insert("mul".to_string(), Box::new(mul::Mul{}));
functions.insert("parameters".to_string(), Box::new(parameters::Parameters{}));
functions.insert("reference".to_string(), Box::new(reference::Reference{}));
functions.insert("resourceId".to_string(), Box::new(resource_id::ResourceId{}));
functions.insert("sub".to_string(), Box::new(sub::Sub{}));
Self {
Expand Down
60 changes: 60 additions & 0 deletions dsc_lib/src/functions/reference.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

use crate::DscError;
use crate::configure::context::Context;
use crate::functions::{AcceptedArgKind, Function};
use serde_json::Value;
use tracing::debug;

#[derive(Debug, Default)]
pub struct Reference {}

impl Function for Reference {
fn min_args(&self) -> usize {
1
}

fn max_args(&self) -> usize {
1
}

fn accepted_arg_types(&self) -> Vec<AcceptedArgKind> {
vec![AcceptedArgKind::String]
}

fn invoke(&self, args: &[Value], context: &Context) -> Result<Value, DscError> {
debug!("reference function");
if let Some(key) = args[0].as_str() {
if context.outputs.contains_key(key) {
Ok(context.outputs[key].clone())
} else {
Err(DscError::Parser(format!("Invalid resourceId or resource has not executed yet: {key}")))
}
} else {
Err(DscError::Parser("Invalid argument".to_string()))
}
}
}

#[cfg(test)]
mod tests {
use crate::configure::context::Context;
use crate::parser::Statement;

#[test]
fn valid_resourceid() {
let mut parser = Statement::new().unwrap();
let mut context = Context::new();
context.outputs.insert("foo:bar".to_string(), "baz".into());
let result = parser.parse_and_execute("[reference('foo:bar')]", &context).unwrap();
assert_eq!(result, "baz");
}

#[test]
fn invalid_resourceid() {
let mut parser = Statement::new().unwrap();
let result = parser.parse_and_execute("[reference('foo:bar')]", &Context::new());
assert!(result.is_err());
}
}
2 changes: 1 addition & 1 deletion dsc_lib/src/parser/expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl Expression {
}
let mut result = vec![];
let mut cursor = members.walk();
for member in members.children(&mut cursor) {
for member in members.named_children(&mut cursor) {
if member.is_error() {
return Err(DscError::Parser("Error parsing dot-notation member".to_string()));
}
Expand Down
3 changes: 1 addition & 2 deletions tree-sitter-dscexpression/grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ module.exports = grammar({
number: $ => /-?\d+/,
boolean: $ => choice('true', 'false'),

memberAccess: $ => repeat1($._member),
_member: $ => seq('.', $.memberName),
memberAccess: $ => seq('.', $.memberName, repeat(seq('.', $.memberName))),
memberName: $ => /[a-zA-Z0-9_-]+/,
}

Expand Down
Loading