Skip to content

Fix change-safety dynamicparam forwarding for custom-fronted cmdlets #1555

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

Merged
Yabo Hu (VeryEarly) merged 2 commits into from
Aug 13, 2026
Merged

Fix change-safety dynamicparam forwarding for custom-fronted cmdlets #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde7732
Fix change-safety dynamicparam forwarding for custom-fronted cmdlets
YangAn-microsoft Aug 12, 2026
86ad21a
Refresh test-emitter baselines for the dynamicparam forwarding fix
YangAn-microsoft Aug 13, 2026
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
19 changes: 15 additions & 4 deletions powershell/resources/psruntime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Rest.ClientRuntime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
19 changes: 15 additions & 4 deletions ...mplianceAutomation.Management/target/generated/runtime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
19 changes: 15 additions & 4 deletions ...r/Astronomer.Astro.Management/target/generated/runtime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Azure.PowerShell.Cmdlets.Astro.Runtime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
19 changes: 15 additions & 4 deletions .../tests-emitter/AzureAI.Assets/target/generated/runtime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Azure.PowerShell.Cmdlets.MachineLearningServices.Runtime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
19 changes: 15 additions & 4 deletions ...emitter/AzureFleet.Management/target/generated/runtime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Azure.PowerShell.Cmdlets.ComputeFleet.Runtime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
19 changes: 15 additions & 4 deletions ...AzureLargeInstance.Management/target/generated/runtime/BuildTime/Models/PsProxyOutputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Text;
using System.Text.RegularExpressions;
using static Microsoft.Azure.PowerShell.Cmdlets.AzureLargeInstance.Runtime.PowerShell.PsProxyOutputExtensions;
Expand Down Expand Up @@ -205,11 +206,21 @@ public DynamicParamOutput(VariantGroup variantGroup) : base(variantGroup)
{
}

// Change Safety: only emit a dynamicparam block when a wrapped (private) cmdlet actually declares
// dynamic parameters via IDynamicParameters. For every other cmdlet this emits nothing (zero diff),
// so it is a no-op that just forwards the private cmdlet's runtime parameters through the proxy.
// Change Safety: only emit a dynamicparam block when the wrapped command actually declares dynamic
// parameters, either via IDynamicParameters (compiled private cmdlets) or via its own `dynamicparam`
// block (custom-fronted cmdlets, which wrap a hand-written function in custom/ instead of a private
// cmdlet). For every other cmdlet this emits nothing (zero diff), so it is a no-op that just forwards
// the wrapped command's runtime parameters through the proxy.
private bool HasDynamicParameters() => VariantGroup.Variants.Any(v =>
{
if (v.IsFunction)
{
// FunctionInfo.ScriptBlock.Ast is a FunctionDefinitionAst (the `function Name { ... }` wrapper);
// its Body (a ScriptBlockAst) is what actually exposes the DynamicParamBlock property.
var ast = (v.Info as FunctionInfo)?.ScriptBlock?.Ast;
var scriptBlockAst = ast as ScriptBlockAst ?? (ast as FunctionDefinitionAst)?.Body;
return scriptBlockAst?.DynamicParamBlock != null;
}
var implementingType = (v.Info as CmdletInfo)?.ImplementingType;
return implementingType != null && typeof(IDynamicParameters).IsAssignableFrom(implementingType);
});
Expand All @@ -231,7 +242,7 @@ public override string ToString() => !HasDynamicParameters() ? String.Empty : $@
{GetParameterSetToCmdletMapping()}
{Indent}if (-not $mapping.ContainsKey($parameterSet)) {{ $parameterSet = @($mapping.Keys)[0] }}
{Indent}try {{
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet, $PSBoundParameters)
{Indent}{Indent}$targetCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet -bor [System.Management.Automation.CommandTypes]::Function, $PSBoundParameters)
{Indent}{Indent}$dynamicParams = @($targetCmd.Parameters.GetEnumerator() | Microsoft.PowerShell.Core\Where-Object {{ $_.Value.IsDynamic }})
{Indent}{Indent}if ($dynamicParams.Length -gt 0) {{
{Indent}{Indent}{Indent}$paramDictionary = [System.Management.Automation.RuntimeDefinedParameterDictionary]::new()
Expand Down
Loading
Loading