Merge pull request #48 from xpouyat/dev

Dev - version 1.4.0

MK.IO/Account/AccountOperations.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace MK.IO
+using MK.IO.Models;
+
+namespace MK.IO.Operations
 {
     /// <summary>
     /// REST Client for MKIO

MK.IO/Account/IAccountOperations.cs

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace MK.IO
+using MK.IO.Models;
+
+namespace MK.IO.Operations
 {
     public interface IAccountOperations
     {

MK.IO/Account/Models/AccountProfile.cs

@@ -4,7 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     public partial class AccountProfile
     {
@@ -56,7 +56,6 @@ public class Permissions
     }
 
 
-
     public class UserInfo
     {
         [JsonProperty("name")]

MK.IO/Account/Models/AccountStats.cs

@@ -3,9 +3,8 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
-
     public partial class AccountStats
     {
         public static AccountStats FromJson(string json)
@@ -44,7 +43,6 @@ public string ToJson()
         public StreamingPolicies StreamingPolicies { get; set; }
     }
 
-
     public class Assets
     {
         [JsonProperty("total")]

MK.IO/Account/Models/LocationListResponseSchema.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     public partial class LocationListResponseSchema
     {
@@ -17,7 +17,6 @@ public string ToJson()
             return JsonConvert.SerializeObject(this, ConverterLE.Settings);
         }
 
-
         [JsonProperty("kind")]
         public string Kind { get; set; }
 

MK.IO/Account/Models/LocationResponseSchema.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     public partial class LocationResponseSchema
     {
@@ -22,7 +22,6 @@ public string ToJson()
         public MetadataLocation Metadata { get; set; }
     }
 
-
     public class MetadataLocation
     {
         [JsonProperty("id")]

MK.IO/Account/Models/SubscriptionListResponseSchema.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     public partial class SubscriptionListResponseSchema
     {
@@ -17,7 +17,6 @@ public string ToJson()
             return JsonConvert.SerializeObject(this, ConverterLE.Settings);
         }
 
-
         [JsonProperty("kind")]
         public string Kind { get; set; }
 

MK.IO/Account/Models/SubscriptionResponseSchema.cs

@@ -3,9 +3,8 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
-
     public class SubscriptionResponseSchema
     {
         public static SubscriptionResponseSchema FromJson(string json)
@@ -31,7 +30,7 @@ public class MetadataSubscription
         public Guid Id { get; set; }
 
         [JsonProperty("created")]
-        public DateTime Created { get; set; }
+        public DateTime? Created { get; private set; }
 
         [JsonProperty("updated")]
         public DateTime Updated { get; set; }

MK.IO/Account/Models/SubscriptionSchema.cs

@@ -3,24 +3,24 @@
 
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     public class SubscriptionSchema
     {
         [JsonProperty("customerId")]
         public Guid CustomerId { get; set; }
 
         [JsonProperty("createdById")]
-        public Guid CreatedById { get; set; }
+        public Guid CreatedById { get; private set; }
 
         [JsonProperty("locationId")]
         public Guid LocationId { get; set; }
 
         [JsonProperty("azureSubscriptionName")]
-        public string AzureSubscriptionName { get; set; }
+        public string? AzureSubscriptionName { get; set; }
 
         [JsonProperty("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [JsonProperty("isActive")]
         public bool IsActive { get; set; }
@@ -32,15 +32,15 @@ public class SubscriptionSchema
         public Guid ProductPublicationId { get; set; }
 
         [JsonProperty("azureSubscriptionStatus")]
-        public string AzureSubscriptionStatus { get; set; }
+        public string? AzureSubscriptionStatus { get; set; }
 
         [JsonProperty("azureSubscriptionId")]
         public Guid AzureSubscriptionId { get; set; }
 
         [JsonProperty("azureSubscriptionOfferId")]
-        public string AzureSubscriptionOfferId { get; set; }
+        public string? AzureSubscriptionOfferId { get; set; }
 
         [JsonProperty("azureSubscriptionPlanId")]
-        public string AzureSubscriptionPlanId { get; set; }
+        public string? AzureSubscriptionPlanId { get; set; }
     }
 }

MK.IO/AccountFilter/AccountFiltersOperations.cs

@@ -1,10 +1,13 @@
-using MK.IO.Models;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using MK.IO.Models;
 using Newtonsoft.Json;
 #if NET462
 using System.Net.Http;
 #endif
 
-namespace MK.IO.Asset
+namespace MK.IO.Operations
 {
     internal class AccountFiltersOperations : IAccountFiltersOperations
     {
@@ -75,6 +78,8 @@ public async Task<AccountFilterSchema> CreateOrUpdateAsync(string accountFilterN
         {
             Argument.AssertNotNullOrEmpty(accountFilterName, nameof(accountFilterName));
             Argument.AssertNotContainsSpace(accountFilterName, nameof(accountFilterName));
+            Argument.AssertNotMoreThanLength(accountFilterName, nameof(accountFilterName), 260);
+            Argument.AssertRespectRegex(accountFilterName, nameof(accountFilterName), @"^[a-zA-Z0-9\-_.~]+$");
             Argument.AssertNotNull(properties, nameof(properties));
 
             var url = Client.GenerateApiUrl(_accountFilterApiUrl, accountFilterName);

MK.IO/AccountFilter/IAccountFiltersOperations.cs

@@ -1,6 +1,9 @@
-using MK.IO.Models;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
-namespace MK.IO.Asset
+using MK.IO.Models;
+
+namespace MK.IO.Operations
 {
     public interface IAccountFiltersOperations
     {

MK.IO/Argument.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System.Text.RegularExpressions;
+
 namespace MK.IO
 {
     internal class Argument
@@ -33,5 +35,22 @@ public static void AssertNotContainsSpace(string value, string name)
                 throw new ArgumentException("Value cannot contain space.", name);
             }
         }
+
+        public static void AssertNotMoreThanLength(string value, string name, int length)
+        {
+            if (value.Length > length)
+            {
+                throw new ArgumentException($"Value length cannot exceed {length}.", name);
+            }
+        }
+
+        public static void AssertRespectRegex(string value, string name, string regexPattern)
+        {
+            // check if value respects regex pattern
+            if (!Regex.IsMatch(value, regexPattern))
+            {
+                throw new ArgumentException($"Value does not respect regex pattern {regexPattern}.", name);
+            }
+        }
     }
 }

MK.IO/Asset/AssetsOperations.cs

@@ -1,11 +1,14 @@
-using MK.IO.Models;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using MK.IO.Models;
 using Newtonsoft.Json;
 using System.Net;
 #if NET462
 using System.Net.Http;
 #endif
 
-namespace MK.IO.Asset
+namespace MK.IO.Operations
 {
     internal class AssetsOperations : IAssetsOperations
     {
@@ -153,7 +156,10 @@ public async Task<AssetSchema> CreateOrUpdateAsync(string assetName, string cont
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
             Argument.AssertNotContainsSpace(assetName, nameof(assetName));
+            Argument.AssertNotMoreThanLength(assetName, nameof(assetName), 260);
             Argument.AssertNotNullOrEmpty(containerName, nameof(containerName));
+            Argument.AssertNotMoreThanLength(containerName, nameof(containerName), 63);
+            Argument.AssertRespectRegex(containerName, nameof(containerName), @"^(?=.{3,63}$)[a-z0-9]+(-[a-z0-9]+)*$");
             Argument.AssertNotNullOrEmpty(storageName, nameof(storageName));
 
             var url = Client.GenerateApiUrl(_assetApiUrl, assetName);

MK.IO/Asset/IAssetsOperations.cs

@@ -1,7 +1,9 @@
-using MK.IO.Models;
-using System.Net.NetworkInformation;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
-namespace MK.IO.Asset
+using MK.IO.Models;
+
+namespace MK.IO.Operations
 {
     public interface IAssetsOperations
     {

MK.IO/Asset/Models/AssetContainerDeletionPolicyType.cs

@@ -5,7 +5,7 @@
 using Newtonsoft.Json.Converters;
 using System.Runtime.Serialization;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     /// <summary>
     /// Deletion Policy type.

MK.IO/Asset/Models/AssetStreamingLocator.cs

@@ -23,7 +23,7 @@ public class AssetStreamingLocator
         public string? DefaultContentKeyPolicyName { get; set; }
 
         [JsonProperty("created")]
-        public DateTime? Created { get; set; }
+        public DateTime? Created { get; private set; }
 
         [JsonProperty("endTime")]
         public DateTime? EndTime { get; set; }

MK.IO/Asset/PagedResult.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace MK.IO.Asset
+namespace MK.IO.Operations
 {
     public class PagedResult<T>
     {

MK.IO/AssetFilter/AssetFiltersOperations.cs

@@ -1,10 +1,13 @@
-using MK.IO.Models;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using MK.IO.Models;
 using Newtonsoft.Json;
 #if NET462
 using System.Net.Http;
 #endif
 
-namespace MK.IO.Asset
+namespace MK.IO.Operations
 {
     internal class AssetFiltersOperations : IAssetFiltersOperations
     {
@@ -81,6 +84,8 @@ public async Task<AssetFilterSchema> CreateOrUpdateAsync(string assetName, strin
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
             Argument.AssertNotNullOrEmpty(filterName, nameof(filterName));
             Argument.AssertNotContainsSpace(filterName, nameof(filterName));
+            Argument.AssertNotMoreThanLength(filterName, nameof(filterName), 260);
+            Argument.AssertRespectRegex(filterName, nameof(filterName), @"^[a-zA-Z0-9\-_.~]+$");
             Argument.AssertNotNull(properties, nameof(properties));
 
             var url = Client.GenerateApiUrl(_assetFilterApiUrl, assetName, filterName);

MK.IO/AssetFilter/IAssetFiltersOperations.cs

@@ -1,6 +1,9 @@
-using MK.IO.Models;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
-namespace MK.IO.Asset
+using MK.IO.Models;
+
+namespace MK.IO.Operations
 {
     public interface IAssetFiltersOperations
     {

MK.IO/ContentKeyPolicy/ContentKeyPoliciesOperations.cs

@@ -7,7 +7,7 @@
 using MK.IO.Models;
 using Newtonsoft.Json;
 
-namespace MK.IO
+namespace MK.IO.Operations
 {
     /// <summary>
     /// REST Client for MKIO

MK.IO/ContentKeyPolicy/IContentKeyPoliciesOperations.cs

@@ -3,7 +3,7 @@
 
 using MK.IO.Models;
 
-namespace MK.IO
+namespace MK.IO.Operations
 {
     public interface IContentKeyPoliciesOperations
     {

MK.IO/ContentKeyPolicy/Models/AllowPassingVideoContentToUnknownOutput.cs

@@ -5,7 +5,7 @@
 using Newtonsoft.Json.Converters;
 using System.Runtime.Serialization;
 
-namespace MK.IO
+namespace MK.IO.Models
 {
     /// <summary>
     /// Configures Unknown output handling settings of the license.