generated filename changes: if baseFileName is blank, skip "-", remove apim instance name from api filename (#364)

Author: straubwa

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -116,7 +116,7 @@ public CreateCommand()
                         APITemplateResource apiResource = apiTemplate.resources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as APITemplateResource;
                         APIConfig providedAPIConfiguration = creatorConfig.apis.FirstOrDefault(api => apiResource.name.Contains(api.name, StringComparison.Ordinal));
                         // if the api version is not null the api is split into multiple templates. If the template is split and the content value has been set, then the template is for a subsequent api
-                        string apiFileName = fileNameGenerator.GenerateCreatorAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value != null, creatorConfig.apimServiceName);
+                        string apiFileName = fileNameGenerator.GenerateCreatorAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value != null);
                         fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, apiFileName));
                     }
                     if (globalServicePolicyTemplate != null)

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

@@ -7,19 +7,22 @@ public class FileNameGenerator
 
         public FileNames GenerateFileNames(string baseFileName)
         {
+            if (baseFileName.Length > 0)
+                baseFileName += "-";
+
             // generate useable object with file names for consistency throughout project
             return new FileNames()
             {
-                apiVersionSets = $@"/{baseFileName}-apiVersionSets.template.json",
-                authorizationServers = $@"/{baseFileName}-authorizationServers.template.json",
-                backends = $@"/{baseFileName}-backends.template.json",
-                globalServicePolicy = $@"/{baseFileName}-globalServicePolicy.template.json",
-                loggers = $@"/{baseFileName}-loggers.template.json",
-                namedValues = $@"/{baseFileName}-namedValues.template.json",
-                tags = $@"/{baseFileName}-tags.template.json",
-                products = $@"/{baseFileName}-products.template.json",
-                parameters = $@"/{baseFileName}-parameters.json",
-                linkedMaster = $@"/{baseFileName}-master.template.json",
+                apiVersionSets = $@"/{baseFileName}apiVersionSets.template.json",
+                authorizationServers = $@"/{baseFileName}authorizationServers.template.json",
+                backends = $@"/{baseFileName}backends.template.json",
+                globalServicePolicy = $@"/{baseFileName}globalServicePolicy.template.json",
+                loggers = $@"/{baseFileName}loggers.template.json",
+                namedValues = $@"/{baseFileName}namedValues.template.json",
+                tags = $@"/{baseFileName}tags.template.json",
+                products = $@"/{baseFileName}products.template.json",
+                parameters = $@"/{baseFileName}parameters.json",
+                linkedMaster = $@"/{baseFileName}master.template.json",
                 apis = "/Apis",
                 splitAPIs = "/SplitAPIs",
                 versionSetMasterFolder = "/VersionSetMasterFolder",
@@ -29,23 +32,27 @@ public FileNames GenerateFileNames(string baseFileName)
             };
         }
 
-        public string GenerateCreatorAPIFileName(string apiName, bool isSplitAPI, bool isInitialAPI, string apimServiceName)
+        public string GenerateCreatorAPIFileName(string apiName, bool isSplitAPI, bool isInitialAPI)
         {
             // 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 = GenerateOriginalAPIName(apiName);
+
             if (isSplitAPI == true)
             {
-                return isInitialAPI == true ? $@"/{apimServiceName}-{sanitizedAPIName}-initial.api.template.json" : $@"/{apimServiceName}-{sanitizedAPIName}-subsequent.api.template.json";
+                return isInitialAPI == true ? $@"/{sanitizedAPIName}-initial.api.template.json" : $@"/{sanitizedAPIName}-subsequent.api.template.json";
             }
             else
             {
-                return $@"/{apimServiceName}-{sanitizedAPIName}.api.template.json";
+                return $@"/{sanitizedAPIName}.api.template.json";
             }
         }
 
         public string GenerateExtractorAPIFileName(string singleAPIName, string baseFileName)
         {
-            return singleAPIName == null ? $@"/{baseFileName}-apis.template.json" : $@"/{baseFileName}-{singleAPIName}-api.template.json";
+            if (baseFileName.Length > 0)
+                baseFileName += "-";
+
+            return singleAPIName == null ? $@"/{baseFileName}apis.template.json" : $@"/{baseFileName}{singleAPIName}-api.template.json";
         }
 
         public string GenerateOriginalAPIName(string apiName)

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

@@ -86,12 +86,12 @@ public Template CreateLinkedMasterTemplate(CreatorConfig creatorConfig,
                     string initialAPIDeploymentResourceName = $"{originalAPIName}-InitialAPITemplate";
                     string subsequentAPIDeploymentResourceName = $"{originalAPIName}-SubsequentAPITemplate";
 
-                    string initialAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true, apimServiceName);
+                    string initialAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true);
                     string initialAPIUri = GenerateLinkedTemplateUri(creatorConfig, initialAPIFileName);
                     string[] initialAPIDependsOn = CreateAPIResourceDependencies(globalServicePolicyTemplate, apiVersionSetTemplate, productsTemplate, loggersTemplate, backendsTemplate, authorizationServersTemplate, tagTemplate, apiInfo);
                     resources.Add(this.CreateLinkedMasterTemplateResource(initialAPIDeploymentResourceName, initialAPIUri, initialAPIDependsOn));
 
-                    string subsequentAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, false, apimServiceName);
+                    string subsequentAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, false);
                     string subsequentAPIUri = GenerateLinkedTemplateUri(creatorConfig, subsequentAPIFileName);
                     string[] subsequentAPIDependsOn = new string[] { $"[resourceId('Microsoft.Resources/deployments', '{initialAPIDeploymentResourceName}')]" };
                     resources.Add(this.CreateLinkedMasterTemplateResource(subsequentAPIDeploymentResourceName, subsequentAPIUri, subsequentAPIDependsOn));
@@ -101,7 +101,7 @@ public Template CreateLinkedMasterTemplate(CreatorConfig creatorConfig,
                     // add a deployment resource for the unified api template file
                     string originalAPIName = fileNameGenerator.GenerateOriginalAPIName(apiInfo.name);
                     string unifiedAPIDeploymentResourceName = $"{originalAPIName}-APITemplate";
-                    string unifiedAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true, apimServiceName);
+                    string unifiedAPIFileName = fileNameGenerator.GenerateCreatorAPIFileName(apiInfo.name, apiInfo.isSplit, true);
                     string unifiedAPIUri = GenerateLinkedTemplateUri(creatorConfig, unifiedAPIFileName);
                     string[] unifiedAPIDependsOn = CreateAPIResourceDependencies(globalServicePolicyTemplate, apiVersionSetTemplate, productsTemplate, loggersTemplate, backendsTemplate, authorizationServersTemplate, tagTemplate, apiInfo);
                     resources.Add(this.CreateLinkedMasterTemplateResource(unifiedAPIDeploymentResourceName, unifiedAPIUri, unifiedAPIDependsOn));