[Extractor]Refactor && small fixes (#329)

RupengLiu · web-flow · commit 287051b2c1b8 · 2020-01-28T10:48:59.000-08:00
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs
@@ -34,7 +34,7 @@ public CreateCommand()
                     // initialize file helper classes
                     FileWriter fileWriter = new FileWriter();
                     FileNameGenerator fileNameGenerator = new FileNameGenerator();
-                    FileNames fileNames = fileNameGenerator.GenerateFileNames(creatorConfig.apimServiceName);
+                    FileNames fileNames = creatorConfig.baseFileName == null ? fileNameGenerator.GenerateFileNames(creatorConfig.apimServiceName) : fileNameGenerator.GenerateFileNames(creatorConfig.baseFileName);
 
                     // initialize template creator classes
                     APIVersionSetTemplateCreator apiVersionSetTemplateCreator = new APIVersionSetTemplateCreator();
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs
@@ -47,12 +47,13 @@ public ExtractCommand()
                     // initialize file helper classes
                     FileWriter fileWriter = new FileWriter();
                     FileNameGenerator fileNameGenerator = new FileNameGenerator();
-                    FileNames fileNames = fileNameGenerator.GenerateFileNames(extractorConfig.sourceApimName);
+                    FileNames fileNames = extractorConfig.baseFileName == null ?  fileNameGenerator.GenerateFileNames(extractorConfig.sourceApimName) : fileNameGenerator.GenerateFileNames(extractorConfig.baseFileName);
 
                     if (splitAPIs)
                     {
                         // create split api templates for all apis in the sourceApim
                         await ExtractorUtils.GenerateSplitAPITemplates(extractorConfig, fileNameGenerator, fileWriter, fileNames);
+                        await ExtractorUtils.GenerateTemplates(new Extractor(extractorConfig), null, null, fileNameGenerator, fileNames, fileWriter, null);
                     }
                     else if (hasVersionSetName)
                     {
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/FileHandlers/FileNameGenerator.cs b/src/APIM_ARMTemplate/apimtemplate/Common/FileHandlers/FileNameGenerator.cs
@@ -5,21 +5,21 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
     public class FileNameGenerator
     {
 
-        public FileNames GenerateFileNames(string apimServiceName)
+        public FileNames GenerateFileNames(string baseFileName)
         {
             // generate useable object with file names for consistency throughout project
             return new FileNames()
             {
-                apiVersionSets = $@"/{apimServiceName}-apiVersionSets.template.json",
-                authorizationServers = $@"/{apimServiceName}-authorizationServers.template.json",
-                backends = $@"/{apimServiceName}-backends.template.json",
-                globalServicePolicy = $@"/{apimServiceName}-globalServicePolicy.template.json",
-                loggers = $@"/{apimServiceName}-loggers.template.json",
-                namedValues = $@"/{apimServiceName}-namedValues.template.json",
-                tags = $@"/{apimServiceName}-tags.template.json",
-                products = $@"/{apimServiceName}-products.template.json",
-                parameters = $@"/{apimServiceName}-parameters.json",
-                linkedMaster = $@"/{apimServiceName}-master.template.json",
+                apiVersionSets = $@"/{baseFileName}-apiVersionSets.template.json",
+                authorizationServers = $@"/{baseFileName}-authorizationServers.template.json",
+                backends = $@"/{baseFileName}-backends.template.json",
+                globalServicePolicy = $@"/{baseFileName}-globalServicePolicy.template.json",
+                loggers = $@"/{baseFileName}-loggers.template.json",
+                namedValues = $@"/{baseFileName}-namedValues.template.json",
+                tags = $@"/{baseFileName}-tags.template.json",
+                products = $@"/{baseFileName}-products.template.json",
+                parameters = $@"/{baseFileName}-parameters.json",
+                linkedMaster = $@"/{baseFileName}-master.template.json",
                 apis = "/Apis",
                 splitAPIs = "/SplitAPIs",
                 versionSetMasterFolder = "/VersionSetMasterFolder",
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs
@@ -25,6 +25,7 @@ public class CreatorConfig
         public bool linked { get; set; }
         public string linkedTemplatesBaseUrl { get; set; }
         public string linkedTemplatesUrlQueryString { get; set; }
+        public string baseFileName { get; set; }
     }
 
     public class APIVersionSetConfig: APIVersionSetProperties
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/APIExtractor.cs
@@ -188,9 +188,10 @@ public async Task<string> GetAPISchemaDetailsAsync(string ApiManagementName, str
             return await CallApiManagementAsync(azToken, requestUrl);
         }
 
-        public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string apiName, string apimname, string resourceGroup, string fileFolder, string policyXMLBaseUrl, string policyXMLSasToken)
+        public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string apiName, Extractor exc)
         {
             List<TemplateResource> templateResources = new List<TemplateResource>();
+            string apimname = exc.sourceApimName, resourceGroup = exc.resourceGroup, fileFolder = exc.fileFolder, policyXMLBaseUrl = exc.policyXMLBaseUrl, policyXMLSasToken = exc.policyXMLSasToken; 
             string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, apiName);
 
             Console.WriteLine("------------------------------------------");
@@ -283,7 +284,7 @@ public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string
                     {
                         string policyXMLContent = operationPolicyResource.properties.value;
                         string policyFolder = String.Concat(fileFolder, $@"/policies");
-                        string operationPolicyFileName = $@"/{operationName}-operationPolicy.xml";
+                        string operationPolicyFileName = $@"/{apiName}-{operationName}-operationPolicy.xml";
                         this.fileWriter.CreateFolderIfNotExists(policyFolder);
                         this.fileWriter.WriteXMLToFile(policyXMLContent, String.Concat(policyFolder, operationPolicyFileName));
                         operationPolicyResource.properties.format = "rawxml-link";
@@ -451,7 +452,7 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis
             List<TemplateResource> templateResources = new List<TemplateResource>();
             Console.WriteLine("{0} APIs found ...", revList.Count().ToString());
 
-            List<TemplateResource> apiResources = await GenerateSingleAPIResourceAsync(apiName, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);
+            List<TemplateResource> apiResources = await GenerateSingleAPIResourceAsync(apiName, exc);
             templateResources.AddRange(apiResources);
 
             foreach (string curApi in revList)
@@ -460,13 +461,13 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis
                 if (curApi.Equals(currentRevision))
                 {
                     // add current API revision resource to template
-                    apiResources = await GenerateCurrentRevisionAPIResourceAsync(curApi, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);
+                    apiResources = await GenerateCurrentRevisionAPIResourceAsync(curApi, exc);
                     templateResources.AddRange(apiResources);
                 }
                 else
                 {
                     // add other API revision resources to template
-                    apiResources = await GenerateSingleAPIResourceAsync(curApi, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);
+                    apiResources = await GenerateSingleAPIResourceAsync(curApi, exc);
                     
                     // make current API a dependency to other revisions, in case destination apim doesn't have the this API 
                     TemplateResource apiResource = apiResources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as TemplateResource;
@@ -485,9 +486,10 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis
         }
 
         // this function will get the current revision of this api and will remove "isCurrent" paramter
-        public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsync(string apiName, string apimname, string resourceGroup, string fileFolder, string policyXMLBaseUrl, string policyXMLSasToken)
+        public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsync(string apiName, Extractor exc)
         {
             List<TemplateResource> templateResources = new List<TemplateResource>();
+            string apimname = exc.sourceApimName, resourceGroup = exc.resourceGroup, fileFolder = exc.fileFolder, policyXMLBaseUrl = exc.policyXMLBaseUrl, policyXMLSasToken = exc.policyXMLSasToken;
             string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, apiName);
             Console.WriteLine("------------------------------------------");
             Console.WriteLine("Extracting resources from {0} API:", apiName);
@@ -579,7 +581,7 @@ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsyn
                     {
                         string policyXMLContent = operationPolicyResource.properties.value;
                         string policyFolder = String.Concat(fileFolder, $@"/policies");
-                        string operationPolicyFileName = $@"/{operationName}-operationPolicy.xml";
+                        string operationPolicyFileName = $@"/{apiName}-{operationName}-operationPolicy.xml";
                         this.fileWriter.CreateFolderIfNotExists(policyFolder);
                         this.fileWriter.WriteXMLToFile(policyXMLContent, String.Concat(policyFolder, operationPolicyFileName));
                         operationPolicyResource.properties.format = "rawxml-link";
@@ -739,10 +741,10 @@ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsyn
             return templateResources;
         }
 
-        public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string resourceGroup, string singleApiName, List<string> multipleApiNames, string policyXMLBaseUrl, string policyXMLSasToken, string fileFolder)
+        public async Task<Template> GenerateAPIsARMTemplateAsync(string singleApiName, List<string> multipleApiNames, Extractor exc)
         {
             // initialize arm template
-            Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl, policyXMLSasToken);
+            Template armTemplate = GenerateEmptyTemplateWithParameters(exc.policyXMLBaseUrl, exc.policyXMLSasToken);
             List<TemplateResource> templateResources = new List<TemplateResource>();
 
             // when extract single API
@@ -751,9 +753,9 @@ public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string
                 // check if this api exist
                 try
                 {
-                    string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, singleApiName);
+                    string apiDetails = await GetAPIDetailsAsync(exc.sourceApimName, exc.resourceGroup, singleApiName);
                     Console.WriteLine("{0} API found ...", singleApiName);
-                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(singleApiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));
+                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(singleApiName, exc));
                 }
                 catch (Exception)
                 {
@@ -766,19 +768,19 @@ public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string
                 Console.WriteLine("{0} APIs found ...", multipleApiNames.Count().ToString());
                 foreach (string apiName in multipleApiNames)
                 {
-                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));
+                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, exc));
                 }
             }
             // when extract all APIs and generate one master template
             else
             {
-                JToken[] oApis = await GetAllAPIObjsAsync(apimname, resourceGroup);
+                JToken[] oApis = await GetAllAPIObjsAsync(exc.sourceApimName, exc.resourceGroup);
                 Console.WriteLine("{0} APIs found ...", (oApis.Count().ToString()));
 
                 foreach (JToken oApi in oApis)
                 {
                     string apiName = ((JValue)oApi["name"]).Value.ToString();
-                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));
+                    templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, exc));
                 }
             }
             armTemplate.resources = templateResources.ToArray();
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/MasterTemplateExtractor.cs
@@ -35,7 +35,7 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,
             // namedValue
             string namedValueDeploymentResourceName = "namedValuesTemplate";
             // all other deployment resources will depend on named values
-            string[] dependsOnNamedValues = new string[] {};
+            string[] dependsOnNamedValues = new string[] { };
 
             // api dependsOn
             List<string> apiDependsOn = new List<string>();
@@ -45,15 +45,15 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,
                 dependsOnNamedValues = new string[] { $"[resourceId('Microsoft.Resources/deployments', '{namedValueDeploymentResourceName}')]" };
                 apiDependsOn.Add($"[resourceId('Microsoft.Resources/deployments', '{namedValueDeploymentResourceName}')]");
                 string namedValuesUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, fileNames.namedValues);
-                resources.Add(this.CreateLinkedMasterTemplateResource(namedValueDeploymentResourceName, namedValuesUri, new string[] { }));
+                resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken(namedValueDeploymentResourceName, namedValuesUri, new string[] { }, policyXMLSasToken));
             }
 
             // globalServicePolicy
             if (globalServicePolicyTemplate != null && globalServicePolicyTemplate.resources.Count() != 0)
             {
                 apiDependsOn.Add("[resourceId('Microsoft.Resources/deployments', 'globalServicePolicyTemplate')]");
                 string globalServicePolicyUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, fileNames.globalServicePolicy);
-                resources.Add(this.CreateLinkedMasterTemplateResource("globalServicePolicyTemplate", globalServicePolicyUri, dependsOnNamedValues));
+                resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken("globalServicePolicyTemplate", globalServicePolicyUri, dependsOnNamedValues, policyXMLSasToken));
             }
 
             // apiVersionSet
@@ -107,13 +107,26 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,
             if (apiTemplate != null && apiTemplate.resources.Count() != 0)
             {
                 string apisUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, apiFileName);
-                resources.Add(this.CreateLinkedMasterTemplateResource("apisTemplate", apisUri, apiDependsOn.ToArray()));
+                resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken("apisTemplate", apisUri, apiDependsOn.ToArray(), policyXMLSasToken));
             }
 
             masterTemplate.resources = resources.ToArray();
             return masterTemplate;
         }
 
+        public MasterTemplateResource CreateLinkedMasterTemplateResourceWithPolicyToken(string name, string uriLink, string[] dependsOn, string sasToken)
+        {
+            if (sasToken == null)
+            {
+                return this.CreateLinkedMasterTemplateResource(name, uriLink, dependsOn);
+            }
+            else
+            {
+                MasterTemplateResource masterResourceTemplate = this.CreateLinkedMasterTemplateResource(name, uriLink, dependsOn);
+                masterResourceTemplate.properties.parameters.Add("PolicyXMLSasToken", new TemplateParameterProperties() { value = "[parameters('PolicyXMLSasToken')]" });
+                return masterResourceTemplate;
+            }
+        }
         public MasterTemplateResource CreateLinkedMasterTemplateResource(string name, string uriLink, string[] dependsOn)
         {
             // create deployment resource with provided arguments
@@ -133,8 +146,7 @@ public MasterTemplateResource CreateLinkedMasterTemplateResource(string name, st
                     parameters = new Dictionary<string, TemplateParameterProperties>
                     {
                         { "ApimServiceName", new TemplateParameterProperties(){ value = "[parameters('ApimServiceName')]" } },
-                        { "PolicyXMLBaseUrl", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLBaseUrl')]" } },
-                        { "PolicyXMLSasToken", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLSasToken')]" } }
+                        { "PolicyXMLBaseUrl", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLBaseUrl')]" } }
                     }
                 },
                 dependsOn = dependsOn
@@ -248,7 +260,7 @@ public Template CreateSingleAPIRevisionsMasterTemplate(List<string> revList, str
                 }
                 else
                 {
-                    resources.Add(this.CreateLinkedMasterTemplateResource(templatename, revUri, new string[]{}));
+                    resources.Add(this.CreateLinkedMasterTemplateResource(templatename, revUri, new string[] { }));
                 }
             }
 
@@ -316,7 +328,7 @@ public Template CreateMasterTemplateParameterValues(string apimServiceName, stri
                     {
                         value = policyXMLSasToken
                     };
-                parameters.Add("PolicyXMLSasToken", policyTemplateSasTokenProperties);
+                    parameters.Add("PolicyXMLSasToken", policyTemplateSasTokenProperties);
                 }
             }
             masterTemplate.parameters = parameters;
@@ -325,8 +337,8 @@ public Template CreateMasterTemplateParameterValues(string apimServiceName, stri
 
         public string GenerateLinkedTemplateUri(string linkedTemplatesUrlQueryString, string linkedTemplatesSasToken, string fileName)
         {
-            string linkedTemplateUri = linkedTemplatesSasToken != null ? $"concat(parameters('LinkedTemplatesBaseUrl'), '{fileName}', parameters('LinkedTemplatesSasToken'))" : $"concat(parameters('LinkedTemplatesBaseUrl'), '{fileName}')";
-            return linkedTemplatesUrlQueryString != null ? $"[concat('{linkedTemplateUri}', parameters('LinkedTemplatesUrlQueryString'))]" : $"[{linkedTemplateUri}]";
+            string linkedTemplateUri = linkedTemplatesSasToken != null ? $"parameters('LinkedTemplatesBaseUrl'), '{fileName}', parameters('LinkedTemplatesSasToken')" : $"parameters('LinkedTemplatesBaseUrl'), '{fileName}'";
+            return linkedTemplatesUrlQueryString != null ? $"[concat({linkedTemplateUri}, parameters('LinkedTemplatesUrlQueryString'))]" : $"[concat({linkedTemplateUri})]";
         }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/Models/ExtractorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/Models/ExtractorConfiguration.cs
@@ -32,7 +32,8 @@ public class ExtractorConfig
         public string apiVersionSetName { get; set; }
         [Description("Includes all revisions for a single api - use with caution")]
         public string includeAllRevisions { get; set; }
-
+        [Description("Specify base name of the template file")]
+        public string baseFileName { get; set; }
         public void Validate()
         {
             if (string.IsNullOrEmpty(sourceApimName)) throw new ArgumentException("Missing parameter <sourceApimName>.");
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/Utilities/ExtractorUtils.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/Utilities/ExtractorUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,13 @@ public ExtractCommand()`
`47`	`47`	`// initialize file helper classes`
`48`	`48`	`FileWriter fileWriter = new FileWriter();`
`49`	`49`	`FileNameGenerator fileNameGenerator = new FileNameGenerator();`
`50`		`- FileNames fileNames = fileNameGenerator.GenerateFileNames(extractorConfig.sourceApimName);`
	`50`	`+ FileNames fileNames = extractorConfig.baseFileName == null ? fileNameGenerator.GenerateFileNames(extractorConfig.sourceApimName) : fileNameGenerator.GenerateFileNames(extractorConfig.baseFileName);`
`51`	`51`
`52`	`52`	`if (splitAPIs)`
`53`	`53`	`{`
`54`	`54`	`// create split api templates for all apis in the sourceApim`
`55`	`55`	`await ExtractorUtils.GenerateSplitAPITemplates(extractorConfig, fileNameGenerator, fileWriter, fileNames);`
	`56`	`+ await ExtractorUtils.GenerateTemplates(new Extractor(extractorConfig), null, null, fileNameGenerator, fileNames, fileWriter, null);`
`56`	`57`	`}`
`57`	`58`	`else if (hasVersionSetName)`
`58`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public class CreatorConfig`
`25`	`25`	`public bool linked { get; set; }`
`26`	`26`	`public string linkedTemplatesBaseUrl { get; set; }`
`27`	`27`	`public string linkedTemplatesUrlQueryString { get; set; }`
	`28`	`+ public string baseFileName { get; set; }`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public class APIVersionSetConfig: APIVersionSetProperties`
Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,10 @@ public async Task<string> GetAPISchemaDetailsAsync(string ApiManagementName, str`
`188`	`188`	`return await CallApiManagementAsync(azToken, requestUrl);`
`189`	`189`	`}`
`190`	`190`
`191`		`- public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string apiName, string apimname, string resourceGroup, string fileFolder, string policyXMLBaseUrl, string policyXMLSasToken)`
	`191`	`+ public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string apiName, Extractor exc)`
`192`	`192`	`{`
`193`	`193`	`List<TemplateResource> templateResources = new List<TemplateResource>();`
	`194`	`+ string apimname = exc.sourceApimName, resourceGroup = exc.resourceGroup, fileFolder = exc.fileFolder, policyXMLBaseUrl = exc.policyXMLBaseUrl, policyXMLSasToken = exc.policyXMLSasToken;`
`194`	`195`	`string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, apiName);`
`195`	`196`
`196`	`197`	`Console.WriteLine("------------------------------------------");`
`@@ -283,7 +284,7 @@ public async Task<List<TemplateResource>> GenerateSingleAPIResourceAsync(string`
`283`	`284`	`{`
`284`	`285`	`string policyXMLContent = operationPolicyResource.properties.value;`
`285`	`286`	`string policyFolder = String.Concat(fileFolder, $@"/policies");`
`286`		`- string operationPolicyFileName = $@"/{operationName}-operationPolicy.xml";`
	`287`	`+ string operationPolicyFileName = $@"/{apiName}-{operationName}-operationPolicy.xml";`
`287`	`288`	`this.fileWriter.CreateFolderIfNotExists(policyFolder);`
`288`	`289`	`this.fileWriter.WriteXMLToFile(policyXMLContent, String.Concat(policyFolder, operationPolicyFileName));`
`289`	`290`	`operationPolicyResource.properties.format = "rawxml-link";`
`@@ -451,7 +452,7 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis`
`451`	`452`	`List<TemplateResource> templateResources = new List<TemplateResource>();`
`452`	`453`	`Console.WriteLine("{0} APIs found ...", revList.Count().ToString());`
`453`	`454`
`454`		`- List<TemplateResource> apiResources = await GenerateSingleAPIResourceAsync(apiName, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);`
	`455`	`+ List<TemplateResource> apiResources = await GenerateSingleAPIResourceAsync(apiName, exc);`
`455`	`456`	`templateResources.AddRange(apiResources);`
`456`	`457`
`457`	`458`	`foreach (string curApi in revList)`
`@@ -460,13 +461,13 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis`
`460`	`461`	`if (curApi.Equals(currentRevision))`
`461`	`462`	`{`
`462`	`463`	`// add current API revision resource to template`
`463`		`- apiResources = await GenerateCurrentRevisionAPIResourceAsync(curApi, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);`
	`464`	`+ apiResources = await GenerateCurrentRevisionAPIResourceAsync(curApi, exc);`
`464`	`465`	`templateResources.AddRange(apiResources);`
`465`	`466`	`}`
`466`	`467`	`else`
`467`	`468`	`{`
`468`	`469`	`// add other API revision resources to template`
`469`		`- apiResources = await GenerateSingleAPIResourceAsync(curApi, exc.sourceApimName, exc.resourceGroup, exc.fileFolder, exc.policyXMLBaseUrl, exc.policyXMLSasToken);`
	`470`	`+ apiResources = await GenerateSingleAPIResourceAsync(curApi, exc);`
`470`	`471`
`471`	`472`	`// make current API a dependency to other revisions, in case destination apim doesn't have the this API`
`472`	`473`	`TemplateResource apiResource = apiResources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as TemplateResource;`
`@@ -485,9 +486,10 @@ public async Task<Template> GenerateAPIRevisionTemplateAsync(string currentRevis`
`485`	`486`	`}`
`486`	`487`
`487`	`488`	`// this function will get the current revision of this api and will remove "isCurrent" paramter`
`488`		`- public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsync(string apiName, string apimname, string resourceGroup, string fileFolder, string policyXMLBaseUrl, string policyXMLSasToken)`
	`489`	`+ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsync(string apiName, Extractor exc)`
`489`	`490`	`{`
`490`	`491`	`List<TemplateResource> templateResources = new List<TemplateResource>();`
	`492`	`+ string apimname = exc.sourceApimName, resourceGroup = exc.resourceGroup, fileFolder = exc.fileFolder, policyXMLBaseUrl = exc.policyXMLBaseUrl, policyXMLSasToken = exc.policyXMLSasToken;`
`491`	`493`	`string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, apiName);`
`492`	`494`	`Console.WriteLine("------------------------------------------");`
`493`	`495`	`Console.WriteLine("Extracting resources from {0} API:", apiName);`
`@@ -579,7 +581,7 @@ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsyn`
`579`	`581`	`{`
`580`	`582`	`string policyXMLContent = operationPolicyResource.properties.value;`
`581`	`583`	`string policyFolder = String.Concat(fileFolder, $@"/policies");`
`582`		`- string operationPolicyFileName = $@"/{operationName}-operationPolicy.xml";`
	`584`	`+ string operationPolicyFileName = $@"/{apiName}-{operationName}-operationPolicy.xml";`
`583`	`585`	`this.fileWriter.CreateFolderIfNotExists(policyFolder);`
`584`	`586`	`this.fileWriter.WriteXMLToFile(policyXMLContent, String.Concat(policyFolder, operationPolicyFileName));`
`585`	`587`	`operationPolicyResource.properties.format = "rawxml-link";`
`@@ -739,10 +741,10 @@ public async Task<List<TemplateResource>> GenerateCurrentRevisionAPIResourceAsyn`
`739`	`741`	`return templateResources;`
`740`	`742`	`}`
`741`	`743`
`742`		`- public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string resourceGroup, string singleApiName, List<string> multipleApiNames, string policyXMLBaseUrl, string policyXMLSasToken, string fileFolder)`
	`744`	`+ public async Task<Template> GenerateAPIsARMTemplateAsync(string singleApiName, List<string> multipleApiNames, Extractor exc)`
`743`	`745`	`{`
`744`	`746`	`// initialize arm template`
`745`		`- Template armTemplate = GenerateEmptyTemplateWithParameters(policyXMLBaseUrl, policyXMLSasToken);`
	`747`	`+ Template armTemplate = GenerateEmptyTemplateWithParameters(exc.policyXMLBaseUrl, exc.policyXMLSasToken);`
`746`	`748`	`List<TemplateResource> templateResources = new List<TemplateResource>();`
`747`	`749`
`748`	`750`	`// when extract single API`
`@@ -751,9 +753,9 @@ public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string`
`751`	`753`	`// check if this api exist`
`752`	`754`	`try`
`753`	`755`	`{`
`754`		`- string apiDetails = await GetAPIDetailsAsync(apimname, resourceGroup, singleApiName);`
	`756`	`+ string apiDetails = await GetAPIDetailsAsync(exc.sourceApimName, exc.resourceGroup, singleApiName);`
`755`	`757`	`Console.WriteLine("{0} API found ...", singleApiName);`
`756`		`- templateResources.AddRange(await GenerateSingleAPIResourceAsync(singleApiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));`
	`758`	`+ templateResources.AddRange(await GenerateSingleAPIResourceAsync(singleApiName, exc));`
`757`	`759`	`}`
`758`	`760`	`catch (Exception)`
`759`	`761`	`{`
`@@ -766,19 +768,19 @@ public async Task<Template> GenerateAPIsARMTemplateAsync(string apimname, string`
`766`	`768`	`Console.WriteLine("{0} APIs found ...", multipleApiNames.Count().ToString());`
`767`	`769`	`foreach (string apiName in multipleApiNames)`
`768`	`770`	`{`
`769`		`- templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));`
	`771`	`+ templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, exc));`
`770`	`772`	`}`
`771`	`773`	`}`
`772`	`774`	`// when extract all APIs and generate one master template`
`773`	`775`	`else`
`774`	`776`	`{`
`775`		`- JToken[] oApis = await GetAllAPIObjsAsync(apimname, resourceGroup);`
	`777`	`+ JToken[] oApis = await GetAllAPIObjsAsync(exc.sourceApimName, exc.resourceGroup);`
`776`	`778`	`Console.WriteLine("{0} APIs found ...", (oApis.Count().ToString()));`
`777`	`779`
`778`	`780`	`foreach (JToken oApi in oApis)`
`779`	`781`	`{`
`780`	`782`	`string apiName = ((JValue)oApi["name"]).Value.ToString();`
`781`		`- templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, apimname, resourceGroup, fileFolder, policyXMLBaseUrl, policyXMLSasToken));`
	`783`	`+ templateResources.AddRange(await GenerateSingleAPIResourceAsync(apiName, exc));`
`782`	`784`	`}`
`783`	`785`	`}`
`784`	`786`	`armTemplate.resources = templateResources.ToArray();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,`
`35`	`35`	`// namedValue`
`36`	`36`	`string namedValueDeploymentResourceName = "namedValuesTemplate";`
`37`	`37`	`// all other deployment resources will depend on named values`
`38`		`- string[] dependsOnNamedValues = new string[] {};`
	`38`	`+ string[] dependsOnNamedValues = new string[] { };`
`39`	`39`
`40`	`40`	`// api dependsOn`
`41`	`41`	`List<string> apiDependsOn = new List<string>();`
`@@ -45,15 +45,15 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,`
`45`	`45`	`dependsOnNamedValues = new string[] { $"[resourceId('Microsoft.Resources/deployments', '{namedValueDeploymentResourceName}')]" };`
`46`	`46`	`apiDependsOn.Add($"[resourceId('Microsoft.Resources/deployments', '{namedValueDeploymentResourceName}')]");`
`47`	`47`	`string namedValuesUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, fileNames.namedValues);`
`48`		`- resources.Add(this.CreateLinkedMasterTemplateResource(namedValueDeploymentResourceName, namedValuesUri, new string[] { }));`
	`48`	`+ resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken(namedValueDeploymentResourceName, namedValuesUri, new string[] { }, policyXMLSasToken));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`// globalServicePolicy`
`52`	`52`	`if (globalServicePolicyTemplate != null && globalServicePolicyTemplate.resources.Count() != 0)`
`53`	`53`	`{`
`54`	`54`	`apiDependsOn.Add("[resourceId('Microsoft.Resources/deployments', 'globalServicePolicyTemplate')]");`
`55`	`55`	`string globalServicePolicyUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, fileNames.globalServicePolicy);`
`56`		`- resources.Add(this.CreateLinkedMasterTemplateResource("globalServicePolicyTemplate", globalServicePolicyUri, dependsOnNamedValues));`
	`56`	`+ resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken("globalServicePolicyTemplate", globalServicePolicyUri, dependsOnNamedValues, policyXMLSasToken));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// apiVersionSet`
`@@ -107,13 +107,26 @@ public Template GenerateLinkedMasterTemplate(Template apiTemplate,`
`107`	`107`	`if (apiTemplate != null && apiTemplate.resources.Count() != 0)`
`108`	`108`	`{`
`109`	`109`	`string apisUri = GenerateLinkedTemplateUri(linkedTemplatesUrlQueryString, linkedTemplatesSasToken, apiFileName);`
`110`		`- resources.Add(this.CreateLinkedMasterTemplateResource("apisTemplate", apisUri, apiDependsOn.ToArray()));`
	`110`	`+ resources.Add(this.CreateLinkedMasterTemplateResourceWithPolicyToken("apisTemplate", apisUri, apiDependsOn.ToArray(), policyXMLSasToken));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`masterTemplate.resources = resources.ToArray();`
`114`	`114`	`return masterTemplate;`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ public MasterTemplateResource CreateLinkedMasterTemplateResourceWithPolicyToken(string name, string uriLink, string[] dependsOn, string sasToken)`
	`118`	`+ {`
	`119`	`+ if (sasToken == null)`
	`120`	`+ {`
	`121`	`+ return this.CreateLinkedMasterTemplateResource(name, uriLink, dependsOn);`
	`122`	`+ }`
	`123`	`+ else`
	`124`	`+ {`
	`125`	`+ MasterTemplateResource masterResourceTemplate = this.CreateLinkedMasterTemplateResource(name, uriLink, dependsOn);`
	`126`	`+ masterResourceTemplate.properties.parameters.Add("PolicyXMLSasToken", new TemplateParameterProperties() { value = "[parameters('PolicyXMLSasToken')]" });`
	`127`	`+ return masterResourceTemplate;`
	`128`	`+ }`
	`129`	`+ }`
`117`	`130`	`public MasterTemplateResource CreateLinkedMasterTemplateResource(string name, string uriLink, string[] dependsOn)`
`118`	`131`	`{`
`119`	`132`	`// create deployment resource with provided arguments`
`@@ -133,8 +146,7 @@ public MasterTemplateResource CreateLinkedMasterTemplateResource(string name, st`
`133`	`146`	`parameters = new Dictionary<string, TemplateParameterProperties>`
`134`	`147`	`{`
`135`	`148`	`{ "ApimServiceName", new TemplateParameterProperties(){ value = "[parameters('ApimServiceName')]" } },`
`136`		`- { "PolicyXMLBaseUrl", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLBaseUrl')]" } },`
`137`		`- { "PolicyXMLSasToken", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLSasToken')]" } }`
	`149`	`+ { "PolicyXMLBaseUrl", new TemplateParameterProperties(){ value = "[parameters('PolicyXMLBaseUrl')]" } }`
`138`	`150`	`}`
`139`	`151`	`},`
`140`	`152`	`dependsOn = dependsOn`
`@@ -248,7 +260,7 @@ public Template CreateSingleAPIRevisionsMasterTemplate(List<string> revList, str`
`248`	`260`	`}`
`249`	`261`	`else`
`250`	`262`	`{`
`251`		`- resources.Add(this.CreateLinkedMasterTemplateResource(templatename, revUri, new string[]{}));`
	`263`	`+ resources.Add(this.CreateLinkedMasterTemplateResource(templatename, revUri, new string[] { }));`
`252`	`264`	`}`
`253`	`265`	`}`
`254`	`266`
`@@ -316,7 +328,7 @@ public Template CreateMasterTemplateParameterValues(string apimServiceName, stri`
`316`	`328`	`{`
`317`	`329`	`value = policyXMLSasToken`
`318`	`330`	`};`
`319`		`- parameters.Add("PolicyXMLSasToken", policyTemplateSasTokenProperties);`
	`331`	`+ parameters.Add("PolicyXMLSasToken", policyTemplateSasTokenProperties);`
`320`	`332`	`}`
`321`	`333`	`}`
`322`	`334`	`masterTemplate.parameters = parameters;`
`@@ -325,8 +337,8 @@ public Template CreateMasterTemplateParameterValues(string apimServiceName, stri`
`325`	`337`
`326`	`338`	`public string GenerateLinkedTemplateUri(string linkedTemplatesUrlQueryString, string linkedTemplatesSasToken, string fileName)`
`327`	`339`	`{`
`328`		`- string linkedTemplateUri = linkedTemplatesSasToken != null ? $"concat(parameters('LinkedTemplatesBaseUrl'), '{fileName}', parameters('LinkedTemplatesSasToken'))" : $"concat(parameters('LinkedTemplatesBaseUrl'), '{fileName}')";`
`329`		`- return linkedTemplatesUrlQueryString != null ? $"[concat('{linkedTemplateUri}', parameters('LinkedTemplatesUrlQueryString'))]" : $"[{linkedTemplateUri}]";`
	`340`	`+ string linkedTemplateUri = linkedTemplatesSasToken != null ? $"parameters('LinkedTemplatesBaseUrl'), '{fileName}', parameters('LinkedTemplatesSasToken')" : $"parameters('LinkedTemplatesBaseUrl'), '{fileName}'";`
	`341`	`+ return linkedTemplatesUrlQueryString != null ? $"[concat({linkedTemplateUri}, parameters('LinkedTemplatesUrlQueryString'))]" : $"[concat({linkedTemplateUri})]";`
`330`	`342`	`}`
`331`	`343`	`}`
`332`	`344`	`}`