fix relative path issue

Azure · Feb 18, 2021 · 548b717 · 548b717
1 parent ade602e
commit 548b717
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs
@@ -419,7 +419,7 @@ protected void BuildAndUseBicepTemplate()
         {
             if (BicepUtility.IsBicepFile(TemplateFile))
             {
-                TemplateFile = BicepUtility.BuildFile(this.ExecuteScript<Object>, TemplateFile);
+                TemplateFile = BicepUtility.BuildFile(this.ExecuteScript<Object>, this.ResolvePath(TemplateFile));
             }
 
             if (BicepUtility.IsBicepFile(TemplateUri))

diff --git a/src/Resources/ResourceManager/Properties/Resources.Designer.cs b/src/Resources/ResourceManager/Properties/Resources.Designer.cs
diff --git a/src/Resources/ResourceManager/Properties/Resources.resx b/src/Resources/ResourceManager/Properties/Resources.resx
@@ -497,4 +497,7 @@ You can help us improve the accuracy of the result by opening an issue here: htt
   <data name="BicepNotFound" xml:space="preserve">
     <value>Cannot find Bicep. Please add Bicep to your PATH or visit https://github.com/Azure/bicep/releases to install Bicep.</value>
   </data>
+  <data name="InvalidBicepFilePathOrUri" xml:space="preserve">
+    <value>Invalid Bicep file path or uri.</value>
+  </data>
 </root>
diff --git a/src/Resources/ResourceManager/Utilities/BicepUtility.cs b/src/Resources/ResourceManager/Utilities/BicepUtility.cs
@@ -66,6 +66,10 @@ public static string BuildFile<T>(ScriptExecutor<T> executeScript, string bicepT
                 {
                     File.Copy(bicepTemplateFilePath, tempPath, true);
                 }
+                else
+                {
+                    throw new AzPSArgumentException(Properties.Resources.InvalidBicepFilePathOrUri, bicepTemplateFilePath);
+                }
                 executeScript($"bicep build '{tempPath}'");
                 return tempPath.Replace(".bicep", ".json");
             }