Merge branch 'master' into 228-extractor-non-related-product-extracted-fix

Author: lucashuet93

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

@@ -39,5 +39,38 @@ public void ShouldCreateProductFromCreatorConfig()
             Assert.Equal(product.approvalRequired, productsTemplateResource.properties.approvalRequired);
             Assert.Equal(product.state, productsTemplateResource.properties.state);
         }
+
+        [Fact]
+        public void ShouldNotCreateApprovalRequiredOrSubscriptionsLimitIfSubscriptionRequiredIsFalse()
+        {
+            // arrange
+            ProductTemplateCreator productTemplateCreator = ProductTemplateCreatorFactory.GenerateProductTemplateCreator();
+            CreatorConfig creatorConfig = new CreatorConfig() { products = new List<ProductConfig>() };
+            ProductConfig product = new ProductConfig()
+            {
+                displayName = "displayName",
+                description = "description",
+                terms = "terms",
+                subscriptionRequired = false,
+                approvalRequired = true,
+                subscriptionsLimit = 1,
+                state = "state"
+            };
+            creatorConfig.products.Add(product);
+
+            // act
+            Template productTemplate = productTemplateCreator.CreateProductTemplate(creatorConfig);
+            ProductsTemplateResource productsTemplateResource = (ProductsTemplateResource)productTemplate.resources[0];
+
+            // assert
+            Assert.Equal($"[concat(parameters('ApimServiceName'), '/{product.displayName}')]", productsTemplateResource.name);
+            Assert.Equal(product.displayName, productsTemplateResource.properties.displayName);
+            Assert.Equal(product.description, productsTemplateResource.properties.description);
+            Assert.Equal(product.terms, productsTemplateResource.properties.terms);
+            Assert.Equal(product.subscriptionRequired, productsTemplateResource.properties.subscriptionRequired);
+            Assert.Null(productsTemplateResource.properties.subscriptionsLimit);
+            Assert.Null(productsTemplateResource.properties.approvalRequired);
+            Assert.Equal(product.state, productsTemplateResource.properties.state);
+        }
     }
 }

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductsTemplateResource.cs

@@ -11,8 +11,8 @@ public class ProductsTemplateProperties
         public string description { get; set; }
         public string terms { get; set; }
         public bool subscriptionRequired { get; set; }
-        public bool approvalRequired { get; set; }
-        public int subscriptionsLimit { get; set; }
+        public bool? approvalRequired { get; set; }
+        public int? subscriptionsLimit { get; set; }
         public string state { get; set; }
         public string displayName { get; set; }
     }

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

@@ -37,8 +37,8 @@ public Template CreateProductTemplate(CreatorConfig creatorConfig)
                         description = product.description,
                         terms = product.terms,
                         subscriptionRequired = product.subscriptionRequired,
-                        approvalRequired = product.approvalRequired,
-                        subscriptionsLimit = product.subscriptionsLimit,
+                        approvalRequired = product.subscriptionRequired ? product.approvalRequired : null,
+                        subscriptionsLimit = product.subscriptionRequired ? product.subscriptionsLimit : null,
                         state = product.state,
                         displayName = product.displayName
                     },

src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs

@@ -41,7 +41,7 @@ public async Task<string> GetOperationPolicyAsync(string ApiManagementName, stri
         {
             (string azToken, string azSubId) = await auth.GetAccessToken();
 
-            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/operations/{5}/policies/policy?api-version={6}",
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/operations/{5}/policies/policy?api-version={6}&format=rawxml",
                baseUrl, azSubId, ResourceGroupName, ApiManagementName, ApiName, OperationId, GlobalConstants.APIVersion);
 
             return await CallApiManagementAsync(azToken, requestUrl);
@@ -71,7 +71,7 @@ public async Task<string> GetAPIPolicyAsync(string ApiManagementName, string Res
         {
             (string azToken, string azSubId) = await auth.GetAccessToken();
 
-            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/policies/policy?api-version={5}",
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/policies/policy?api-version={5}&format=rawxml",
                 baseUrl, azSubId, ResourceGroupName, ApiManagementName, ApiName, GlobalConstants.APIVersion);
 
             return await CallApiManagementAsync(azToken, requestUrl);

src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/ProductExtractor.cs

@@ -41,7 +41,7 @@ public async Task<string> GetProductPolicyAsync(string ApiManagementName, string
         {
             (string azToken, string azSubId) = await auth.GetAccessToken();
 
-            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/products/{4}/policies/policy?api-version={5}",
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/products/{4}/policies/policy?api-version={5}&format=rawxml",
                baseUrl, azSubId, ResourceGroupName, ApiManagementName, ProductName, GlobalConstants.APIVersion);
 
             return await CallApiManagementAsync(azToken, requestUrl);