fixed issue with using paramServiceUrl (#342)

guchen-doitt · RupengLiu · web-flow · commit 42f7d7ddf0f7 · 2020-01-30T14:24:39.000-08:00
Co-authored-by: RupengLiu &lt;rliu1211@terpmail.umd.edu&gt;
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs
@@ -408,11 +408,8 @@ public async Task<Template> CreateMasterTemplateParameterValues(List<string> api
                 foreach (string apiName in apisToExtract)
                 {
                     string validApiName = ExtractorUtils.GenValidParamName(apiName, "Api");
-                    string serviceUrl = GetApiServiceUrlFromParameters(apiName, exc.serviceUrlParameters);
-                    if (serviceUrl == null)
-                    {
-                        serviceUrl = await apiExc.GetAPIServiceUrl(exc.sourceApimName, exc.resourceGroup, apiName);
-                    }
+                    string serviceUrl = exc.serviceUrlParameters != null ? GetApiServiceUrlFromParameters(apiName, exc.serviceUrlParameters) :
+                      await apiExc.GetAPIServiceUrl(exc.sourceApimName, exc.resourceGroup, apiName);
                     serviceUrls.Add(validApiName, serviceUrl);
                 }
                 TemplateServiceUrlProperties serviceUrlProperties = new TemplateServiceUrlProperties()

Original file line number	Diff line number	Diff line change
`@@ -408,11 +408,8 @@ public async Task<Template> CreateMasterTemplateParameterValues(List<string> api`
`408`	`408`	`foreach (string apiName in apisToExtract)`
`409`	`409`	`{`
`410`	`410`	`string validApiName = ExtractorUtils.GenValidParamName(apiName, "Api");`
`411`		`- string serviceUrl = GetApiServiceUrlFromParameters(apiName, exc.serviceUrlParameters);`
`412`		`- if (serviceUrl == null)`
`413`		`- {`
`414`		`- serviceUrl = await apiExc.GetAPIServiceUrl(exc.sourceApimName, exc.resourceGroup, apiName);`
`415`		`- }`
	`411`	`+ string serviceUrl = exc.serviceUrlParameters != null ? GetApiServiceUrlFromParameters(apiName, exc.serviceUrlParameters) :`
	`412`	`+ await apiExc.GetAPIServiceUrl(exc.sourceApimName, exc.resourceGroup, apiName);`
`416`	`413`	`serviceUrls.Add(validApiName, serviceUrl);`
`417`	`414`	`}`
`418`	`415`	`TemplateServiceUrlProperties serviceUrlProperties = new TemplateServiceUrlProperties()`