rm special characters from deployment resources gen from revision append behavior

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Common/FileHandlers/FileNameGenerator.cs

@@ -24,7 +24,7 @@ public FileNames GenerateFileNames(string apimServiceName)
         public string GenerateCreatorAPIFileName(string apiName, bool isSplitAPI, bool isInitialAPI, string apimServiceName)
         {
             // in case the api name has been appended with ;rev={revisionNumber}, take only the api name initially provided by the user in the creator config
-            string sanitizedAPIName = apiName.Split(";")[0];
+            string sanitizedAPIName = GenerateOriginalAPIName(apiName);
             if (isSplitAPI == true)
             {
                 return isInitialAPI == true ? $@"/{apimServiceName}-{sanitizedAPIName}-initial.api.template.json" : $@"/{apimServiceName}-{sanitizedAPIName}-subsequent.api.template.json";
@@ -39,6 +39,13 @@ public string GenerateExtractorAPIFileName(string singleAPIName, string apimServ
         {
             return singleAPIName == null ? $@"/{apimServiceName}-apis.template.json" : $@"/{apimServiceName}-{singleAPIName}-api.template.json";
         }
+
+        public string GenerateOriginalAPIName(string apiName)
+        {
+            // in case the api name has been appended with ;rev={revisionNumber}, take only the api name initially provided by the user in the creator config
+            string originalName = apiName.Split(";")[0];
+            return originalName;
+        }
     }
 
     public class FileNames

src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs

@@ -66,8 +66,9 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
                 if(apiInfo.isSplit == true)
                 {
                     // add a deployment resource for both api template files
-                    string initialAPIDeploymentResourceName = $"{apiInfo.name}-InitialAPITemplate";
-                    string subsequentAPIDeploymentResourceName = $"{apiInfo.name}-SubsequentAPITemplate";
+                    string originalAPIName = fileNameGenerator.GenerateOriginalAPIName(apiInfo.name);
+                    string initialAPIDeploymentResourceName = $"{originalAPIName}-InitialAPITemplate";
+                    string subsequentAPIDeploymentResourceName = $"{originalAPIName}-SubsequentAPITemplate";
 
                     string initialAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true, apimServiceName);
                     string initialAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{initialAPIFileName}')]";
@@ -81,7 +82,8 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
                 } else
                 {
                     // add a deployment resource for the unified api template file
-                    string unifiedAPIDeploymentResourceName = $"{apiInfo.name}-APITemplate";
+                    string originalAPIName = fileNameGenerator.GenerateOriginalAPIName(apiInfo.name);
+                    string unifiedAPIDeploymentResourceName = $"{originalAPIName}-APITemplate";
                     string unifiedAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true, apimServiceName);
                     string unifiedAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{unifiedAPIFileName}')]";
                     string[] unifiedAPIDependsOn = CreateAPIResourceDependencies(apiVersionSetTemplate, productsTemplate, loggersTemplate, backendsTemplate, authorizationServersTemplate, apiInfo);