Parameter ServiceUrl in creator (#525)

* Parameter ServiceUrl in creator

* Change param to apiname-serviceUrl

* Fix test bug

Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu>

Author: zhonren

src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs

@@ -23,6 +23,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
                 apiVersionSetId = "apiVersionSetId",
                 apiRevision = "revision",
                 apiRevisionDescription = "revisionDescription",
+                serviceUrl = "http://serviceUrl",
                 suffix = "suffix",
                 subscriptionRequired = true,
                 authenticationSettings = new APITemplateAuthenticationSettings()
@@ -51,7 +52,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
-            Assert.Equal($"[parameters('{ParameterNames.ServiceUrl}').{api.name}]", apiTemplateResource.properties.serviceUrl);
+            Assert.Equal($"[parameters('{api.name}-ServiceUrl')]", apiTemplateResource.properties.serviceUrl);
             Assert.Equal(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -139,6 +139,10 @@ public CreateCommand()
                     {
                         if (considerAllApiForDeployments || preferredApis.Contains(api.name))
                         {
+                            if (creatorConfig.serviceUrlParameters != null && creatorConfig.serviceUrlParameters.Count > 0) {
+                                api.serviceUrl = creatorConfig.serviceUrlParameters.Any(s => s.apiName.Equals(api.name)) ? 
+                                    creatorConfig.serviceUrlParameters.Where(s => s.apiName.Equals(api.name)).FirstOrDefault().serviceUrl : api.serviceUrl;
+                            }
                             // create api templates from provided api config - if the api config contains a supplied apiVersion, split the templates into 2 for metadata and swagger content, otherwise create a unified template
                             List<Template> apiTemplateSet = await apiTemplateCreator.CreateAPITemplatesAsync(api);
                             apiTemplates.AddRange(apiTemplateSet);

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

@@ -34,6 +34,7 @@ public class CreatorConfig
         public string linkedTemplatesBaseUrl { get; set; }
         public string linkedTemplatesUrlQueryString { get; set; }
         public string baseFileName { get; set; }
+        public List<ServiceUrlProperty> serviceUrlParameters { get; set; }
     }
 
     public class APIVersionSetConfig : APIVersionSetProperties
@@ -127,4 +128,9 @@ public class SubscriptionConfig : SubscriptionsTemplateProperties
         public string name { get; set; }
     }
 
+    public class ServiceUrlProperty
+    {
+        public string apiName { get; set; }
+        public string serviceUrl { get; set; }
+    }
 }

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

@@ -71,7 +71,7 @@ public async Task<Template> CreateAPITemplateAsync(APIConfig api, bool isSplit,
 
             if (!String.IsNullOrEmpty(api.serviceUrl))
             {
-                apiTemplate.parameters.Add(ParameterNames.ServiceUrl, new TemplateParameterProperties() { type = "string" });
+                apiTemplate.parameters.Add(api.name + "-ServiceUrl", new TemplateParameterProperties() { type = "string" });
             }
 
             List<TemplateResource> resources = new List<TemplateResource>();
@@ -330,7 +330,7 @@ public bool isSplitAPI(APIConfig apiConfig)
 
         private string MakeServiceUrl(APIConfig api)
         {
-            return api.serviceUrl ?? $"[parameters('{ParameterNames.ServiceUrl}').{ExtractorUtils.GenValidParamName(api.name, ParameterPrefix.Api)}]";
+            return !String.IsNullOrEmpty(api.serviceUrl) ? $"[parameters('{api.name + "-ServiceUrl"}')]" : null;
         }
     }
 }

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

@@ -301,6 +301,19 @@ public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)
                     parameters.Add(ParameterNames.LinkedTemplatesUrlQueryString, linkedTemplatesUrlQueryStringProperties);
                 }
             }
+
+            if (creatorConfig.serviceUrlParameters != null && creatorConfig.serviceUrlParameters.Count > 0)
+            {
+                foreach (ServiceUrlProperty serviceUrlProperty in creatorConfig.serviceUrlParameters)
+                {
+                    TemplateParameterProperties serviceUrlParamProperty = new TemplateParameterProperties()
+                    {
+                        value = serviceUrlProperty.serviceUrl
+                    };
+                    parameters.Add(serviceUrlProperty.apiName + "-ServiceUrl", serviceUrlParamProperty);
+                }
+            }
+
             masterTemplate.parameters = parameters;
             return masterTemplate;
         }