Skip to content

Commit b3fccfb

Browse files
committed
Revert "New-AzureRmResourceGroupDeployment should throw exception if value specified for -TemplateParameterFile parameter is missing Azure#2370"
This reverts commit 57e8c10.
1 parent 6dc6e02 commit b3fccfb

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

src/Common/Commands.Common/CmdletExtensions.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ public static string TryResolvePath(this PSCmdlet psCmdlet, string path)
4040
}
4141
}
4242

43-
public static string TryResolvePathWithException(this PSCmdlet psCmdlet, string path)
44-
{
45-
return psCmdlet.ResolvePath(path);
46-
}
47-
4843
public static string ResolvePath(this PSCmdlet psCmdlet, string path)
4944
{
5045
if (path == null)

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ public object GetDynamicParameters()
9797
if (string.IsNullOrEmpty(TemplateParameterUri))
9898
{
9999
dynamicParameters = TemplateUtility.GetTemplateParametersFromFile(
100-
this.TryResolvePathWithException(TemplateFile),
100+
this.TryResolvePath(TemplateFile),
101101
TemplateParameterObject,
102-
this.TryResolvePathWithException(TemplateParameterFile),
102+
this.TryResolvePath(TemplateParameterFile),
103103
MyInvocation.MyCommand.Parameters.Keys.ToArray());
104104
}
105105
else
106106
{
107107
dynamicParameters = TemplateUtility.GetTemplateParametersFromFile(
108-
this.TryResolvePathWithException(TemplateFile),
108+
this.TryResolvePath(TemplateFile),
109109
TemplateParameterObject,
110110
TemplateParameterUri,
111111
MyInvocation.MyCommand.Parameters.Keys.ToArray());
@@ -120,7 +120,7 @@ public object GetDynamicParameters()
120120
dynamicParameters = TemplateUtility.GetTemplateParametersFromFile(
121121
TemplateUri,
122122
TemplateParameterObject,
123-
this.TryResolvePathWithException(TemplateParameterFile),
123+
this.TryResolvePath(TemplateParameterFile),
124124
MyInvocation.MyCommand.Parameters.Keys.ToArray());
125125
}
126126
else
@@ -149,7 +149,7 @@ protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject
149149
}
150150

151151
// Load parameters from the file
152-
string templateParameterFilePath = this.TryResolvePathWithException(TemplateParameterFile);
152+
string templateParameterFilePath = this.TryResolvePath(TemplateParameterFile);
153153
if (templateParameterFilePath != null && FileUtilities.DataStore.FileExists(templateParameterFilePath))
154154
{
155155
var parametersFromFile = TemplateUtility.ParseTemplateParameterFileContents(templateParameterFilePath);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public override void ExecuteCmdlet()
6767
ResourceGroupName = ResourceGroupName,
6868
DeploymentName = Name,
6969
DeploymentMode = Mode,
70-
TemplateFile = TemplateUri ?? this.TryResolvePathWithException(TemplateFile),
70+
TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),
7171
TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),
7272
ParameterUri = TemplateParameterUri,
7373
DeploymentDebugLogLevel = GetDeploymentDebugLogLevel(DeploymentDebugLogLevel)

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public override void ExecuteCmdlet()
4343
PSValidateResourceGroupDeploymentParameters parameters = new PSValidateResourceGroupDeploymentParameters()
4444
{
4545
ResourceGroupName = ResourceGroupName,
46-
TemplateFile = TemplateUri ?? this.TryResolvePathWithException(TemplateFile),
46+
TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),
4747
TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),
4848
ParameterUri = TemplateParameterUri
4949
};

0 commit comments

Comments
 (0)