Merge pull request #3 from WhitWaldo/batch-fixes

Fixing several issues in Azure Batch contribution
rudiv · May 18, 2024 · 0ffd1a4 · 0ffd1a4
2 parents 41b9def + 0f621da
commit 0ffd1a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Achieve.Aspire.AzureProvisioning/Bicep/Batch/BatchAccountResource.cs b/src/Achieve.Aspire.AzureProvisioning/Bicep/Batch/BatchAccountResource.cs
@@ -46,7 +46,7 @@ public BatchAccountResource(string name) : base(resourceType)
 
     protected override void ValidateResourceType()
     {
-        if (Name.MatchesConstraints(3, 24, StringExtensions.CharacterClass.LowercaseLetter))
+        if (!AccountName.MatchesConstraints(3, 24, StringExtensions.CharacterClass.LowercaseLetter))
         {
             throw new InvalidOperationException(
                 "Name must be between 3-24 characters and must contain only lowercase letters and numbers");
@@ -159,12 +159,12 @@ private void AddNetworkProfile(BicepResourcePropertyBag bag)
             }
             networkProfileBag.AddProperty(accountAccessBag);
 
-
-            //NOde management access
+            //Node management access
             var nodeManagementAccessBag = new BicepResourcePropertyBag("nodeManagementAccess", 3)
                 .AddProperty("defaultAccess",
                     new BicepStringValue(
                         Properties.NetworkProfile.NodeManagementAccess.DefaultAction.GetValueFromEnumMember()));
+            networkProfileBag.AddProperty(nodeManagementAccessBag);
 
             var nodeIpRules = new BicepResourcePropertyArray("ipRules", 4);
             foreach (var rule in Properties.NetworkProfile.NodeManagementAccess.IpRules)

diff --git a/src/Achieve.Aspire.AzureProvisioning/Bicep/Batch/BatchCertificateResource.cs b/src/Achieve.Aspire.AzureProvisioning/Bicep/Batch/BatchCertificateResource.cs
@@ -20,9 +20,8 @@ public sealed class BatchCertificateResource : BicepResource
 
     public string Thumbprint { get; set; }
 
-    public string ThumbprintAlgorithm => "SHA1";
+    public static string ThumbprintAlgorithm => "SHA1";
 
-
     public BatchCertificateResource(BatchAccountResource parent, string name) : base(resourceType)
     {
         Parent = parent;