update creator file names to include api/version set in name

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -43,10 +43,10 @@ public CreateCommand()
                     Template apiVersionSetTemplate = creatorConfig.apiVersionSet != null ? apiVersionSetTemplateCreator.CreateAPIVersionSetTemplate(creatorConfig) : null;
                     Template initialAPITemplate = await apiTemplateCreator.CreateInitialAPITemplateAsync(creatorConfig);
                     Template subsequentAPITemplate = apiTemplateCreator.CreateSubsequentAPITemplate(creatorConfig);
+                    CreatorFileNames creatorFileNames = fileWriter.GenerateCreatorLinkedFileNames(creatorConfig);
+
                     if (creatorConfig.linked == true)
                     {
-                        CreatorFileNames creatorFileNames = fileWriter.GenerateCreatorLinkedFileNames();
-
                         // create linked master template
                         Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, initialAPITemplate, subsequentAPITemplate, creatorFileNames);
                         Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
@@ -58,8 +58,8 @@ public CreateCommand()
                         }
                         fileWriter.WriteJSONToFile(initialAPITemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.initialAPI));
                         fileWriter.WriteJSONToFile(subsequentAPITemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.subsequentAPI));
-                        fileWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, "/master.template.json"));
-                        fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, "/master.parameters.json"));
+                        fileWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.linkedMaster));
+                        fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, creatorFileNames.masterParameters));
                     }
                     else
                     {
@@ -69,11 +69,10 @@ public CreateCommand()
                         Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
 
                         // write templates to outputLocation
-                        fileWriter.WriteJSONToFile(initialMasterTemplate, String.Concat(creatorConfig.outputLocation, "/master1.template.json"));
-                        fileWriter.WriteJSONToFile(subsequentMasterTemplate, String.Concat(creatorConfig.outputLocation, "/master2.template.json"));
-                        fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, "/master.parameters.json"));
+                        fileWriter.WriteJSONToFile(initialMasterTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.unlinkedMasterOne));
+                        fileWriter.WriteJSONToFile(subsequentMasterTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.unlinkedMasterTwo));
+                        fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, creatorFileNames.masterParameters));
                     }
-
                     ColoredConsole.WriteLine("Templates written to output location");
                 }
                 return 0;

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

@@ -18,15 +18,20 @@ public void WriteJSONToFile(object template, string location)
             File.WriteAllText(location, jsonString);
         }
 
-        public CreatorFileNames GenerateCreatorLinkedFileNames()
+        public CreatorFileNames GenerateCreatorLinkedFileNames(CreatorConfig creatorConfig)
         {
+            string apiName = creatorConfig.api.name;
+            string versionSetName = creatorConfig.apiVersionSet.displayName;
             // generate useable object with file names for consistency throughout project
             return new CreatorFileNames()
             {
-                apiVersionSet = $@"/versionset.template.json",
-                initialAPI = $@"/initialAPI.template.json",
-                subsequentAPI = $@"/subsequentAPI.template.json",
-                master = @"/master.template.json"
+                apiVersionSet = $@"/{versionSetName}.template.json",
+                initialAPI = $@"/{apiName}-initial.api.template.json",
+                subsequentAPI = $@"/{apiName}-subsequent.api.template.json",
+                linkedMaster = $@"/{apiName}.master.template.json",
+                unlinkedMasterOne = $@"/{apiName}.master1.template.json",
+                unlinkedMasterTwo = $@"/{apiName}.master2.template.json",
+                masterParameters = @"/master.parameters.json",
             };
         }
     }

src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorFileNames.cs

@@ -6,6 +6,11 @@ public class CreatorFileNames
         public string apiVersionSet { get; set; }
         public string initialAPI { get; set; }
         public string subsequentAPI { get; set; }
-        public string master { get; set; }
+        // linked property outputs 1 master template
+        public string linkedMaster { get; set; }
+        // unlined property outputs 2 master templates
+        public string unlinkedMasterOne { get; set; }
+        public string unlinkedMasterTwo { get; set; }
+        public string masterParameters { get; set; }
     }
 }

src/APIM_ARMTemplate/apimtemplate/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "apimtemplate": {
       "commandName": "Project",
-      "commandLineArgs": "extract  --name apim-extractor --resourceGroup apim-extractor --fileFolder C:\\apim-templates --apiName httpBinAPI"
+      "commandLineArgs": "create --configFile ./Creator/ExampleFiles/YAMLConfigs/validTesting.yml"
     }
   }
 }