Skip to content

[ChangeSafety] Fix base calls in GetDynamicParameters #29222

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
notyashhh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[ChangeSafety] Fix base calls in GetDynamicParameters #29222

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
522a150
Fix base calls in GetDynamicParameters
notyashhh Mar 2, 2026
133ae34
Storage Fix
notyashhh Mar 3, 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
11 changes: 11 additions & 0 deletions src/Accounts/Accounts/Config/ConfigCommandBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ protected virtual void ValidateParameters()
protected object GetDynamicParameters(Func<ConfigDefinition, RuntimeDefinedParameter> mapConfigToParameter)
{
_dynamicParameters.Clear();

// Preserve dynamic parameters from base classes (e.g., AzureRMCmdlet, AzurePSCmdlet)
var baseParameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary;
if (baseParameters != null)
{
foreach (var pair in baseParameters)
{
_dynamicParameters.Add(pair.Key, pair.Value);
}
}

foreach (var config in ConfigDefinitions)
{
_dynamicParameters.Add(config.Key, mapConfigToParameter(config));
Expand Down
4 changes: 3 additions & 1 deletion src/CosmosDB/CosmosDB/CosmosDBAccount/NewAzCosmosDBAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary;

if (FromPointInTimeBackup)
{
restoreContext = new RestoreRequestDynamicParameters();
return restoreContext;
}

return null;
return parameters;
}

private RestoreRequestDynamicParameters restoreContext;
Expand Down
9 changes: 6 additions & 3 deletions src/DataMigration/DataMigration/Cmdlets/InvokeDataMigrationCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public CommandTypeEnum CommandType

public new object GetDynamicParameters()
{
RuntimeDefinedParameterDictionary dynamicParams = null;
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();

if (commandTypeSet)
{
Expand All @@ -108,10 +108,13 @@ public CommandTypeEnum CommandType
throw new PSArgumentException();
}

dynamicParams = commandCmdlet.RuntimeDefinedParams;
foreach (var pair in commandCmdlet.RuntimeDefinedParams)
{
parameters.Add(pair.Key, pair.Value);
}
}

return dynamicParams;
return parameters;
}

public override void ExecuteCmdlet()
Expand Down
9 changes: 6 additions & 3 deletions src/DataMigration/DataMigration/Cmdlets/NewConnectionInfoCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
RuntimeDefinedParameterDictionary dynamicParams = null;
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();

if (serverTypeSet)
{
Expand All @@ -84,10 +84,13 @@ public override void ExecuteCmdlet()
throw new PSArgumentException();
}

dynamicParams = connCmdlet.RuntimeDefinedParams;
foreach (var pair in connCmdlet.RuntimeDefinedParams)
{
parameters.Add(pair.Key, pair.Value);
}
}

return dynamicParams;
return parameters;
}
}
}
9 changes: 6 additions & 3 deletions src/DataMigration/DataMigration/Cmdlets/NewDataMigrationTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public TaskTypeEnum TaskType

public new object GetDynamicParameters()
{
RuntimeDefinedParameterDictionary dynamicParams = null;
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();

if (taskTypeSet)
{
Expand Down Expand Up @@ -202,10 +202,13 @@ public TaskTypeEnum TaskType
throw new PSArgumentException();
}

dynamicParams = taskCmdlet.RuntimeDefinedParams;
foreach (var pair in taskCmdlet.RuntimeDefinedParams)
{
parameters.Add(pair.Key, pair.Value);
}
}

return dynamicParams;
return parameters;
}

public override void ExecuteCmdlet()
Expand Down
4 changes: 3 additions & 1 deletion src/IotHub/IotHub/IotHub/DataPlane/Device/AddAzIotHubDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters();

if (this.AuthMethod.Equals(PSDeviceAuthType.x509_thumbprint))
{
authTypeDynamicParameter = new AuthTypeDynamicParameter();
return authTypeDynamicParameter;
}

return null;
return parameters;
}

private AuthTypeDynamicParameter authTypeDynamicParameter;
Expand Down
4 changes: 3 additions & 1 deletion src/IotHub/IotHub/IotHub/DataPlane/Device/SetAzIotHubDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters();

if (this.AuthMethod.Equals(PSDeviceAuthType.x509_thumbprint))
{
authTypeDynamicParameter = new AuthTypeDynamicParameter();
return authTypeDynamicParameter;
}

return null;
return parameters;
}

private AuthTypeDynamicParameter authTypeDynamicParameter;
Expand Down
4 changes: 3 additions & 1 deletion src/IotHub/IotHub/IotHub/DataPlane/Module/AddAzIotHubModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters();

if (this.AuthMethod.Equals(PSDeviceAuthType.x509_thumbprint))
{
authTypeDynamicParameter = new AuthTypeDynamicParameter();
return authTypeDynamicParameter;
}

return null;
return parameters;
}

private AuthTypeDynamicParameter authTypeDynamicParameter;
Expand Down
4 changes: 3 additions & 1 deletion src/IotHub/IotHub/IotHub/DataPlane/Module/SetAzIotHubModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters();

if (this.AuthMethod.Equals(PSDeviceAuthType.x509_thumbprint))
{
authTypeDynamicParameter = new AuthTypeDynamicParameter();
return authTypeDynamicParameter;
}

return null;
return parameters;
}

private AuthTypeDynamicParameter authTypeDynamicParameter;
Expand Down
4 changes: 3 additions & 1 deletion src/IotHub/IotHub/IotHub/Routing/AddAzureRmIotHubRoutingEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,15 @@ public override void ExecuteCmdlet()

public new object GetDynamicParameters()
{
var parameters = base.GetDynamicParameters();

if (this.EndpointType.Equals(PSEndpointType.AzureStorageContainer))
{
routingEndpointDynamicParameter = new RoutingEndpointDynamicParameter();
return routingEndpointDynamicParameter;
}

return null;
return parameters;
}

private RoutingEndpointDynamicParameter routingEndpointDynamicParameter;
Expand Down
2 changes: 1 addition & 1 deletion ...twork/PrivateLinkService/PrivateEndpointConnection/PrivateEndpointConnectionBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public abstract class PrivateEndpointConnectionBaseCmdlet : NetworkBaseCmdlet, I
string NamedContextParameterSet = "ByResource";
public new object GetDynamicParameters()
{
var parameters = new RuntimeDefinedParameterDictionary();
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();
RuntimeDefinedParameter namedParameter;
if (ProviderConfiguration.TryGetEndpointConnectionServiceParameter(privateEndpointTypeName, NamedContextParameterSet, out namedParameter))
{
Expand Down
2 changes: 1 addition & 1 deletion ...work/Network/PrivateLinkService/PrivateLinkResource/GetAzurePrivateLinkResourceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class GetAzurePrivateLinkResourceCommand : NetworkBaseCmdlet, IDynamicPar
public new object GetDynamicParameters()
{
InvocationInfo invocationInfo = MyInvocation;
var parameters = new RuntimeDefinedParameterDictionary();
var parameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();
RuntimeDefinedParameter namedParameter;
if (ProviderConfiguration.TryGetLinkResourceServiceParameter(privateEndpointTypeName, NamedContextParameterSet, out namedParameter))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ protected override void OnBeginProcessing()
BuildAndUseBicepTemplate();
}

var dynamicParameters = new RuntimeDefinedParameterDictionary();
var dynamicParameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();

if (!this.IsParameterBound(c => c.SkipTemplateParameterPrompt))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCreateCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ protected override void OnBeginProcessing()
BuildAndUseBicepTemplate();
}

var dynamicParameters = new RuntimeDefinedParameterDictionary();
var dynamicParameters = base.GetDynamicParameters() as RuntimeDefinedParameterDictionary ?? new RuntimeDefinedParameterDictionary();

if (!this.IsParameterBound(c => c.SkipTemplateParameterPrompt))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/ResourceManager/Implementation/CmdletBase/TestDeploymentCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override object GetDynamicParameters()
}
return base.GetDynamicParameters();
}

Copy link

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

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

Line contains trailing whitespace (blank line with spaces). Please remove the extra spaces to avoid unnecessary diffs and formatting noise.

Suggested change

Copilot uses AI. Check for mistakes.
public void WriteOutput(TemplateValidationInfo validationInfo)
{
if (validationInfo.Errors.Count > 0)
Expand Down
Loading