add unlinked master template option

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

@@ -66,17 +66,26 @@ public CreateCommand()
                     CreatorFileNames creatorFileNames = fileNameGenerator.GenerateCreatorFileNames();
                     Template apiVersionSetTemplate = creatorConfig.apiVersionSet != null ? apiVersionSetTemplateCreator.CreateAPIVersionSetTemplate(creatorConfig) : null;
                     Template apiTemplate = await apiTemplateCreator.CreateAPITemplateAsync(creatorConfig);
-                    Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
-                    Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
+                    if(creatorConfig.linked == true)
+                    {
+                        Template masterTemplate = masterTemplateCreator.CreateLinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                        Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
 
-                    // write templates to outputLocation
-                    if (apiVersionSetTemplate != null)
+                        // write templates to outputLocation
+                        if (apiVersionSetTemplate != null)
+                        {
+                            armTemplateWriter.WriteJSONToFile(apiVersionSetTemplate, String.Concat(creatorConfig.outputLocation, @"/linked/", creatorFileNames.apiVersionSet));
+                        }
+                        armTemplateWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, @"/linked/", creatorFileNames.api));
+                        armTemplateWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, @"/linked/", "master.template.json"));
+                        armTemplateWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, @"/linked/", "master.parameters.json"));
+                    } else
                     {
-                        armTemplateWriter.WriteJSONToFile(apiVersionSetTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.apiVersionSet));
+                        Template masterTemplate = masterTemplateCreator.CreateUnlinkedMasterTemplate(apiVersionSetTemplate, apiTemplate, creatorFileNames);
+                        Template masterTemplateParameters = masterTemplateCreator.CreateMasterTemplateParameterValues(creatorConfig);
+                        armTemplateWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, @"/unlinked/", "master.template.json"));
+                        armTemplateWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, @"/unlinked/", "master.parameters.json"));
                     }
-                    armTemplateWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, creatorFileNames.api));
-                    armTemplateWriter.WriteJSONToFile(masterTemplate, String.Concat(creatorConfig.outputLocation, @"/", "master.template.json"));
-                    armTemplateWriter.WriteJSONToFile(masterTemplateParameters, String.Concat(creatorConfig.outputLocation, @"/", "master.parameters.json"));
 
                     ColoredConsole.WriteLine("Templates written to output location");
                 }

src/APIM_ARMTemplate/apimtemplate/Common/Templates/MasterTemplateResource.cs

@@ -7,7 +7,6 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
     public class MasterTemplateResource : TemplateResource
     {
         public MasterTemplateProperties properties { get; set; }
-        public string[] dependsOn { get; set; }
     }
 
     public class MasterTemplateProperties

src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/XMLPolicies/operationRateLimit.xml

@@ -2,7 +2,6 @@
   <inbound>
     <rate-limit-by-key calls="3" renewal-period="15" counter-key="@(context.Subscription.Id)" />
     <base />
-    <set-backend-service id="apim-generated-policy" backend-id="serverlessoheastus-managementapi" />
   </inbound>
   <backend>
     <base />

src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml

@@ -1,29 +1,24 @@
 version: 0.0.1
-apimServiceName: "testing-grounds"
+apimServiceName: testing-grounds
 apiVersionSet:
     displayName: myAPIVersionSet
     description: a description
     versioningScheme: Query
     versionQueryName: versionQuery
     versionHeaderName: versionHeader
 api:
-  openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\dataGenAPIDefinition.json
+  openApiSpec: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\OpenApiSpecs\swaggerPetstore.json
   policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\apiPolicyHeaders.xml
   suffix: conf
   apiVersion: v2
   apiVersionDescription: vDesc
   revision: 2
   revisionDescription: rDesc
   operations:
-    getSessions: 
+    addPet: 
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml
-    postSessions: 
+    deletePet: 
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml
-  authenticationSettings:
-    subscriptionKeyRequired: false
-    oAuth2:
-        authorizationServerId: serverId
-        scope: scope
   products: starter, plantinum
 outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates
-linked: true
+linked: false

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

@@ -32,9 +32,7 @@ public async Task<Template> CreateAPITemplateAsync(CreatorConfig creatorConfig)
                 { "ApimServiceName", new TemplateParameterProperties(){ type = "string" } }
             };
 
-            string subsequentAPIName = "[concat(parameters('ApimServiceName'), '/api')]";
-            string subsequentAPIType = "Microsoft.ApiManagement/service/apis";
-            string[] dependsOnSubsequentAPI = new string[] { $"[resourceId('{subsequentAPIType}', '{subsequentAPIName}')]" };
+            string[] dependsOnSubsequentAPI = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis', parameters('ApimServiceName'), 'subsequent-api')]" };
 
             List<TemplateResource> resources = new List<TemplateResource>();
             // create api resource with properties
@@ -58,23 +56,27 @@ public APITemplateResource CreateInitialAPITemplateResource(CreatorConfig creato
             // create api resource with properties
             APITemplateResource apiTemplateResource = new APITemplateResource()
             {
-                name = "[concat(parameters('ApimServiceName'), '/api')]",
+                name = "[concat(parameters('ApimServiceName'), '/initial-api')]",
                 type = "Microsoft.ApiManagement/service/apis",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new APITemplateProperties()
                 {
                     // supplied via optional arguments
                     apiVersion = creatorConfig.api.apiVersion,
                     apiRevision = creatorConfig.api.revision,
                     apiRevisionDescription = creatorConfig.api.revisionDescription,
                     apiVersionDescription = creatorConfig.api.apiVersionDescription,
-                    authenticationSettings = creatorConfig.api.authenticationSettings
+                    authenticationSettings = creatorConfig.api.authenticationSettings,
+                    path = creatorConfig.api.suffix,
+                    displayName = "api",
+                    protocols = new string[] {"http" }
                 },
-                dependsOn = new string[] { }
+                // if the template is not linked the depends on for the apiVersionSet needs to be inlined here
+                dependsOn = creatorConfig.linked == true ? new string[] { } : new string[] { $"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]" }
             };
             if(creatorConfig.apiVersionSet != null)
             {
-                apiTemplateResource.properties.apiVersionSetId = "[concat(resourceId('Microsoft.ApiManagement/service', parameters('ApimServiceName')), '/api-version-sets/versionset')]";
+                apiTemplateResource.properties.apiVersionSetId = "[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), 'versionset')]";
             }
             return apiTemplateResource;
         }
@@ -84,21 +86,21 @@ public async Task<APITemplateResource> CreateSubsequentAPITemplateResourceAsync(
             // create api resource with properties
             // used to escape characters in json file
             object deserializedFileContents = JsonConvert.DeserializeObject<object>(await this.fileReader.RetrieveLocationContentsAsync(creatorConfig.api.openApiSpec));
-            string subsequentAPIName = "[concat(parameters('ApimServiceName'), '/api')]";
+            string subsequentAPIName = "[concat(parameters('ApimServiceName'), '/subsequent-api')]";
             string subsequentAPIType = "Microsoft.ApiManagement/service/apis";
             APITemplateResource apiTemplateResource = new APITemplateResource()
             {
                 name = subsequentAPIName,
                 type = subsequentAPIType,
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new APITemplateProperties()
                 {
                     contentFormat = "swagger-json",
                     contentValue = JsonConvert.SerializeObject(deserializedFileContents),
                     // supplied via optional arguments
-                    path = creatorConfig.api.suffix ?? ""
+                    path = creatorConfig.api.suffix
                 },
-                dependsOn = new string[] { $"[resourceId('{subsequentAPIType}', '{subsequentAPIName}')]" }
+                dependsOn = new string[] { $"[resourceId('Microsoft.ApiManagement/service/apis', parameters('ApimServiceName'), 'initial-api')]" }
         };
             return apiTemplateResource;
         }

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

@@ -32,7 +32,7 @@ public Template CreateAPIVersionSetTemplate(CreatorConfig creatorConfig)
             {
                 name = "[concat(parameters('ApimServiceName'), '/versionset')]",
                 type = "Microsoft.ApiManagement/service/api-version-sets",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new APIVersionSetProperties()
                 {
                     displayName = creatorConfig.apiVersionSet.displayName,

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

@@ -25,7 +25,7 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
 
             // add parameters
-            masterTemplate.parameters = this.CreateMasterTemplateParameters();
+            masterTemplate.parameters = this.CreateMasterTemplateParameters(true);
 
             // add links to all resources
             List<TemplateResource> resources = new List<TemplateResource>();
@@ -46,13 +46,38 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             return masterTemplate;
         }
 
+        public Template CreateUnlinkedMasterTemplate(Template apiVersionSetTemplate,
+            Template apiTemplate,
+            CreatorFileNames creatorFileNames)
+        {
+            Template masterTemplate = this.templateCreator.CreateEmptyTemplate();
+
+            // add parameters
+            masterTemplate.parameters = this.CreateMasterTemplateParameters(false);
+
+            // add links to all resources
+            List<TemplateResource> resources = new List<TemplateResource>();
+
+            // apiVersionSet
+            if (apiVersionSetTemplate != null)
+            {
+                resources.AddRange(apiVersionSetTemplate.resources);
+            }
+
+            //api
+            resources.AddRange(apiTemplate.resources);
+
+            masterTemplate.resources = resources.ToArray();
+            return masterTemplate;
+        }
+
         public MasterTemplateResource CreateMasterTemplateResource(string name, string uriLink, string[] dependsOn)
         {
             MasterTemplateResource masterTemplateResource = new MasterTemplateResource()
             {
                 name = name,
                 type = "Microsoft.Resources/deployments",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new MasterTemplateProperties()
                 {
                     mode = "Incremental",
@@ -71,18 +96,9 @@ public MasterTemplateResource CreateMasterTemplateResource(string name, string u
             return masterTemplateResource;
         }
 
-        public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParameters()
+        public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParameters(bool linked)
         {
             Dictionary<string, TemplateParameterProperties> parameters = new Dictionary<string, TemplateParameterProperties>();
-            TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
-            {
-                metadata = new TemplateParameterMetadata()
-                {
-                    description = "Base URL of the repository"
-                },
-                type = "string"
-            };
-            parameters.Add("repoBaseUrl", repoBaseUrlProperties);
             TemplateParameterProperties apimServiceNameProperties = new TemplateParameterProperties()
             {
                 metadata = new TemplateParameterMetadata()
@@ -92,6 +108,18 @@ public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParam
                 type = "string"
             };
             parameters.Add("ApimServiceName", apimServiceNameProperties);
+            if(linked == true)
+            {
+                TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
+                {
+                    metadata = new TemplateParameterMetadata()
+                    {
+                        description = "Base URL of the repository"
+                    },
+                    type = "string"
+                };
+                parameters.Add("repoBaseUrl", repoBaseUrlProperties);
+            }
             return parameters;
         }
 
@@ -101,16 +129,23 @@ public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)
 
             // add parameters
             Dictionary<string, TemplateParameterProperties> parameters = new Dictionary<string, TemplateParameterProperties>();
-            TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
-            {
-                value = "."
-            };
-            parameters.Add("repoBaseUrl", repoBaseUrlProperties);
             TemplateParameterProperties apimServiceNameProperties = new TemplateParameterProperties()
             {
                 value = creatorConfig.apimServiceName
             };
             parameters.Add("ApimServiceName", apimServiceNameProperties);
+            if (creatorConfig.linked == true)
+            {
+                TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
+                {
+                    metadata = new TemplateParameterMetadata()
+                    {
+                        description = "Base URL of the repository"
+                    },
+                    type = "string"
+                };
+                parameters.Add("repoBaseUrl", repoBaseUrlProperties);
+            }
             masterTemplate.parameters = parameters;
             return masterTemplate;
         }

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

@@ -21,9 +21,9 @@ public async Task<PolicyTemplateResource> CreateAPIPolicyTemplateResourceAsync(C
             // create policy resource with properties
             PolicyTemplateResource policyTemplateResource = new PolicyTemplateResource()
             {
-                name = "[concat(parameters('ApimServiceName'), '/api/policy')]",
+                name = "[concat(parameters('ApimServiceName'), '/subsequent-api/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/policies",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",
@@ -39,9 +39,9 @@ public async Task<PolicyTemplateResource> CreateOperationPolicyTemplateResourceA
             // create policy resource with properties
             PolicyTemplateResource policyTemplateResource = new PolicyTemplateResource()
             {
-                name = $"[concat(parameters('ApimServiceName'), '/api/{policyPair.Key}/policy')]",
+                name = $"[concat(parameters('ApimServiceName'), '/subsequent-api/{policyPair.Key}/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/operations/policies",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",

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

@@ -15,9 +15,9 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc
             // create products/apis resource with properties
             ProductAPITemplateResource productAPITemplateResource = new ProductAPITemplateResource()
             {
-                name = $"[concat(parameters('ApimServiceName'), '/{productID}/api')]",
+                name = $"[concat(parameters('ApimServiceName'), '/{productID}/subsequent-api')]",
                 type = "Microsoft.ApiManagement/service/products/apis",
-                apiVersion = "2018-11-01",
+                apiVersion = "2018-06-01-preview",
                 properties = new ProductAPITemplateProperties(),
                 dependsOn = dependsOn
             };