Fix product name (#397)

RupengLiu · web-flow · commit 71f2f8b39955 · 2020-05-20T21:00:02.000-07:00
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create
 {
-    public class PolicyTemplateCreator: TemplateCreator
+    public class PolicyTemplateCreator : TemplateCreator
     {
         private FileReader fileReader;
 
@@ -75,7 +75,9 @@ public PolicyTemplateResource CreateAPIPolicyTemplateResource(APIConfig api, str
         public PolicyTemplateResource CreateProductPolicyTemplateResource(ProductConfig product, string[] dependsOn)
         {
             if (string.IsNullOrEmpty(product.name))
+            {
                 product.name = product.displayName;
+            }
 
             Uri uriResult;
             bool isUrl = Uri.TryCreate(product.policy, UriKind.Absolute, out uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductTemplateCreator.cs
@@ -28,6 +28,9 @@ public Template CreateProductTemplate(CreatorConfig creatorConfig)
             List<TemplateResource> resources = new List<TemplateResource>();
             foreach (ProductConfig product in creatorConfig.products)
             {
+                if (string.IsNullOrEmpty(product.name)) {
+                    product.name = product.displayName;
+                }
                 // create product resource with properties
                 ProductsTemplateResource productsTemplateResource = new ProductsTemplateResource()
                 {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create`
`7`	`7`	`{`
`8`		`- public class PolicyTemplateCreator: TemplateCreator`
	`8`	`+ public class PolicyTemplateCreator : TemplateCreator`
`9`	`9`	`{`
`10`	`10`	`private FileReader fileReader;`
`11`	`11`
`@@ -75,7 +75,9 @@ public PolicyTemplateResource CreateAPIPolicyTemplateResource(APIConfig api, str`
`75`	`75`	`public PolicyTemplateResource CreateProductPolicyTemplateResource(ProductConfig product, string[] dependsOn)`
`76`	`76`	`{`
`77`	`77`	`if (string.IsNullOrEmpty(product.name))`
	`78`	`+ {`
`78`	`79`	`product.name = product.displayName;`
	`80`	`+ }`
`79`	`81`
`80`	`82`	`Uri uriResult;`
`81`	`83`	`bool isUrl = Uri.TryCreate(product.policy, UriKind.Absolute, out uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp \|\| uriResult.Scheme == Uri.UriSchemeHttps);`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ public Template CreateProductTemplate(CreatorConfig creatorConfig)`
`28`	`28`	`List<TemplateResource> resources = new List<TemplateResource>();`
`29`	`29`	`foreach (ProductConfig product in creatorConfig.products)`
`30`	`30`	`{`
	`31`	`+ if (string.IsNullOrEmpty(product.name)) {`
	`32`	`+ product.name = product.displayName;`
	`33`	`+ }`
`31`	`34`	`// create product resource with properties`
`32`	`35`	`ProductsTemplateResource productsTemplateResource = new ProductsTemplateResource()`
`33`	`36`	`{`