[Creator] Add subscriptionKeyParameterNames, fix serviceUrl (#277)

* temp

* [Extractor] Don't generate empty Templates

* [Creator] fix sevUrl add parameter names

* Ajdjust test case since change api templates

Author: RupengLiu

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

@@ -46,7 +46,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             creatorConfig.apis.Add(api);
 
             // act
-            APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, true);
+            APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, false);
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
@@ -83,7 +83,7 @@ public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWit
             creatorConfig.apis.Add(api);
 
             // act
-            APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, false);
+            APITemplateResource apiTemplateResource = await apiTemplateCreator.CreateAPITemplateResourceAsync(api, true, true);
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -115,7 +115,7 @@ public CreateCommand()
                         APITemplateResource apiResource = apiTemplate.resources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as APITemplateResource;
                         APIConfig providedAPIConfiguration = creatorConfig.apis.FirstOrDefault(api => apiResource.name.Contains(api.name, StringComparison.Ordinal));
                         // if the api version is not null the api is split into multiple templates. If the template is split and the content value has been set, then the template is for a subsequent api
-                        string apiFileName = fileNameGenerator.GenerateCreatorAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value == null, creatorConfig.apimServiceName);
+                        string apiFileName = fileNameGenerator.GenerateCreatorAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value != null, creatorConfig.apimServiceName);
                         fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, apiFileName));
                     }
                     if (globalServicePolicyTemplate != null)

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

@@ -55,6 +55,7 @@ public class APIConfig
         public string apiRevisionDescription { get; set; }
         public Dictionary<string, OperationsConfig> operations { get; set; }
         public APITemplateAuthenticationSettings authenticationSettings { get; set; }
+        public APITemplateSubscriptionKeyParameterNames subscriptionKeyParameterNames { get; set; }
         public string products { get; set; }
         public string tags { get; set; }
         public string protocols { get; set; }

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

@@ -118,7 +118,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             };
 
             // add properties depending on whether the template is the initial, subsequent, or unified 
-            if (!isSplit || isInitial)
+            if (!isSplit || !isInitial)
             {
                 // add metadata properties for initial and unified templates
                 apiTemplateResource.properties.apiVersion = api.apiVersion;
@@ -131,6 +131,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 apiTemplateResource.properties.apiRevisionDescription = api.apiRevisionDescription;
                 apiTemplateResource.properties.apiVersionDescription = api.apiVersionDescription;
                 apiTemplateResource.properties.authenticationSettings = api.authenticationSettings;
+                apiTemplateResource.properties.subscriptionKeyParameterNames = api.subscriptionKeyParameterNames;
                 apiTemplateResource.properties.path = api.suffix;
                 apiTemplateResource.properties.isCurrent = api.isCurrent;
                 apiTemplateResource.properties.displayName = api.name;
@@ -147,8 +148,17 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 {
                     apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId = api.authenticationSettings.oAuth2.authorizationServerId;
                 }
+                // set the subscriptionKey Parameter Names
+                if (api.subscriptionKeyParameterNames != null) {
+                    if (api.subscriptionKeyParameterNames.header != null) {
+                        apiTemplateResource.properties.subscriptionKeyParameterNames.header = api.subscriptionKeyParameterNames.header;
+                    }
+                    if (api.subscriptionKeyParameterNames.query != null) {
+                        apiTemplateResource.properties.subscriptionKeyParameterNames.query = api.subscriptionKeyParameterNames.query;
+                    }
+                }
             }
-            if (!isSplit || !isInitial)
+            if (!isSplit || isInitial)
             {
                 // add open api spec properties for subsequent and unified templates
                 string format;