Hotfix/devcenter

Webapp/SDAF/Controllers/Helper.cs

@@ -129,7 +129,7 @@ public static string WriteTfLine<T>(PropertyInfo property, T model)
                         str.AppendLine($"  \"{t.Key}\" = \"{t.Value}\",");
                     }
                 }
-                str.Append("}");
+                str.Append('}');
             }
             else if (property.PropertyType.IsArray)
             {
@@ -140,7 +140,7 @@ public static string WriteTfLine<T>(PropertyInfo property, T model)
                     str.Append($"\"{val}\", ");
                 }
                 str.Remove(str.Length - 2, 2);
-                str.Append("]");
+                str.Append(']');
             }
             else if (property.PropertyType == typeof(Image))
             {
@@ -156,7 +156,7 @@ public static string WriteTfLine<T>(PropertyInfo property, T model)
                     str.AppendLine("  sku = " + $"\"{img.sku}\",");
                     str.AppendLine("  version = " + $"\"{img.version}\",");
                     str.AppendLine("  type = " + $"\"{img.type}\"");
-                    str.Append("}");
+                    str.Append('}');
                 }
                 else
                 {
@@ -266,7 +266,7 @@ public static async Task<byte[]> ProcessFormFile(IFormFile formFile,
             // a display name.
             MemberInfo property =
                 typeof(FileUploadModel).GetProperty(
-                    formFile.Name[(formFile.Name.IndexOf(".", StringComparison.Ordinal) + 1)..]);
+                    formFile.Name[(formFile.Name.IndexOf('.', StringComparison.Ordinal) + 1)..]);
 
             if (property != null)
             {
@@ -373,22 +373,22 @@ public static string TfvarToJson(string hclString)
                     jsonString.AppendLine("}");
                     break;
                 }
-                else if (currLine.StartsWith("#") || currLine == "")
+                else if (currLine.StartsWith('#') || currLine == "")
                 {
                     continue;
                 }
-                else if (currLine.StartsWith("}"))
+                else if (currLine.StartsWith('}'))
                 {
                     jsonString.Remove(jsonString.Length - 3, 1);
                     jsonString.AppendLine("},");
                 }
                 else
                 {
-                    int equalIndex = currLine.IndexOf("=");
+                    int equalIndex = currLine.IndexOf('=');
                     if (equalIndex >= 0)
                     {
                         string key = currLine[..equalIndex].Trim();
-                        if (!key.StartsWith("\""))
+                        if (!key.StartsWith('\"'))
                         {
                             key = "\"" + key + "\"";
                         }
@@ -398,11 +398,11 @@ public static string TfvarToJson(string hclString)
                         {
                             value += "[";
                             currLine = stringReader.ReadLine();
-                            while (!currLine.StartsWith("}"))
+                            while (!currLine.StartsWith('}'))
                             {
-                                equalIndex = currLine.IndexOf("=");
+                                equalIndex = currLine.IndexOf('=');
                                 var tagKey = currLine[..equalIndex].Trim();
-                                if (!tagKey.StartsWith("\""))
+                                if (!tagKey.StartsWith('\"'))
                                 {
                                     tagKey = "\"" + tagKey + "\"";
                                 }
@@ -415,45 +415,45 @@ public static string TfvarToJson(string hclString)
                             value = value.Trim(',');
                             value += "],";
                         }
-                        else if (key.ToLower() == "\"network_address_space\"")
-                        {
-                            value = currLine[(equalIndex + 1)..].Trim();
-                            if (!value.StartsWith('['))
-                            {
-                                value += ",";
-                            }
-                            else
-                            {
-                                string fixedValue = value.Replace('[', ' ').Replace(']', ' ');
-                                value = fixedValue.Trim() + ",";
-                            }
+                        //else if (key.ToLower() == "\"network_address_space\"")
+                        //{
+                        //    value = currLine[(equalIndex + 1)..].Trim();
+                        //    if (!value.StartsWith('['))
+                        //    {
+                        //        value += ",";
+                        //    }
+                        //    else
+                        //    {
+                        //        string fixedValue = value.Replace('[', ' ').Replace(']', ' ');
+                        //        value = fixedValue.Trim() + ",";
+                        //    }
 
-                        }
+                        //}
                         else if (key.EndsWith("configuration_settings\""))
                         {
                             value += "[";
-                            currLine = stringReader.ReadLine();
-                            while (!currLine.StartsWith("}"))
+                            currLine = stringReader.ReadLine().Trim();
+                            while (!currLine.StartsWith('}'))
                             {
-                                equalIndex = currLine.IndexOf("=");
+                                equalIndex = currLine.IndexOf('=');
                                 var tagKey = currLine[..equalIndex].Trim();
-                                if (!tagKey.StartsWith("\""))
+                                if (!tagKey.StartsWith('\"'))
                                 {
                                     tagKey = "\"" + tagKey + "\"";
                                 }
                                 var tagValue = currLine[(equalIndex + 1)..].Trim();
                                 value += "{";
                                 value += "\"Key\":" + tagKey + "," + "\"Value\":" + tagValue.Trim(',');
                                 value += "},";
-                                currLine = stringReader.ReadLine();
+                                currLine = stringReader.ReadLine().Trim();
                             }
                             value = value.Trim(',');
                             value += "],";
                         }
                         else
                         {
                             value = currLine[(equalIndex + 1)..].Trim();
-                            if (!value.EndsWith(",") && !value.EndsWith("{"))
+                            if (!value.EndsWith(',') && !value.EndsWith('{'))
                             {
                                 value += ",";
                             }

Webapp/SDAF/Controllers/LandscapeController.cs

@@ -5,12 +5,14 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Net.Http.Headers;
+using Microsoft.TeamFoundation.Common;
 using Newtonsoft.Json;
 using SDAFWebApp.Models;
 using SDAFWebApp.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
@@ -192,7 +194,18 @@ public async Task<IActionResult> CreateAsync(LandscapeModel landscape)
                     landscape.Id = Helper.GenerateId(landscape);
                     DateTime currentDateAndTime = DateTime.Now;
                     landscape.LastModified = currentDateAndTime.ToShortDateString();
-                    landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                    if (!landscape.subscription.IsNullOrEmpty())
+                    {
+                        landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                    }
+
+                    if (landscape.custom_random_id.IsNullOrEmpty())
+                    {
+                        string chars = "ABCDEF0123456789";
+                        var random = new Random();
+                        landscape.custom_random_id = new string(Enumerable.Range(0, 3)
+                            .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                    }
 
                     await _landscapeService.CreateAsync(new LandscapeEntity(landscape));
                     TempData["success"] = "Successfully created workload zone " + landscape.Id;
@@ -247,7 +260,18 @@ public async Task<RedirectToActionResult> DeployConfirmedAsync(string id, string
                 LandscapeModel landscape = await GetById(id, partitionKey);
 
                 string path = $"/LANDSCAPE/{id}/{id}.tfvars";
-                landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                if (!landscape.subscription.IsNullOrEmpty())
+                {
+                    landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                }
+                if (landscape.custom_random_id.IsNullOrEmpty())
+                {
+                    string chars = "ABCDEF0123456789";
+                    var random = new Random();
+                    landscape.custom_random_id = new string(Enumerable.Range(0, 3)
+                        .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                }
+
                 string content = Helper.ConvertToTerraform(landscape);
 
                 await restHelper.UpdateRepo(path, content);
@@ -342,6 +366,18 @@ public async Task<IActionResult> EditAsync(LandscapeModel landscape)
                     if (newId != landscape.Id)
                     {
                         landscape.Id = newId;
+                        if (!landscape.subscription.IsNullOrEmpty())
+                        {
+                            landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                        }
+                        if (landscape.custom_random_id.IsNullOrEmpty())
+                        {
+                            string chars = "ABCDEF0123456789";
+                            var random = new Random();
+                            landscape.custom_random_id = new string(Enumerable.Range(0, 3)
+                                .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                        }
+
                         await SubmitNewAsync(landscape);
                         string id = landscape.Id;
                         string path = $"/LANDSCAPE/{id}/{id}.tfvars";
@@ -369,6 +405,17 @@ public async Task<IActionResult> EditAsync(LandscapeModel landscape)
                         }
                         DateTime currentDateAndTime = DateTime.Now;
                         landscape.LastModified = currentDateAndTime.ToShortDateString();
+                        if (!landscape.subscription.IsNullOrEmpty())
+                        {
+                            landscape.subscription_id = landscape.subscription.Replace("/subscriptions/", "");
+                        }
+                        if (landscape.custom_random_id.IsNullOrEmpty())
+                        {
+                            string chars = "ABCDEF0123456789";
+                            var random = new Random();
+                            landscape.custom_random_id = new string(Enumerable.Range(0, 3)
+                                .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                        }
 
                         await _landscapeService.UpdateAsync(new LandscapeEntity(landscape));
                         TempData["success"] = "Successfully updated workload zone " + landscape.Id;

Webapp/SDAF/Controllers/RestHelper.cs

@@ -431,7 +431,10 @@ public async Task UpdateVariableGroup(EnvironmentModel environment, string newNa
             dynamicVariables.ARM_CLIENT_SECRET = JToken.FromObject(environment.variables.ARM_CLIENT_SECRET);
             dynamicVariables.ARM_TENANT_ID = JToken.FromObject(environment.variables.ARM_TENANT_ID);
             dynamicVariables.ARM_SUBSCRIPTION_ID = JToken.FromObject(environment.variables.ARM_SUBSCRIPTION_ID);
-            dynamicVariables.sap_fqdn = JToken.FromObject(environment.variables.sap_fqdn);
+            dynamicVariables.APPLICATION_CONFIGURATION_NAME = JToken.FromObject(environment.variables.APPLICATION_CONFIGURATION_NAME);
+            dynamicVariables.TERRAFORM_REMOTE_STORAGE_ACCOUNT_NAME = JToken.FromObject(environment.variables.TERRAFORM_REMOTE_STORAGE_ACCOUNT_NAME);
+            dynamicVariables.DEPLOYER_KEYVAULT = JToken.FromObject(environment.variables.DEPLOYER_KEYVAULT);
+            dynamicVariables.CONTROL_PLANE_NAME = JToken.FromObject(environment.variables.CONTROL_PLANE_NAME);
             dynamicVariables.POOL = JToken.FromObject(environment.variables.POOL);
 
             dynamicEnvironment.variables = dynamicVariables;

Webapp/SDAF/Controllers/SystemController.cs

@@ -1,17 +1,19 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using SDAFWebApp.Models;
-using SDAFWebApp.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.Net.Http.Headers;
+using Microsoft.TeamFoundation.Common;
 using Newtonsoft.Json;
+using SDAFWebApp.Models;
+using SDAFWebApp.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
@@ -202,7 +204,20 @@ public async Task<IActionResult> CreateAsync(SystemModel system)
                     system.Id = Helper.GenerateId(system);
                     DateTime currentDateAndTime = DateTime.Now;
                     system.LastModified = currentDateAndTime.ToShortDateString();
-                    system.subscription_id = system.subscription.Replace("/subscriptions/","");
+
+                    if (!system.subscription.IsNullOrEmpty())
+                    {
+                        system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                    }
+                    if (system.custom_random_id.IsNullOrEmpty())
+                    {
+                        string chars = "ABCDEF0123456789";
+                        var random = new Random();
+                        system.custom_random_id = new string(Enumerable.Range(0, 3)
+                            .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                    }
+
+
                     SystemEntity systemEntity = new(system);
                     await _systemService.CreateAsync(systemEntity);
                     TempData["success"] = "Successfully created system " + system.Id;
@@ -287,7 +302,17 @@ public async Task<RedirectToActionResult> DeployConfirmedAsync(string id, string
                 }
 
                 string path = $"/SYSTEM/{id}/{id}.tfvars";
-                system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                if (!system.subscription.IsNullOrEmpty())
+                {
+                    system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                }
+                if (system.custom_random_id.IsNullOrEmpty())
+                {
+                    string chars = "ABCDEF0123456789";
+                    var random = new Random();
+                    system.custom_random_id = new string(Enumerable.Range(0, 3)
+                        .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                }
                 string content = Helper.ConvertToTerraform(system);
 
                 await restHelper.UpdateRepo(path, content);
@@ -449,7 +474,18 @@ public async Task<IActionResult> EditAsync(SystemModel system)
                                 system.Description = system.database_platform + " distributed system on " + system.scs_server_image.publisher + " " + system.scs_server_image.offer + " " + system.scs_server_image.sku;
                             }
                         }
-                        system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                        if (!system.subscription.IsNullOrEmpty())
+                        {
+                            system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                        }
+                        if (system.custom_random_id.IsNullOrEmpty())
+                        {
+                            string chars = "ABCDEF0123456789";
+                            var random = new Random();
+                            system.custom_random_id = new string(Enumerable.Range(0, 3)
+                                .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                        }
+
                         await SubmitNewAsync(system);
                         string id = system.Id;
                         string path = $"/SYSTEM/{id}/{id}.tfvars";
@@ -487,6 +523,18 @@ public async Task<IActionResult> EditAsync(SystemModel system)
                                 system.Description = system.database_platform + " distributed system on " + system.scs_server_image.publisher + " " + system.scs_server_image.offer + " " + system.scs_server_image.sku;
                             }
                         }
+                        if (!system.subscription.IsNullOrEmpty())
+                        {
+                            system.subscription_id = system.subscription.Replace("/subscriptions/", "");
+                        }
+                        if (system.custom_random_id.IsNullOrEmpty())
+                        {
+                            string chars = "ABCDEF0123456789";
+                            var random = new Random();
+                            system.custom_random_id = new string(Enumerable.Range(0, 3)
+                                .Select(_ => chars[random.Next(chars.Length)]).ToArray());
+                        }
+
                         DateTime currentDateAndTime = DateTime.Now;
                         system.LastModified = currentDateAndTime.ToShortDateString();
                         await _systemService.UpdateAsync(new SystemEntity(system));

Webapp/SDAF/Models/CustomValidators.cs

@@ -40,8 +40,30 @@ public override bool IsValid(object value)
         }
         private static bool RegexValidation(object value, string pattern)
         {
-            if (value == null || Regex.IsMatch((string)value, pattern)) return true;
-            else return false;
+            if(value == null) return true; // Allow null values to pass validation
+
+            bool isArray = value.GetType().IsArray;
+            bool returnValue = true;
+            if (isArray)
+            {
+                string[] arr = value as string[];
+                foreach (string v in arr)
+                {
+                    if (!Regex.IsMatch(v, pattern))
+                    {
+                        returnValue = false;
+                    }
+                }
+            }
+            else
+            {
+                if (!Regex.IsMatch((string)value, pattern))
+                {
+                    returnValue = false;
+                }
+
+            }
+            return returnValue;
         }
         public class AddressPrefixValidator : ValidationAttribute
         {
@@ -344,10 +366,12 @@ protected override ValidationResult IsValid(object value, ValidationContext cont
                 bool isDefault = (bool)context.ObjectInstance.GetType().GetProperty("IsDefault").GetValue(context.ObjectInstance);
                 if (isDefault) return ValidationResult.Success;
 
-                string prefix = (string)value;
+                // Safe cast using 'as'
+                string[] arr = value as string[];
+
                 string armId = (string)context.ObjectInstance.GetType().GetProperty("network_arm_id").GetValue(context.ObjectInstance);
 
-                if (prefix == null && armId == null)
+                if (arr.All(string.IsNullOrWhiteSpace) && armId == null)
                 {
                     return new ValidationResult($"At least one of network_address_space or network_arm_id must be present.");
                 }