add base url property to config for linking, update version number

lucashuet93 · lucashuet93 · commit 977ab71dce06 · 2019-01-18T14:24:08.000-05:00
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/Templates/APITemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/Templates/APITemplateResource.cs
@@ -21,7 +21,8 @@ public class APITemplateProperties
         public string apiRevisionDescription { get; set; }
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
-        public bool subscriptionRequired { get; set; }
+        // subscriptionRequired is not available for version 2018-01-01
+        //public bool subscriptionRequired { get; set; }
         public string displayName { get; set; }
         public string serviceUrl { get; set; }
         public string path { get; set; }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml b/src/APIM_ARMTemplate/apimtemplate/Creator/ExampleFiles/YAMLConfigs/valid.yml
@@ -22,4 +22,5 @@ api:
       policy: C:\Users\lucashh\Desktop\Projects\APIM-ARM\azure-api-management-devops-example\src\APIM_ARMTemplate\apimtemplate\Creator\ExampleFiles\XMLPolicies\operationRateLimit.xml
   products: starter, platinum
 outputLocation: C:\Users\lucashh\Desktop\Projects\APIM-ARM\GeneratedTemplates
-linked: true
+linked: false
+linkedTemplatesBaseUrl : https://lucasyamlblob.blob.core.windows.net/yaml
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs
@@ -17,6 +17,7 @@ public class CreatorConfig
         public APIConfig api { get; set; }
         public string outputLocation { get; set; }
         public bool linked { get; set; }
+        public string linkedTemplatesBaseUrl { get; set; }
     }
 
     public class APIConfig
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs
@@ -65,7 +65,7 @@ public async Task<APITemplateResource> CreateInitialAPITemplateResource(CreatorC
             {
                 name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}-initial')]",
                 type = "Microsoft.ApiManagement/service/apis",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new APITemplateProperties()
                 {
                     // supplied via optional arguments
@@ -98,7 +98,7 @@ public async Task<APITemplateResource> CreateSubsequentAPITemplateResourceAsync(
             {
                 name = subsequentAPIName,
                 type = subsequentAPIType,
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new APITemplateProperties()
                 {
                     contentFormat = "swagger-json",
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APIVersionSetTemplateCreator.cs
@@ -33,7 +33,7 @@ public Template CreateAPIVersionSetTemplate(CreatorConfig creatorConfig)
             {
                 name = "[concat(parameters('ApimServiceName'), '/versionset')]",
                 type = "Microsoft.ApiManagement/service/api-version-sets",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new APIVersionSetProperties()
                 {
                     displayName = creatorConfig.apiVersionSet.displayName,
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/MasterTemplateCreator.cs
@@ -32,12 +32,12 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,
             // apiVersionSet
             if (apiVersionSetTemplate != null)
             {
-                string apiVersionSetUri = $"[concat(parameters('repoBaseUrl'), '{creatorFileNames.apiVersionSet}')]";
+                string apiVersionSetUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.apiVersionSet}')]";
                 resources.Add(this.CreateMasterTemplateResource("versionSetTemplate", apiVersionSetUri, new string[] { }));
             }
 
             //api
-            string initialAPIUri = $"[concat(parameters('repoBaseUrl'), '{creatorFileNames.api}')]";
+            string initialAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.api}')]";
             string[] initialAPIDependsOn = apiVersionSetTemplate != null ? new string[] { "[resourceId('Microsoft.Resources/deployments', 'versionSetTemplate')]" } : new string[] { };
             resources.Add(this.CreateMasterTemplateResource("apiTemplate", initialAPIUri, initialAPIDependsOn));
 
@@ -77,7 +77,7 @@ public MasterTemplateResource CreateMasterTemplateResource(string name, string u
             {
                 name = name,
                 type = "Microsoft.Resources/deployments",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new MasterTemplateProperties()
                 {
                     mode = "Incremental",
@@ -111,15 +111,15 @@ public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParam
             parameters.Add("ApimServiceName", apimServiceNameProperties);
             if(linked == true)
             {
-                TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
+                TemplateParameterProperties linkedTemplatesBaseUrlProperties = new TemplateParameterProperties()
                 {
                     metadata = new TemplateParameterMetadata()
                     {
                         description = "Base URL of the repository"
                     },
                     type = "string"
                 };
-                parameters.Add("repoBaseUrl", repoBaseUrlProperties);
+                parameters.Add("LinkedTemplatesBaseUrl", linkedTemplatesBaseUrlProperties);
             }
             return parameters;
         }
@@ -139,11 +139,11 @@ public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)
             parameters.Add("ApimServiceName", apimServiceNameProperties);
             if (creatorConfig.linked == true)
             {
-                TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()
+                TemplateParameterProperties linkedTemplatesBaseUrlProperties = new TemplateParameterProperties()
                 {
-                    value = ""
+                    value = creatorConfig.linkedTemplatesBaseUrl
                 };
-                parameters.Add("repoBaseUrl", repoBaseUrlProperties);
+                parameters.Add("LinkedTemplatesBaseUrl", linkedTemplatesBaseUrlProperties);
             }
             masterTemplate.parameters = parameters;
             return masterTemplate;
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs
@@ -23,7 +23,7 @@ public async Task<PolicyTemplateResource> CreateAPIPolicyTemplateResourceAsync(C
             {
                 name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/policies",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",
@@ -41,7 +41,7 @@ public async Task<PolicyTemplateResource> CreateOperationPolicyTemplateResourceA
             {
                 name = $"[concat(parameters('ApimServiceName'), '/{apiName}/{policyPair.Key}/policy')]",
                 type = "Microsoft.ApiManagement/service/apis/operations/policies",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new PolicyTemplateProperties()
                 {
                     contentFormat = "rawxml",
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs
@@ -17,7 +17,7 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc
             {
                 name = $"[concat(parameters('ApimServiceName'), '/{productID}/{apiName}')]",
                 type = "Microsoft.ApiManagement/service/products/apis",
-                apiVersion = "2018-06-01-preview",
+                apiVersion = "2018-01-01",
                 properties = new ProductAPITemplateProperties(),
                 dependsOn = dependsOn
             };

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class CreatorConfig`
`17`	`17`	`public APIConfig api { get; set; }`
`18`	`18`	`public string outputLocation { get; set; }`
`19`	`19`	`public bool linked { get; set; }`
	`20`	`+ public string linkedTemplatesBaseUrl { get; set; }`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public class APIConfig`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public async Task<APITemplateResource> CreateInitialAPITemplateResource(CreatorC`
`65`	`65`	`{`
`66`	`66`	`name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}-initial')]",`
`67`	`67`	`type = "Microsoft.ApiManagement/service/apis",`
`68`		`- apiVersion = "2018-06-01-preview",`
	`68`	`+ apiVersion = "2018-01-01",`
`69`	`69`	`properties = new APITemplateProperties()`
`70`	`70`	`{`
`71`	`71`	`// supplied via optional arguments`
`@@ -98,7 +98,7 @@ public async Task<APITemplateResource> CreateSubsequentAPITemplateResourceAsync(`
`98`	`98`	`{`
`99`	`99`	`name = subsequentAPIName,`
`100`	`100`	`type = subsequentAPIType,`
`101`		`- apiVersion = "2018-06-01-preview",`
	`101`	`+ apiVersion = "2018-01-01",`
`102`	`102`	`properties = new APITemplateProperties()`
`103`	`103`	`{`
`104`	`104`	`contentFormat = "swagger-json",`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public Template CreateAPIVersionSetTemplate(CreatorConfig creatorConfig)`
`33`	`33`	`{`
`34`	`34`	`name = "[concat(parameters('ApimServiceName'), '/versionset')]",`
`35`	`35`	`type = "Microsoft.ApiManagement/service/api-version-sets",`
`36`		`- apiVersion = "2018-06-01-preview",`
	`36`	`+ apiVersion = "2018-01-01",`
`37`	`37`	`properties = new APIVersionSetProperties()`
`38`	`38`	`{`
`39`	`39`	`displayName = creatorConfig.apiVersionSet.displayName,`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public Template CreateLinkedMasterTemplate(Template apiVersionSetTemplate,`
`32`	`32`	`// apiVersionSet`
`33`	`33`	`if (apiVersionSetTemplate != null)`
`34`	`34`	`{`
`35`		`- string apiVersionSetUri = $"[concat(parameters('repoBaseUrl'), '{creatorFileNames.apiVersionSet}')]";`
	`35`	`+ string apiVersionSetUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.apiVersionSet}')]";`
`36`	`36`	`resources.Add(this.CreateMasterTemplateResource("versionSetTemplate", apiVersionSetUri, new string[] { }));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`//api`
`40`		`- string initialAPIUri = $"[concat(parameters('repoBaseUrl'), '{creatorFileNames.api}')]";`
	`40`	`+ string initialAPIUri = $"[concat(parameters('LinkedTemplatesBaseUrl'), '{creatorFileNames.api}')]";`
`41`	`41`	`string[] initialAPIDependsOn = apiVersionSetTemplate != null ? new string[] { "[resourceId('Microsoft.Resources/deployments', 'versionSetTemplate')]" } : new string[] { };`
`42`	`42`	`resources.Add(this.CreateMasterTemplateResource("apiTemplate", initialAPIUri, initialAPIDependsOn));`
`43`	`43`
`@@ -77,7 +77,7 @@ public MasterTemplateResource CreateMasterTemplateResource(string name, string u`
`77`	`77`	`{`
`78`	`78`	`name = name,`
`79`	`79`	`type = "Microsoft.Resources/deployments",`
`80`		`- apiVersion = "2018-06-01-preview",`
	`80`	`+ apiVersion = "2018-01-01",`
`81`	`81`	`properties = new MasterTemplateProperties()`
`82`	`82`	`{`
`83`	`83`	`mode = "Incremental",`
`@@ -111,15 +111,15 @@ public Dictionary<string, TemplateParameterProperties> CreateMasterTemplateParam`
`111`	`111`	`parameters.Add("ApimServiceName", apimServiceNameProperties);`
`112`	`112`	`if(linked == true)`
`113`	`113`	`{`
`114`		`- TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()`
	`114`	`+ TemplateParameterProperties linkedTemplatesBaseUrlProperties = new TemplateParameterProperties()`
`115`	`115`	`{`
`116`	`116`	`metadata = new TemplateParameterMetadata()`
`117`	`117`	`{`
`118`	`118`	`description = "Base URL of the repository"`
`119`	`119`	`},`
`120`	`120`	`type = "string"`
`121`	`121`	`};`
`122`		`- parameters.Add("repoBaseUrl", repoBaseUrlProperties);`
	`122`	`+ parameters.Add("LinkedTemplatesBaseUrl", linkedTemplatesBaseUrlProperties);`
`123`	`123`	`}`
`124`	`124`	`return parameters;`
`125`	`125`	`}`
`@@ -139,11 +139,11 @@ public Template CreateMasterTemplateParameterValues(CreatorConfig creatorConfig)`
`139`	`139`	`parameters.Add("ApimServiceName", apimServiceNameProperties);`
`140`	`140`	`if (creatorConfig.linked == true)`
`141`	`141`	`{`
`142`		`- TemplateParameterProperties repoBaseUrlProperties = new TemplateParameterProperties()`
	`142`	`+ TemplateParameterProperties linkedTemplatesBaseUrlProperties = new TemplateParameterProperties()`
`143`	`143`	`{`
`144`		`- value = ""`
	`144`	`+ value = creatorConfig.linkedTemplatesBaseUrl`
`145`	`145`	`};`
`146`		`- parameters.Add("repoBaseUrl", repoBaseUrlProperties);`
	`146`	`+ parameters.Add("LinkedTemplatesBaseUrl", linkedTemplatesBaseUrlProperties);`
`147`	`147`	`}`
`148`	`148`	`masterTemplate.parameters = parameters;`
`149`	`149`	`return masterTemplate;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public async Task<PolicyTemplateResource> CreateAPIPolicyTemplateResourceAsync(C`
`23`	`23`	`{`
`24`	`24`	`name = $"[concat(parameters('ApimServiceName'), '/{creatorConfig.api.name}/policy')]",`
`25`	`25`	`type = "Microsoft.ApiManagement/service/apis/policies",`
`26`		`- apiVersion = "2018-06-01-preview",`
	`26`	`+ apiVersion = "2018-01-01",`
`27`	`27`	`properties = new PolicyTemplateProperties()`
`28`	`28`	`{`
`29`	`29`	`contentFormat = "rawxml",`
`@@ -41,7 +41,7 @@ public async Task<PolicyTemplateResource> CreateOperationPolicyTemplateResourceA`
`41`	`41`	`{`
`42`	`42`	`name = $"[concat(parameters('ApimServiceName'), '/{apiName}/{policyPair.Key}/policy')]",`
`43`	`43`	`type = "Microsoft.ApiManagement/service/apis/operations/policies",`
`44`		`- apiVersion = "2018-06-01-preview",`
	`44`	`+ apiVersion = "2018-01-01",`
`45`	`45`	`properties = new PolicyTemplateProperties()`
`46`	`46`	`{`
`47`	`47`	`contentFormat = "rawxml",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc`
`17`	`17`	`{`
`18`	`18`	`name = $"[concat(parameters('ApimServiceName'), '/{productID}/{apiName}')]",`
`19`	`19`	`type = "Microsoft.ApiManagement/service/products/apis",`
`20`		`- apiVersion = "2018-06-01-preview",`
	`20`	`+ apiVersion = "2018-01-01",`
`21`	`21`	`properties = new ProductAPITemplateProperties(),`
`22`	`22`	`dependsOn = dependsOn`
`23`	`23`	`};`