fix multiple api deployment for unlinked template

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -90,9 +90,11 @@ public CreateCommand()
                         fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, "/master.parameters.json"));
                     } else
                     {
-                        Template masterTemplate = masterTemplateCreator.CreateUnlinkedMasterTemplate(apiVersionSetTemplate, initialAPITemplate, creatorFileNames);
+                        Template initialMasterTemplate = masterTemplateCreator.CreateInitialUnlinkedMasterTemplate(apiVersionSetTemplate, initialAPITemplate);
+                        Template subsequentMasterTemplate = masterTemplateCreator.CreateSubsequentUnlinkedMasterTemplate(subsequentAPITemplate);
                         Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
-                        fileWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, "/master.template.json"));
+                        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"));
                     }
 

src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml

@@ -1,7 +1,7 @@
 version: 0.0.1   # Required
-apimServiceName: LucasLinked2   # Required, must match name of an apim service deployed in the specified resource group
+apimServiceName: LucasUnlinked2   # Required, must match name of an apim service deployed in the specified resource group
 apiVersionSet:   # Optional
-    displayName: myAPIVersionSet
+    displayName: swaggerPetstoreVersionSet
     description: a description
     versioningScheme: Query
     versionQueryName: versionQuery
@@ -23,5 +23,5 @@ api:
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml   # Optional, can be url or local file
   products: starter, platinum    # Optional, adds api to the specified products
 outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates   # Required, folder the creator will write the templates to
-linked: true   # Optional
+linked: false   # Optional
 linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml   # Required if 'linked' property is set to true

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

@@ -96,10 +96,12 @@ public async Task<APITemplateResource> CreateInitialAPITemplateResource(CreatorC
                 // if the template is not linked the depends on for the apiVersionSet needs to be inlined here
                 dependsOn = new string[] { }
             };
+            // if there is a linked template and a version set was created, the initial api depends on it
             if (creatorConfig.linked == false && creatorConfig.apiVersionSet != null)
             {
                 apiTemplateResource.dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]" };
             }
+            // set the version set id
             if (creatorConfig.apiVersionSet != null)
             {
                 apiTemplateResource.properties.apiVersionSetId = "[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]";

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

@@ -45,9 +45,8 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             return masterTemplate;
         }
 
-        public Template CreateUnlinkedMasterTemplate(Template apiVersionSetTemplate,
-            Template apiTemplate,
-            CreatorFileNames creatorFileNames)
+        public Template CreateInitialUnlinkedMasterTemplate(Template apiVersionSetTemplate,
+            Template initialAPITemplate)
         {
             // create empty template
             Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
@@ -65,7 +64,25 @@ public Template CreateUnlinkedMasterTemplate(Template apiVersionSetTemplate,
             }
 
             //api
-            resources.AddRange(apiTemplate.resources);
+            resources.AddRange(initialAPITemplate.resources);
+
+            masterTemplate.resources = resources.ToArray();
+            return masterTemplate;
+        }
+
+        public Template CreateSubsequentUnlinkedMasterTemplate(Template subequentAPITemplate)
+        {
+            // create empty template
+            Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
+
+            // add parameters
+            masterTemplate.parameters = this.CreateMasterTemplateParameters(false);
+
+            // add all resources directly
+            List<TemplateResource> resources = new List<TemplateResource>();
+
+            //api
+            resources.AddRange(subequentAPITemplate.resources);
 
             masterTemplate.resources = resources.ToArray();
             return masterTemplate;