update version set resource type

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate.test/Creator/TemplateCreatorTests/APITemplateCreatorTests.cs

@@ -50,7 +50,7 @@ public async void ShouldCreateInitialAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
-            Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
+            Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
             Assert.Equal(api.revision, apiTemplateResource.properties.apiRevision);
             Assert.Equal(api.revisionDescription, apiTemplateResource.properties.apiRevisionDescription);
             Assert.Equal(api.suffix, apiTemplateResource.properties.path);
@@ -126,7 +126,7 @@ public async void ShouldCreateUnifiedAPITemplateResourceFromCreatorConfig()
             Assert.Equal(api.name, apiTemplateResource.properties.displayName);
             Assert.Equal(api.apiVersion, apiTemplateResource.properties.apiVersion);
             Assert.Equal(api.apiVersionDescription, apiTemplateResource.properties.apiVersionDescription);
-            Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
+            Assert.Equal($"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]", apiTemplateResource.properties.apiVersionSetId);
             Assert.Equal(api.revision, apiTemplateResource.properties.apiRevision);
             Assert.Equal(api.revisionDescription, apiTemplateResource.properties.apiRevisionDescription);
             Assert.Equal(api.suffix, apiTemplateResource.properties.path);

src/APIM_ARMTemplate/apimtemplate/Common/Constants/ResourceTypeConstants.cs

@@ -4,7 +4,7 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
     internal static class ResourceTypeConstants
     {
         public const string API = "Microsoft.ApiManagement/service/apis";
-        public const string APIVersionSet = "Microsoft.ApiManagement/service/api-version-sets";
+        public const string APIVersionSet = "Microsoft.ApiManagement/service/apiVersionSets";
         public const string APIDiagnostic = "Microsoft.ApiManagement/service/apis/diagnostics";
         public const string APIOperation = "Microsoft.ApiManagement/service/apis/operations";
         public const string APIOperationPolicy = "Microsoft.ApiManagement/service/apis/operations/policies";

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/ProductAPITemplateResource.cs

@@ -1,5 +1,10 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
 {
-    public class ProductAPITemplateResource : TemplateResource { }
-}
+    public class ProductAPITemplateResource : TemplateResource
+    {
+        public ProductAPITemplateProperties properties { get; set; }
+    }
+
+    public class ProductAPITemplateProperties { }
+}

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/TagTemplateResource.cs

@@ -1,5 +1,10 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
 {
-    public class TagTemplateResource : TemplateResource { }
+    public class TagTemplateResource : TemplateResource
+    {
+        public TagTemplateProperties properties { get; set; }
+    }
+
+    public class TagTemplateProperties { }
 }

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

@@ -121,7 +121,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 if (api.apiVersionSetId != null)
                 {
                     // point to the supplied version set if the apiVersionSetId is provided
-                    apiTemplateResource.properties.apiVersionSetId = $"[resourceId('Microsoft.ApiManagement/service/api-version-sets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]";
+                    apiTemplateResource.properties.apiVersionSetId = $"[resourceId('Microsoft.ApiManagement/service/apiVersionSets', parameters('ApimServiceName'), '{api.apiVersionSetId}')]";
                 }
                 // set the authorization server id
                 if (api.authenticationSettings != null && api.authenticationSettings.oAuth2 != null && api.authenticationSettings.oAuth2.authorizationServerId != null

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

@@ -13,6 +13,7 @@ public ProductAPITemplateResource CreateProductAPITemplateResource(string produc
                 name = $"[concat(parameters('ApimServiceName'), '/{productID}/{apiName}')]",
                 type = ResourceTypeConstants.ProductAPI,
                 apiVersion = GlobalConstants.APIVersion,
+                properties = new ProductAPITemplateProperties(),
                 dependsOn = dependsOn
             };
             return productAPITemplateResource;