update template schemas to 2019-01-01 version

lucashuet93 · lucashuet93 · commit a4c56f662592 · 2019-05-09T15:35:19.000-04:00
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs
@@ -80,8 +80,8 @@ public async void ShouldCreateSubsequentlAPITemplateResourceFromCreatorConfigWit
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}')]", apiTemplateResource.name);
-            Assert.Equal("swagger-link-json", apiTemplateResource.properties.contentFormat);
-            Assert.Equal(api.openApiSpec, apiTemplateResource.properties.contentValue);
+            Assert.Equal("swagger-link-json", apiTemplateResource.properties.format);
+            Assert.Equal(api.openApiSpec, apiTemplateResource.properties.value);
         }
 
         [Fact]
@@ -136,8 +136,8 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.authenticationSettings.openid.openidProviderId, apiTemplateResource.properties.authenticationSettings.openid.openidProviderId);
             Assert.Equal(api.authenticationSettings.openid.bearerTokenSendingMethods, apiTemplateResource.properties.authenticationSettings.openid.bearerTokenSendingMethods);
             Assert.Equal(api.authenticationSettings.subscriptionKeyRequired, apiTemplateResource.properties.authenticationSettings.subscriptionKeyRequired);
-            Assert.Equal("swagger-link-json", apiTemplateResource.properties.contentFormat);
-            Assert.Equal(api.openApiSpec, apiTemplateResource.properties.contentValue);
+            Assert.Equal("swagger-link-json", apiTemplateResource.properties.format);
+            Assert.Equal(api.openApiSpec, apiTemplateResource.properties.value);
         }
 
         [Fact]
diff --git a/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/PolicyTemplateCreatorTests.cs b/src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/PolicyTemplateCreatorTests.cs
@@ -26,8 +26,8 @@ public void ShouldCreateAPIPolicyTemplateResourceFromCreatorConfigWithCorrectCon
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}/policy')]", policyTemplateResource.name);
-            Assert.Equal("rawxml-link", policyTemplateResource.properties.contentFormat);
-            Assert.Equal(api.policy, policyTemplateResource.properties.policyContent);
+            Assert.Equal("rawxml-link", policyTemplateResource.properties.format);
+            Assert.Equal(api.policy, policyTemplateResource.properties.value);
             Assert.Equal(dependsOn, policyTemplateResource.dependsOn);
         }
 
@@ -45,8 +45,8 @@ public void ShouldCreateOperationPolicyTemplateResourceFromPairWithCorrectConten
 
             // assert
             Assert.Equal($"[concat(parameters('ApimServiceName'), '/{apiName}/{policyPair.Key}/policy')]", policyTemplateResource.name);
-            Assert.Equal("rawxml-link", policyTemplateResource.properties.contentFormat);
-            Assert.Equal(policyPair.Value.policy, policyTemplateResource.properties.policyContent);
+            Assert.Equal("rawxml-link", policyTemplateResource.properties.format);
+            Assert.Equal(policyPair.Value.policy, policyTemplateResource.properties.value);
             Assert.Equal(dependsOn, policyTemplateResource.dependsOn);
         }
     }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs b/src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs
@@ -92,7 +92,7 @@ public CreateCommand()
                         APITemplateResource apiResource = apiTemplate.resources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as APITemplateResource;
                         APIConfig providedAPIConfiguration = creatorConfig.apis.FirstOrDefault(api => apiResource.name.Contains(api.name));
                         // if the api version is not null the api is split into multiple templates. If the template is split and the content value has been set, then the template is for a subsequent api
-                        string apiFileName = fileNameGenerator.GenerateAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.contentValue == null);
+                        string apiFileName = fileNameGenerator.GenerateAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value == null);
                         fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, apiFileName));
                     }
                     if (apiVersionSetsTemplate != null)
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/APITemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/APITemplateResource.cs
@@ -15,6 +15,7 @@ public class APITemplateProperties
         public string type { get; set; }
         public string apiRevision { get; set; }
         public string apiVersion { get; set; }
+        public bool isCurrent { get; set; }
         public string apiRevisionDescription { get; set; }
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
@@ -23,9 +24,9 @@ public class APITemplateProperties
         public string serviceUrl { get; set; }
         public string path { get; set; }
         public string[] protocols { get; set; }
-        public APITemplateVersionSet apiVersionSet { get; set; }
-        public string contentValue { get; set; }
-        public string contentFormat { get; set; }
+        public APITemplateAPIVersionSet apiVersionSet { get; set; }
+        public string value { get; set; }
+        public string format { get; set; }
         public APITemplateWSDLSelector wsdlSelector { get; set; }
         public string apiType { get; set; }
     }
@@ -70,6 +71,16 @@ public class APITemplateOpenID
         public string[] bearerTokenSendingMethods { get; set; }
     }
 
+    public class APITemplateAPIVersionSet
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        public string description { get; set; }
+        public string versionQueryName { get; set; }
+        public string versionHeaderName { get; set; }
+        public string versioningScheme { get; set; }
+    }
+
     public abstract class APITemplateSubResource : TemplateResource { }
 
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/BackendTemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/BackendTemplateResource.cs
@@ -38,6 +38,7 @@ public class ServerX509Names
         public string name { get; set; }
         public string issuerCertificateThumbprint { get; set; }
     }
+
     public class BackendCredentials
     {
         public string[] certificate { get; set; }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/IssueTemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/IssueTemplateResource.cs
@@ -9,12 +9,11 @@ public class IssueTemplateResource : APITemplateSubResource
 
     public class IssueTemplateProperties
     {
+        public string state { get; set; }
+        public string apiId { get; set; }
         public string title { get; set; }
         public string description { get; set; }
-        public string createdDate { get; set; }
-        public string state { get; set; }
         public string userId { get; set; }
-        public string apiId { get; set; }
     }
 
     public class IssueTemplateAttachment : IssueTemplateSubResource
@@ -37,7 +36,6 @@ public class IssueTemplateComment : IssueTemplateSubResource
     public class IssueTemplateCommentProperties
     {
         public string text { get; set; }
-        public string createdDate { get; set; }
         public string userId { get; set; }
     }
 
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/PolicyTemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/PolicyTemplateResource.cs
@@ -9,7 +9,7 @@ public class PolicyTemplateResource : APITemplateSubResource
 
     public class PolicyTemplateProperties
     {
-        public string policyContent { get; set; }
-        public string contentFormat { get; set; }
+        public string value { get; set; }
+        public string format { get; set; }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductAPITemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductAPITemplateResource.cs
@@ -1,9 +1,5 @@
 ﻿
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
 {
-    public class ProductAPITemplateResource : TemplateResource {
-        public ProductAPITemplateProperties properties { get; set; }
-    }
-
-    public class ProductAPITemplateProperties { }
+    public class ProductAPITemplateResource : TemplateResource { }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductsTemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductsTemplateResource.cs
@@ -8,12 +8,12 @@ public class ProductsTemplateResource : TemplateResource
 
     public class ProductsTemplateProperties
     {
-        public string displayName { get; set; }
         public string description { get; set; }
         public string terms { get; set; }
         public bool subscriptionRequired { get; set; }
         public bool approvalRequired { get; set; }
         public int subscriptionsLimit { get; set; }
         public string state { get; set; }
+        public string displayName { get; set; }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/PropertyTemplateResource.cs b/src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/PropertyTemplateResource.cs
@@ -9,9 +9,9 @@ public class PropertyTemplateResource : TemplateResource
 
     public class PropertyResourceProperties
     {
-        public string displayName { get; set; }
-        public string value { get; set; }
         public IList<string> tags { get; set; }
         public bool secret { get; set; }
+        public string displayName { get; set; }
+        public string value { get; set; }
     }
 }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/Models/CreatorConfiguration.cs
@@ -38,6 +38,7 @@ public class APIConfig
         public string suffix { get; set; }
         public bool subscriptionRequired { get; set; }
         public string apiVersion { get; set; }
+        public bool isCurrent { get; set; }
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
         public string revision { get; set; }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs
@@ -114,6 +114,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 apiTemplateResource.properties.apiVersionDescription = api.apiVersionDescription;
                 apiTemplateResource.properties.authenticationSettings = api.authenticationSettings;
                 apiTemplateResource.properties.path = api.suffix;
+                apiTemplateResource.properties.isCurrent = api.isCurrent;
                 apiTemplateResource.properties.displayName = api.name;
                 apiTemplateResource.properties.protocols = this.CreateProtocols(doc);
                 // set the version set id
@@ -137,8 +138,8 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 // used to escape sequences in local swagger json
                 object deserializedFileContents = isUrl ? null : JsonConvert.DeserializeObject<object>(this.fileReader.RetrieveLocalFileContents(api.openApiSpec));
                 // if openApiSpec is a url inline the url, if it is a local file inline the file contents
-                apiTemplateResource.properties.contentFormat = isUrl ? "swagger-link-json" : "swagger-json";
-                apiTemplateResource.properties.contentValue = isUrl ? api.openApiSpec : JsonConvert.SerializeObject(deserializedFileContents);
+                apiTemplateResource.properties.format = isUrl ? "swagger-link-json" : "swagger-json";
+                apiTemplateResource.properties.value = isUrl ? api.openApiSpec : JsonConvert.SerializeObject(deserializedFileContents);
                 // supplied via optional arguments
                 apiTemplateResource.properties.path = api.suffix;
             }
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/PolicyTemplateCreator.cs
@@ -27,8 +27,8 @@ public PolicyTemplateResource CreateAPIPolicyTemplateResource(APIConfig api, str
                 properties = new PolicyTemplateProperties()
                 {
                     // if policy is a url inline the url, if it is a local file inline the file contents
-                    contentFormat = isUrl ? "rawxml-link" : "rawxml",
-                    policyContent = isUrl ? api.policy : this.fileReader.RetrieveLocalFileContents(api.policy)
+                    format = isUrl ? "rawxml-link" : "rawxml",
+                    value = isUrl ? api.policy : this.fileReader.RetrieveLocalFileContents(api.policy)
                 },
                 dependsOn = dependsOn
             };
@@ -48,8 +48,8 @@ public PolicyTemplateResource CreateOperationPolicyTemplateResource(KeyValuePair
                 properties = new PolicyTemplateProperties()
                 {
                     // if policy is a url inline the url, if it is a local file inline the file contents
-                    contentFormat = isUrl ? "rawxml-link" : "rawxml",
-                    policyContent = isUrl ? policyPair.Value.policy : this.fileReader.RetrieveLocalFileContents(policyPair.Value.policy)
+                    format = isUrl ? "rawxml-link" : "rawxml",
+                    value = isUrl ? policyPair.Value.policy : this.fileReader.RetrieveLocalFileContents(policyPair.Value.policy)
                 },
                 dependsOn = dependsOn
             };
diff --git a/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs b/src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/ProductAPITemplateCreator.cs
@@ -13,7 +13,6 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc
                 name = $"[concat(parameters('ApimServiceName'), '/{productID}/{apiName}')]",
                 type = ResourceTypeConstants.ProductAPI,
                 apiVersion = GlobalConstants.APIVersion,
-                properties = new ProductAPITemplateProperties(),
                 dependsOn = dependsOn
             };
             return productAPITemplateResource;
diff --git a/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/LoggerExtractor.cs b/src/APIM_ARMTemplate/apimtemplate/Extractor/EntityExtractors/LoggerExtractor.cs
@@ -70,7 +70,7 @@ public async Task<Template> GenerateLoggerTemplate(string apimname, string resou
                     bool isReferencedInDiagnostic = false;
                     foreach (PolicyTemplateResource policyTemplateResource in policyResources)
                     {
-                        if (policyTemplateResource.properties.policyContent.Contains(loggerName))
+                        if (policyTemplateResource.properties.value.Contains(loggerName))
                         {
                             isReferencedInPolicy = true;
                         }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public void ShouldCreateAPIPolicyTemplateResourceFromCreatorConfigWithCorrectCon`
`26`	`26`
`27`	`27`	`// assert`
`28`	`28`	`Assert.Equal($"[concat(parameters('ApimServiceName'), '/{api.name}/policy')]", policyTemplateResource.name);`
`29`		`- Assert.Equal("rawxml-link", policyTemplateResource.properties.contentFormat);`
`30`		`- Assert.Equal(api.policy, policyTemplateResource.properties.policyContent);`
	`29`	`+ Assert.Equal("rawxml-link", policyTemplateResource.properties.format);`
	`30`	`+ Assert.Equal(api.policy, policyTemplateResource.properties.value);`
`31`	`31`	`Assert.Equal(dependsOn, policyTemplateResource.dependsOn);`
`32`	`32`	`}`
`33`	`33`
`@@ -45,8 +45,8 @@ public void ShouldCreateOperationPolicyTemplateResourceFromPairWithCorrectConten`
`45`	`45`
`46`	`46`	`// assert`
`47`	`47`	`Assert.Equal($"[concat(parameters('ApimServiceName'), '/{apiName}/{policyPair.Key}/policy')]", policyTemplateResource.name);`
`48`		`- Assert.Equal("rawxml-link", policyTemplateResource.properties.contentFormat);`
`49`		`- Assert.Equal(policyPair.Value.policy, policyTemplateResource.properties.policyContent);`
	`48`	`+ Assert.Equal("rawxml-link", policyTemplateResource.properties.format);`
	`49`	`+ Assert.Equal(policyPair.Value.policy, policyTemplateResource.properties.value);`
`50`	`50`	`Assert.Equal(dependsOn, policyTemplateResource.dependsOn);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public CreateCommand()`
`92`	`92`	`APITemplateResource apiResource = apiTemplate.resources.FirstOrDefault(resource => resource.type == ResourceTypeConstants.API) as APITemplateResource;`
`93`	`93`	`APIConfig providedAPIConfiguration = creatorConfig.apis.FirstOrDefault(api => apiResource.name.Contains(api.name));`
`94`	`94`	`// if the api version is not null the api is split into multiple templates. If the template is split and the content value has been set, then the template is for a subsequent api`
`95`		`- string apiFileName = fileNameGenerator.GenerateAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.contentValue == null);`
	`95`	`+ string apiFileName = fileNameGenerator.GenerateAPIFileName(providedAPIConfiguration.name, apiTemplateCreator.isSplitAPI(providedAPIConfiguration), apiResource.properties.value == null);`
`96`	`96`	`fileWriter.WriteJSONToFile(apiTemplate, String.Concat(creatorConfig.outputLocation, apiFileName));`
`97`	`97`	`}`
`98`	`98`	`if (apiVersionSetsTemplate != null)`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public class ServerX509Names`
`38`	`38`	`public string name { get; set; }`
`39`	`39`	`public string issuerCertificateThumbprint { get; set; }`
`40`	`40`	`}`
	`41`	`+`
`41`	`42`	`public class BackendCredentials`
`42`	`43`	`{`
`43`	`44`	`public string[] certificate { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,11 @@ public class IssueTemplateResource : APITemplateSubResource`
`9`	`9`
`10`	`10`	`public class IssueTemplateProperties`
`11`	`11`	`{`
	`12`	`+ public string state { get; set; }`
	`13`	`+ public string apiId { get; set; }`
`12`	`14`	`public string title { get; set; }`
`13`	`15`	`public string description { get; set; }`
`14`		`- public string createdDate { get; set; }`
`15`		`- public string state { get; set; }`
`16`	`16`	`public string userId { get; set; }`
`17`		`- public string apiId { get; set; }`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`public class IssueTemplateAttachment : IssueTemplateSubResource`
`@@ -37,7 +36,6 @@ public class IssueTemplateComment : IssueTemplateSubResource`
`37`	`36`	`public class IssueTemplateCommentProperties`
`38`	`37`	`{`
`39`	`38`	`public string text { get; set; }`
`40`		`- public string createdDate { get; set; }`
`41`	`39`	`public string userId { get; set; }`
`42`	`40`	`}`
`43`	`41`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class PolicyTemplateResource : APITemplateSubResource`
`9`	`9`
`10`	`10`	`public class PolicyTemplateProperties`
`11`	`11`	`{`
`12`		`- public string policyContent { get; set; }`
`13`		`- public string contentFormat { get; set; }`
	`12`	`+ public string value { get; set; }`
	`13`	`+ public string format { get; set; }`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`
`2`	`2`	`namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common`
`3`	`3`	`{`
`4`		`- public class ProductAPITemplateResource : TemplateResource {`
`5`		`- public ProductAPITemplateProperties properties { get; set; }`
`6`		`- }`
`7`		`-`
`8`		`- public class ProductAPITemplateProperties { }`
	`4`	`+ public class ProductAPITemplateResource : TemplateResource { }`
`9`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ public class ProductsTemplateResource : TemplateResource`
`8`	`8`
`9`	`9`	`public class ProductsTemplateProperties`
`10`	`10`	`{`
`11`		`- public string displayName { get; set; }`
`12`	`11`	`public string description { get; set; }`
`13`	`12`	`public string terms { get; set; }`
`14`	`13`	`public bool subscriptionRequired { get; set; }`
`15`	`14`	`public bool approvalRequired { get; set; }`
`16`	`15`	`public int subscriptionsLimit { get; set; }`
`17`	`16`	`public string state { get; set; }`
	`17`	`+ public string displayName { get; set; }`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ public class PropertyTemplateResource : TemplateResource`
`9`	`9`
`10`	`10`	`public class PropertyResourceProperties`
`11`	`11`	`{`
`12`		`- public string displayName { get; set; }`
`13`		`- public string value { get; set; }`
`14`	`12`	`public IList<string> tags { get; set; }`
`15`	`13`	`public bool secret { get; set; }`
	`14`	`+ public string displayName { get; set; }`
	`15`	`+ public string value { get; set; }`
`16`	`16`	`}`
`17`	`17`	`}`