Allow to parametrize serviceUrl (#447)

* allow to parametrize serviceUrl

* remove parameter serviceurl when specify

* change serviceUrl from string to object

Co-authored-by: luru <luis_ruiz_pavon@hotmail.com>
Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu>

Author: lurumad

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

@@ -51,6 +51,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(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
@@ -70,6 +71,31 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.authenticationSettings.subscriptionKeyRequired, apiTemplateResource.properties.authenticationSettings.subscriptionKeyRequired);
         }
 
+        [Fact]
+        public async void ShouldCreateAPITemplateResourceFromCreatorConfigWithoutServiceUrlParameter()
+        {
+            // arrange
+            APITemplateCreator apiTemplateCreator = APITemplateCreatorFactory.GenerateAPITemplateCreator();
+            CreatorConfig creatorConfig = new CreatorConfig() { apis = new List<APIConfig>() };
+            APIConfig api = new APIConfig()
+            {
+                name = "name",
+                openApiSpec = "https://petstore.swagger.io/v2/swagger.json",
+                serviceUrl = "https://petstore.swagger.io"
+            };
+            creatorConfig.apis.Add(api);
+
+            // act
+            // the above api config will create a unified api template with a single resource
+            List<Template> apiTemplates = await apiTemplateCreator.CreateAPITemplatesAsync(api);
+            APITemplateResource apiTemplateResource = apiTemplates.FirstOrDefault().resources[0] as APITemplateResource;
+
+            // assert
+            Assert.Single(apiTemplates.First().parameters);
+            Assert.False(apiTemplates.First().parameters.ContainsKey(ParameterNames.ServiceUrl));
+            Assert.Equal("https://petstore.swagger.io", apiTemplateResource.properties.serviceUrl);
+        }
+
         [Fact]
         public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWithCorrectContent()
         {

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

@@ -4,6 +4,7 @@
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
 using apimtemplate.Creator.Utilities;
 using System.Net;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extract;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create
 {
@@ -68,6 +69,11 @@ public async Task<Template> CreateAPITemplateAsync(APIConfig api, bool isSplit,
                 { ParameterNames.ApimServiceName, new TemplateParameterProperties(){ type = "string" } }
             };
 
+            if (String.IsNullOrEmpty(api.serviceUrl))
+            {
+                apiTemplate.parameters.Add(ParameterNames.ServiceUrl, new TemplateParameterProperties() { type = "object" });
+            }
+
             List<TemplateResource> resources = new List<TemplateResource>();
             // create api resource 
             APITemplateResource apiTemplateResource = await this.CreateAPITemplateResourceAsync(api, isSplit, isInitial);
@@ -124,7 +130,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             {
                 // add metadata properties for initial and unified templates
                 apiTemplateResource.properties.apiVersion = api.apiVersion;
-                apiTemplateResource.properties.serviceUrl = api.serviceUrl;
+                apiTemplateResource.properties.serviceUrl = MakeServiceUrl(api);
                 apiTemplateResource.properties.type = api.type;
                 apiTemplateResource.properties.apiType = api.type;
                 apiTemplateResource.properties.description = api.description;
@@ -224,8 +230,8 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 apiTemplateResource.properties.format = format;
                 apiTemplateResource.properties.value = value;
                 apiTemplateResource.properties.path = api.suffix;
-                apiTemplateResource.properties.serviceUrl = api.serviceUrl;
-               
+                apiTemplateResource.properties.serviceUrl = MakeServiceUrl(api);
+
             }
             return apiTemplateResource;
         }
@@ -254,5 +260,10 @@ public bool isSplitAPI(APIConfig apiConfig)
             // the api needs to be split into multiple templates if the user has supplied a version or version set - deploying swagger related properties at the same time as api version related properties fails, so they must be written and deployed separately
             return apiConfig.apiVersion != null || apiConfig.apiVersionSetId != null || (apiConfig.authenticationSettings != null && apiConfig.authenticationSettings.oAuth2 != null && apiConfig.authenticationSettings.oAuth2.authorizationServerId != null);
         }
+
+        private string MakeServiceUrl(APIConfig api)
+        {
+            return api.serviceUrl ?? $"[parameters('{ParameterNames.ServiceUrl}').{ExtractorUtils.GenValidParamName(api.name, ParameterPrefix.Api)}]";
+        }
     }
 }