add policyXML base url as a optional CLI arg, write to parameters file

lucashuet93 · lucashuet93 · commit 745a6df60ea3 · 2019-05-17T16:11:45.000-04:00
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorFactories/ProductTemplateCreatorFactory.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorFactories/ProductTemplateCreatorFactory.cs
@@ -0,0 +1,15 @@
+﻿using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Create;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Test
+{
+    public class ProductTemplateCreatorFactory
+    {
+        public static ProductTemplateCreator GenerateProductTemplateCreator()
+        {
+            PolicyTemplateCreator policyTemplateCreator = PolicyTemplateCreatorFactory.GeneratePolicyTemplateCreator();
+            ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator(policyTemplateCreator);
+            return productTemplateCreator;
+        }
+    }
+}
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs
@@ -20,8 +20,8 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
                 apiVersion = "apiVersion",
                 apiVersionDescription = "apiVersionDescription",
                 apiVersionSetId = "apiVersionSetId",
-                revision = "revision",
-                revisionDescription = "revisionDescription",
+                apiRevision = "revision",
+                apiRevisionDescription = "revisionDescription",
                 suffix = "suffix",
                 subscriptionRequired = true,
                 authenticationSettings = new APITemplateAuthenticationSettings()
@@ -51,8 +51,8 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
             Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
-            Assert.Equal(api.revision, apiTemplateResource.properties.apiRevision);
-            Assert.Equal(api.revisionDescription, apiTemplateResource.properties.apiRevisionDescription);
+            Assert.Equal(api.apiRevision, apiTemplateResource.properties.apiRevision);
+            Assert.Equal(api.apiRevisionDescription, apiTemplateResource.properties.apiRevisionDescription);
             Assert.Equal(api.suffix, apiTemplateResource.properties.path);
             Assert.Equal(api.subscriptionRequired, apiTemplateResource.properties.subscriptionRequired);
             Assert.Equal(api.authenticationSettings.oAuth2.authorizationServerId, apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId);
@@ -96,8 +96,8 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
                 apiVersion = "apiVersion",
                 apiVersionDescription = "apiVersionDescription",
                 apiVersionSetId = "apiVersionSetId",
-                revision = "revision",
-                revisionDescription = "revisionDescription",
+                apiRevision = "revision",
+                apiRevisionDescription = "revisionDescription",
                 suffix = "suffix",
                 subscriptionRequired = true,
                 authenticationSettings = new APITemplateAuthenticationSettings()
@@ -127,8 +127,8 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
             Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
-            Assert.Equal(api.revision, apiTemplateResource.properties.apiRevision);
-            Assert.Equal(api.revisionDescription, apiTemplateResource.properties.apiRevisionDescription);
+            Assert.Equal(api.apiRevision, apiTemplateResource.properties.apiRevision);
+            Assert.Equal(api.apiRevisionDescription, apiTemplateResource.properties.apiRevisionDescription);
             Assert.Equal(api.suffix, apiTemplateResource.properties.path);
             Assert.Equal(api.subscriptionRequired, apiTemplateResource.properties.subscriptionRequired);
             Assert.Equal(api.authenticationSettings.oAuth2.authorizationServerId, apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId);
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/ProductTemplateCreatorTests.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/ProductTemplateCreatorTests.cs
@@ -11,17 +11,18 @@ public class ProductTemplateCreatorTests
         public void ShouldCreateProductFromCreatorConfig()
         {
             // arrange
-            ProductTemplateCreator productTemplateCreator = new ProductTemplateCreator();
-            CreatorConfig creatorConfig = new CreatorConfig() { products = new List<ProductsTemplateProperties>() };
-            ProductsTemplateProperties product = new ProductsTemplateProperties()
+            ProductTemplateCreator productTemplateCreator = ProductTemplateCreatorFactory.GenerateProductTemplateCreator();
+            CreatorConfig creatorConfig = new CreatorConfig() { products = new List<ProductConfig>() };
+            ProductConfig product = new ProductConfig()
             {
                 displayName = "displayName",
                 description = "description",
                 terms = "terms",
                 subscriptionRequired = true,
                 approvalRequired = true,
                 subscriptionsLimit = 1,
-                state = "state"
+                state = "state",
+                policy = "<inbound></inbound>"
             };
             creatorConfig.products.Add(product);
 
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs
@@ -19,7 +19,8 @@ public ExtractCommand()
             var resourceGroupName = this.Option("--resourceGroup <resourceGroup>", "Resource Group name", CommandOptionType.SingleValue);
             var fileFolderName = this.Option("--fileFolder <filefolder>", "ARM Template files folder", CommandOptionType.SingleValue);
             var apiName = this.Option("--apiName <apiName>", "API name", CommandOptionType.SingleValue);
-            var linkedBaseUrlName = this.Option("--linkedBaseUrl <apiName>", "Creates a master template with links", CommandOptionType.SingleValue);
+            var linkedBaseUrlName = this.Option("--linkedBaseUrl <linkedBaseUrl>", "Creates a master template with links", CommandOptionType.SingleValue);
+            var policyXMLBaseUrlName = this.Option("--policyXMLBaseUrl <policyXMLBaseUrl>", "Writes policies to local XML files that require deployment to remote folder", CommandOptionType.SingleValue);
 
             this.HelpOption();
 
@@ -35,7 +36,8 @@ public ExtractCommand()
                 string sourceApim = sourceApimName.Values[0].ToString();
                 string destinationApim = destinationAPIManagementName.Values[0].ToString();
                 string fileFolder = fileFolderName.Values[0].ToString();
-                string linkedBaseUrl = linkedBaseUrlName.Values[0].ToString();
+                string linkedBaseUrl = linkedBaseUrlName.HasValue() ? linkedBaseUrlName.Value().ToString() : null;
+                string policyXMLBaseUrl = policyXMLBaseUrlName.HasValue() ? policyXMLBaseUrlName.Value().ToString() : null;
                 string singleApiName = null;
 
                 if (apiName.Values.Count > 0)
@@ -71,18 +73,18 @@ public ExtractCommand()
                 MasterTemplateExtractor masterTemplateExtractor = new MasterTemplateExtractor();
 
                 // extract templates from apim service
-                Template apiTemplate = await apiExtractor.GenerateAPIsARMTemplate(sourceApim, resourceGroup, fileFolder, singleApiName);
+                Template apiTemplate = await apiExtractor.GenerateAPIsARMTemplate(sourceApim, resourceGroup, fileFolder, singleApiName, policyXMLBaseUrl);
                 List<TemplateResource> apiTemplateResources = apiTemplate.resources.ToList();
-                Template apiVersionSetTemplate = await apiVersionSetExtractor.GenerateAPIVersionSetsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources);
-                Template authorizationServerTemplate = await authorizationServerExtractor.GenerateAuthorizationServersARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources);
-                Template loggerTemplate = await loggerExtractor.GenerateLoggerTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources);
-                Template productTemplate = await productExtractor.GenerateProductsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources);
-                Template namedValueTemplate = await propertyExtractor.GenerateNamedValuesTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources);
+                Template apiVersionSetTemplate = await apiVersionSetExtractor.GenerateAPIVersionSetsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
+                Template authorizationServerTemplate = await authorizationServerExtractor.GenerateAuthorizationServersARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
+                Template loggerTemplate = await loggerExtractor.GenerateLoggerTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
+                Template productTemplate = await productExtractor.GenerateProductsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
+                Template namedValueTemplate = await propertyExtractor.GenerateNamedValuesTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, policyXMLBaseUrl);
                 List<TemplateResource> namedValueResources = namedValueTemplate.resources.ToList();
-                Template backendTemplate = await backendExtractor.GenerateBackendsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, namedValueResources);
+                Template backendTemplate = await backendExtractor.GenerateBackendsARMTemplate(sourceApim, resourceGroup, singleApiName, apiTemplateResources, namedValueResources, policyXMLBaseUrl);
 
                 // create parameters file
-                Template templateParameters = masterTemplateExtractor.CreateMasterTemplateParameterValues(destinationApim, linkedBaseUrl);
+                Template templateParameters = masterTemplateExtractor.CreateMasterTemplateParameterValues(destinationApim, linkedBaseUrl, policyXMLBaseUrl);
 
                 // write templates to output file location
                 string apiFileName = fileNameGenerator.GenerateExtractorAPIFileName(singleApiName, sourceApim);
@@ -97,7 +99,7 @@ public ExtractCommand()
                 if (linkedBaseUrl != null)
                 {
                     // create a master template that links to all other templates
-                    Template masterTemplate = masterTemplateExtractor.GenerateLinkedMasterTemplate(apiTemplate, apiVersionSetTemplate, productTemplate, loggerTemplate, backendTemplate, authorizationServerTemplate, namedValueTemplate, fileNames, apiFileName);
+                    Template masterTemplate = masterTemplateExtractor.GenerateLinkedMasterTemplate(apiTemplate, apiVersionSetTemplate, productTemplate, loggerTemplate, backendTemplate, authorizationServerTemplate, namedValueTemplate, fileNames, apiFileName, policyXMLBaseUrl);
                     fileWriter.WriteJSONToFile(masterTemplate, String.Concat(@fileFolder, fileNames.linkedMaster));
                 }
 
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs
@@ -110,12 +110,12 @@ public async Task<string> GetAPISchemaDetails(string ApiManagementName, string R
             return await CallApiManagement(azToken, requestUrl);
         }
 
-        public async Task<Template> GenerateAPIsARMTemplate(string apimname, string resourceGroup, string fileFolder, string singleApiName)
+        public async Task<Template> GenerateAPIsARMTemplate(string apimname, string resourceGroup, string fileFolder, string singleApiName, string policyXMLBaseUrl)
         {
             // pull all apis from service
             string apis = await GetAPIs(apimname, resourceGroup);
             // initialize arm template
-            Template armTemplate = GenerateEmptyTemplateWithParameters();
+            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);
 
             JObject oApi = JObject.Parse(apis);
             oApi = FormatoApi(singleApiName, oApi);
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIVersionSetExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIVersionSetExtractor.cs
@@ -30,11 +30,11 @@ public async Task<string> GetAPIVersionSetDetails(string ApiManagementName, stri
             return await CallApiManagement(azToken, requestUrl);
         }
 
-        public async Task<Template> GenerateAPIVersionSetsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources)
+        public async Task<Template> GenerateAPIVersionSetsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, string policyXMLBaseUrl)
         {
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Extracting API version sets from service");
-            Template armTemplate = GenerateEmptyTemplateWithParameters();
+            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);
 
             // isolate apis in the case of a single api extraction
             var apiResources = apiTemplateResources.Where(resource => resource.type == ResourceTypeConstants.API);
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/AuthorizationServerExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/AuthorizationServerExtractor.cs
@@ -30,11 +30,11 @@ public async Task<string> GetAuthorizationServer(string ApiManagementName, strin
             return await CallApiManagement(azToken, requestUrl);
         }
 
-        public async Task<Template> GenerateAuthorizationServersARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources)
+        public async Task<Template> GenerateAuthorizationServersARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, string policyXMLBaseUrl)
         {
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Extracting authorization servers from service");
-            Template armTemplate = GenerateEmptyTemplateWithParameters();
+            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);
 
             List<TemplateResource> templateResources = new List<TemplateResource>();
 
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/BackendExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/BackendExtractor.cs
@@ -30,11 +30,11 @@ public async Task<string> GetBackend(string ApiManagementName, string ResourceGr
             return await CallApiManagement(azToken, requestUrl);
         }
 
-        public async Task<Template> GenerateBackendsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, List<TemplateResource> propertyResources)
+        public async Task<Template> GenerateBackendsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, List<TemplateResource> propertyResources, string policyXMLBaseUrl)
         {
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Extracting backends from service");
-            Template armTemplate = GenerateEmptyTemplateWithParameters();
+            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);
 
             List<TemplateResource> templateResources = new List<TemplateResource>();
 
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/EntityExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/EntityExtractor.cs
@@ -35,10 +35,18 @@ public Template GenerateEmptyTemplate()
             return armTemplate;
         }
 
-        public Template GenerateEmptyTemplateWithParameters()
+        public Template GenerateEmptyTemplateWithParameters(string policyXMLBaseUrl)
         {
             Template armTemplate = GenerateEmptyTemplate();
             armTemplate.parameters = new Dictionary<string, TemplateParameterProperties> { { "ApimServiceName", new TemplateParameterProperties() { type = "string" } } };
+            if (policyXMLBaseUrl != null)
+            {
+                TemplateParameterProperties policyTemplateBaseUrlParameterProperties = new TemplateParameterProperties()
+                {
+                    type = "string"
+                };
+                armTemplate.parameters.Add("PolicyXMLBaseUrl", policyTemplateBaseUrlParameterProperties);
+            }
             return armTemplate;
         }
     }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/LoggerExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/LoggerExtractor.cs
@@ -30,11 +30,11 @@ public async Task<string> GetLogger(string ApiManagementName, string ResourceGro
             return await CallApiManagement(azToken, requestUrl);
         }
 
-        public async Task<Template> GenerateLoggerTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources)
+        public async Task<Template> GenerateLoggerTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, string policyXMLBaseUrl)
         {
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Extracting loggers from service");
-            Template armTemplate = GenerateEmptyTemplateWithParameters();
+            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);
 
             // isolate product api associations in the case of a single api extraction
             var diagnosticResources = apiTemplateResources.Where(resource => resource.type == ResourceTypeConstants.APIDiagnostic);
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/ProductExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/ProductExtractor.cs
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/PropertyExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/PropertyExtractor.cs
diff --git a/src/APIM_ARMTemplate/apimtemplate/Properties/launchSettings.json b/src/APIM_ARMTemplate/apimtemplate/Properties/launchSettings.json

Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,12 @@ public async Task<string> GetAPISchemaDetails(string ApiManagementName, string R`
`110`	`110`	`return await CallApiManagement(azToken, requestUrl);`
`111`	`111`	`}`
`112`	`112`
`113`		`- public async Task<Template> GenerateAPIsARMTemplate(string apimname, string resourceGroup, string fileFolder, string singleApiName)`
	`113`	`+ public async Task<Template> GenerateAPIsARMTemplate(string apimname, string resourceGroup, string fileFolder, string singleApiName, string policyXMLBaseUrl)`
`114`	`114`	`{`
`115`	`115`	`// pull all apis from service`
`116`	`116`	`string apis = await GetAPIs(apimname, resourceGroup);`
`117`	`117`	`// initialize arm template`
`118`		`- Template armTemplate = GenerateEmptyTemplateWithParameters();`
	`118`	`+ Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);`
`119`	`119`
`120`	`120`	`JObject oApi = JObject.Parse(apis);`
`121`	`121`	`oApi = FormatoApi(singleApiName, oApi);`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ public async Task<string> GetAPIVersionSetDetails(string ApiManagementName, stri`
`30`	`30`	`return await CallApiManagement(azToken, requestUrl);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public async Task<Template> GenerateAPIVersionSetsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources)`
	`33`	`+ public async Task<Template> GenerateAPIVersionSetsARMTemplate(string apimname, string resourceGroup, string singleApiName, List<TemplateResource> apiTemplateResources, string policyXMLBaseUrl)`
`34`	`34`	`{`
`35`	`35`	`Console.WriteLine("------------------------------------------");`
`36`	`36`	`Console.WriteLine("Extracting API version sets from service");`
`37`		`- Template armTemplate = GenerateEmptyTemplateWithParameters();`
	`37`	`+ Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl);`
`38`	`38`
`39`	`39`	`// isolate apis in the case of a single api extraction`
`40`	`40`	`var apiResources = apiTemplateResources.Where(resource => resource.type == ResourceTypeConstants.API);`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,18 @@ public Template GenerateEmptyTemplate()`
`35`	`35`	`return armTemplate;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public Template GenerateEmptyTemplateWithParameters()`
	`38`	`+ public Template GenerateEmptyTemplateWithParameters(string policyXMLBaseUrl)`
`39`	`39`	`{`
`40`	`40`	`Template armTemplate = GenerateEmptyTemplate();`
`41`	`41`	`armTemplate.parameters = new Dictionary<string, TemplateParameterProperties> { { "ApimServiceName", new TemplateParameterProperties() { type = "string" } } };`
	`42`	`+ if (policyXMLBaseUrl != null)`
	`43`	`+ {`
	`44`	`+ TemplateParameterProperties policyTemplateBaseUrlParameterProperties = new TemplateParameterProperties()`
	`45`	`+ {`
	`46`	`+ type = "string"`
	`47`	`+ };`
	`48`	`+ armTemplate.parameters.Add("PolicyXMLBaseUrl", policyTemplateBaseUrlParameterProperties);`
	`49`	`+ }`
`42`	`50`	`return armTemplate;`
`43`	`51`	`}`
`44`	`52`	`}`