Bicep support for DeploymentStacks

Xynoclafe · Xynoclafe · commit da5af36d5e70 · 2022-09-28T11:33:45.000-04:00
diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCmdletBase.cs
@@ -43,6 +43,16 @@ public DeploymentStacksSdkClient DeploymentStacksSdkClient
             }
         }
 
+        protected string ResolveBicepFile(string TemplateFile)
+        {
+            string filePath = "";
+            if (BicepUtility.IsBicepFile(TemplateFile))
+            {
+                filePath = BicepUtility.BuildFile(this.ResolvePath(TemplateFile), this.WriteVerbose, this.WriteWarning);
+            }
+            return filePath;
+        }
+
         protected Hashtable GetParameterObject(string parameterFile)
         {
             var parameters = new Hashtable();
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs
@@ -153,6 +153,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
@@ -166,6 +167,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         parameters = this.GetParameterObject(TemplateParameterFile);
                         TemplateUri = filePath;
                         break;
@@ -176,6 +178,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         parameters = GetTemplateParameterObject(TemplateParameterObject);
                         break;
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs
@@ -15,7 +15,6 @@
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
-    using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.Azure.Management.ResourceManager.Models;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using System;
@@ -155,6 +154,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
@@ -168,6 +168,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         parameters = this.GetParameterObject(TemplateParameterFile);
                         TemplateUri = filePath;
                         break;
@@ -178,6 +179,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         parameters = GetTemplateParameterObject(TemplateParameterObject);
                         break;
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs
@@ -152,6 +152,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
@@ -165,6 +166,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         parameters = this.GetParameterObject(TemplateParameterFile);
                         TemplateUri = templatePath;
                         break;
@@ -175,6 +177,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         parameters = GetTemplateParameterObject(TemplateParameterObject);
                         break;
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs
@@ -155,6 +155,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
@@ -168,6 +169,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         parameters = this.GetParameterObject(TemplateParameterFile);
                         TemplateUri = filePath;
                         break;
@@ -178,6 +180,7 @@ protected override void OnProcessRecord()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
+                        filePath = ResolveBicepFile(TemplateFile);
                         TemplateUri = filePath;
                         parameters = GetTemplateParameterObject(TemplateParameterObject);
                         break;
diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.4-preview" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
   </ItemGroup>
diff --git a/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs b/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs
@@ -40,7 +40,7 @@ public DeploymentStacksSdkClient(IDeploymentStacksClient deploymentStacksClient)
             this.DeploymentStacksClient = deploymentStacksClient;
         }
 
-        // <summary>
+        /// <summary>
         /// Parameter-less constructor for mocking
         /// </summary>
         public DeploymentStacksSdkClient()
diff --git a/src/Resources/Resources.Test/Resources.Test.csproj b/src/Resources/Resources.Test/Resources.Test.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
+    <PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.17.4-preview" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
diff --git a/src/Resources/Resources/Resources.csproj b/src/Resources/Resources/Resources.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.13.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ManagementGroups" Version="2.0.0-beta" />
-    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.4-preview" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/LocalFeed/Microsoft.Azure.Management.ResourceManager.3.17.4-preview.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.ResourceManager.3.17.4-preview.nupkg

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,16 @@ public DeploymentStacksSdkClient DeploymentStacksSdkClient`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ protected string ResolveBicepFile(string TemplateFile)`
	`47`	`+ {`
	`48`	`+ string filePath = "";`
	`49`	`+ if (BicepUtility.IsBicepFile(TemplateFile))`
	`50`	`+ {`
	`51`	`+ filePath = BicepUtility.BuildFile(this.ResolvePath(TemplateFile), this.WriteVerbose, this.WriteWarning);`
	`52`	`+ }`
	`53`	`+ return filePath;`
	`54`	`+ }`
	`55`	`+`
`46`	`56`	`protected Hashtable GetParameterObject(string parameterFile)`
`47`	`57`	`{`
`48`	`58`	`var parameters = new Hashtable();`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public DeploymentStacksSdkClient(IDeploymentStacksClient deploymentStacksClient)`
`40`	`40`	`this.DeploymentStacksClient = deploymentStacksClient;`
`41`	`41`	`}`
`42`	`42`
`43`		`- // <summary>`
	`43`	`+ /// <summary>`
`44`	`44`	`/// Parameter-less constructor for mocking`
`45`	`45`	`/// </summary>`
`46`	`46`	`public DeploymentStacksSdkClient()`