fix multiple api deployment for linked template

lucashuet93 · lucashuet93 · commit bb42339d4bb9 · 2019-01-25T17:48:22.000-05:00
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs
@@ -72,23 +72,25 @@ public CreateCommand()
                     // create templates from provided configuration
                     CreatorFileNames creatorFileNames = fileWriter.GenerateCreatorFileNames();
                     Template apiVersionSetTemplate = creatorConfig.apiVersionSet != null ? apiVersionSetTemplateCreator.CreateAPIVersionSetTemplate(creatorConfig) : null;
-                    Template apiTemplate = await apiTemplateCreator.CreateAPITemplateAsync(creatorConfig);
-                    if(creatorConfig.linked == true)
+                    Template initialAPITemplate = await apiTemplateCreator.CreateInitialAPITemplateAsync(creatorConfig);
+                    Template subsequentAPITemplate = await apiTemplateCreator.CreateSubsequentAPITemplateAsync(creatorConfig);
+                    if (creatorConfig.linked == true)
                     {
-                        Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                        Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, initialAPITemplate, subsequentAPITemplate, creatorFileNames);
                         Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
 
                         // write templates to outputLocation
                         if (apiVersionSetTemplate != null)
                         {
                             fileWriter.WriteJSONToFile(apiVersionSetTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.apiVersionSet));
                         }
-                        fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.api));
+                        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"));
                     } else
                     {
-                        Template masterTemplate = masterTemplateCreator.CreateUnlinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                        Template masterTemplate = masterTemplateCreator.CreateUnlinkedMasterTemplate(apiVersionSetTemplate, initialAPITemplate, creatorFileNames);
                         Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
                         fileWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, "/master.template.json"));
                         fileWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, "/master.parameters.json"));
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml
@@ -1,5 +1,5 @@
 version: 0.0.1   # Required
-apimServiceName: LucasUnlinked2   # Required, must match name of an apim service deployed in the specified resource group
+apimServiceName: LucasLinked2   # Required, must match name of an apim service deployed in the specified resource group
 apiVersionSet:   # Optional
     displayName: myAPIVersionSet
     description: a description
@@ -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: false   # Optional
+linked: true   # Optional
 linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml   # Required if 'linked' property is set to true
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileWriter.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/FileHandlers/FileWriter.cs
@@ -23,7 +23,8 @@ public CreatorFileNames GenerateCreatorFileNames()
             return new CreatorFileNames()
             {
                 apiVersionSet = $@"/versionset.template.json",
-                api = $@"/api.template.json",
+                initialAPI = $@"/initialAPI.template.json",
+                subsequentAPI = $@"/subsequentAPI.template.json",
                 master = @"/master.template.json"
             };
         }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorFileNames.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorFileNames.cs
@@ -4,7 +4,8 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create
     public class CreatorFileNames
     {
         public string apiVersionSet { get; set; }
-        public string api { get; set; }
+        public string initialAPI { get; set; }
+        public string subsequentAPI { get; set; }
         public string master { get; set; }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs
@@ -20,7 +20,27 @@ public APITemplateCreator(FileReader fileReader, TemplateCreator templateCreator
             this.productAPITemplateCreator = productAPITemplateCreator;
         }
 
-        public async Task<Template> CreateAPITemplateAsync(CreatorConfig creatorConfig)
+        public async Task<Template> CreateInitialAPITemplateAsync(CreatorConfig creatorConfig)
+        {
+            // create empty template
+            Template apiTemplate = this.templateCreator.CreateEmptyTemplate();
+
+            // add parameters
+            apiTemplate.parameters = new Dictionary<string, TemplateParameterProperties>
+            {
+                { "ApimServiceName", new TemplateParameterProperties(){ type = "string" } }
+            };
+
+            List<TemplateResource> resources = new List<TemplateResource>();
+            // create api resource with properties
+            APITemplateResource initialAPITemplateResource = await this.CreateInitialAPITemplateResource(creatorConfig);
+            resources.Add(initialAPITemplateResource);
+
+            apiTemplate.resources = resources.ToArray();
+            return apiTemplate;
+        }
+
+        public async Task<Template> CreateSubsequentAPITemplateAsync(CreatorConfig creatorConfig)
         {
             // create empty template
             Template apiTemplate = this.templateCreator.CreateEmptyTemplate();
@@ -36,12 +56,10 @@ public async Task<Template> CreateAPITemplateAsync(CreatorConfig creatorConfig)
 
             List<TemplateResource> resources = new List<TemplateResource>();
             // create api resource with properties
-            APITemplateResource initialAPITemplateResource = await this.CreateInitialAPITemplateResource(creatorConfig);
             APITemplateResource subsequentAPITemplateResource = await this.CreateSubsequentAPITemplateResourceAsync(creatorConfig);
             PolicyTemplateResource apiPolicyResource = await this.policyTemplateCreator.CreateAPIPolicyTemplateResourceAsync(creatorConfig, dependsOnSubsequentAPI);
             List<PolicyTemplateResource> operationPolicyResources = await this.policyTemplateCreator.CreateOperationPolicyTemplateResourcesAsync(creatorConfig, dependsOnSubsequentAPI);
             List<ProductAPITemplateResource> productAPIResources = this.productAPITemplateCreator.CreateProductAPITemplateResources(creatorConfig, dependsOnSubsequentAPI);
-            resources.Add(initialAPITemplateResource);
             resources.Add(subsequentAPITemplateResource);
             resources.Add(apiPolicyResource);
             resources.AddRange(operationPolicyResources);
@@ -60,7 +78,7 @@ public async Task<APITemplateResource> CreateInitialAPITemplateResource(CreatorC
             // create api resource with properties
             APITemplateResource apiTemplateResource = new APITemplateResource()
             {
-                name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}-initial')]",
+                name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}')]",
                 type = "Microsoft.ApiManagement/service/apis",
                 apiVersion = "2018-01-01",
                 properties = new APITemplateProperties()
@@ -112,7 +130,7 @@ public async Task<APITemplateResource> CreateSubsequentAPITemplateResourceAsync(
                     // supplied via optional arguments
                     path = creatorConfig.api.suffix
                 },
-                dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis', parameters('ApimServiceName'), '{creatorConfig.api.name}-initial')]" }
+                dependsOn = new string[] { }
             };
             return apiTemplateResource;
         }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs
@@ -12,7 +12,8 @@ public MasterTemplateCreator(TemplateCreator templateCreator)
         }
 
         public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
-            Template apiTemplate,
+            Template initialAPITemplate,
+            Template subsequentAPITemplate,
             CreatorFileNames creatorFileNames)
         {
             // create empty template
@@ -32,9 +33,13 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             }
 
             //api
-            string initialAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.api}')]";
+            string initialAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.initialAPI}')]";
             string[] initialAPIDependsOn = apiVersionSetTemplate != null ? new string[] { "[resourceId('Microsoft.Resources/deployments', 'versionSetTemplate')]" } : new string[] { };
-            resources.Add(this.CreateMasterTemplateResource("apiTemplate", initialAPIUri, initialAPIDependsOn));
+            resources.Add(this.CreateMasterTemplateResource("initialAPITemplate", initialAPIUri, initialAPIDependsOn));
+
+            string subsequentAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.subsequentAPI}')]";
+            string[] subsequentAPIDependsOn = apiVersionSetTemplate != null ? new string[] { "[resourceId('Microsoft.Resources/deployments', 'initialAPITemplate')]" } : new string[] { };
+            resources.Add(this.CreateMasterTemplateResource("subsequentAPITemplate", subsequentAPIUri, subsequentAPIDependsOn));
 
             masterTemplate.resources = resources.ToArray();
             return masterTemplate;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public CreatorFileNames GenerateCreatorFileNames()`
`23`	`23`	`return new CreatorFileNames()`
`24`	`24`	`{`
`25`	`25`	`apiVersionSet = $@"/versionset.template.json",`
`26`		`- api = $@"/api.template.json",`
	`26`	`+ initialAPI = $@"/initialAPI.template.json",`
	`27`	`+ subsequentAPI = $@"/subsequentAPI.template.json",`
`27`	`28`	`master = @"/master.template.json"`
`28`	`29`	`};`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create`
`4`	`4`	`public class CreatorFileNames`
`5`	`5`	`{`
`6`	`6`	`public string apiVersionSet { get; set; }`
`7`		`- public string api { get; set; }`
	`7`	`+ public string initialAPI { get; set; }`
	`8`	`+ public string subsequentAPI { get; set; }`
`8`	`9`	`public string master { get; set; }`
`9`	`10`	`}`
`10`	`11`	`}`