Fix #389 - Lookup API resource by exact name. (#390)

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

Author: springcomp

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -118,7 +118,7 @@ public CreateCommand()
                     foreach (Template apiTemplate in apiTemplates)
                     {
                         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));
+                        APIConfig providedAPIConfiguration = creatorConfig.apis.FirstOrDefault(api => string.Compare(apiResource.name, APITemplateCreator.MakeResourceName(api), true) == 0);
                         // 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);
                         fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, apiFileName));

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

@@ -110,7 +110,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             // create api resource
             APITemplateResource apiTemplateResource = new APITemplateResource()
             {
-                name = $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{api.name}')]",
+                name = MakeResourceName(api),
                 type = ResourceTypeConstants.API,
                 apiVersion = GlobalConstants.APIVersion,
                 properties = new APITemplateProperties(),
@@ -149,11 +149,14 @@ 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) {
+                if (api.subscriptionKeyParameterNames != null)
+                {
+                    if (api.subscriptionKeyParameterNames.header != null)
+                    {
                         apiTemplateResource.properties.subscriptionKeyParameterNames.header = api.subscriptionKeyParameterNames.header;
                     }
-                    if (api.subscriptionKeyParameterNames.query != null) {
+                    if (api.subscriptionKeyParameterNames.query != null)
+                    {
                         apiTemplateResource.properties.subscriptionKeyParameterNames.query = api.subscriptionKeyParameterNames.query;
                     }
                 }
@@ -213,6 +216,11 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
             return apiTemplateResource;
         }
 
+        public static string MakeResourceName(APIConfig api)
+        {
+            return $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{api.name}')]";
+        }
+
         public string[] CreateProtocols(APIConfig api)
         {
             string[] protocols;