[Storage] Rename IPRange to SasIPRange

sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs

@@ -66,7 +66,7 @@ public struct BlobSasBuilder : IEquatable<BlobSasBuilder>
         /// When specifying a range of IP addresses, note that the range is
         /// inclusive.
         /// </summary>
-        public IPRange IPRange { get; set; }
+        public SasIPRange IPRange { get; set; }
 
         /// <summary>
         /// An optional unique value up to 64 characters in length that

sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasQueryParameters.cs

@@ -68,7 +68,7 @@ internal BlobSasQueryParameters(
             SasProtocol protocol,
             DateTimeOffset startsOn,
             DateTimeOffset expiresOn,
-            IPRange ipRange,
+            SasIPRange ipRange,
             string identifier,
             string resource,
             string permissions,

sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs

@@ -254,7 +254,7 @@ public SasQueryParameters GetNewAccountSasCredentials(StorageSharedKeyCredential
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials);
 
         public BlobSasQueryParameters GetNewBlobServiceSasCredentialsContainer(string containerName, StorageSharedKeyCredential sharedKeyCredentials = default)
@@ -265,7 +265,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsContainer(string co
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials());
 
         public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsContainer(string containerName, UserDelegationKey userDelegationKey, string accountName)
@@ -276,7 +276,7 @@ public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsContainer(s
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(userDelegationKey, accountName);
 
         public BlobSasQueryParameters GetNewBlobServiceSasCredentialsBlob(string containerName, string blobName, StorageSharedKeyCredential sharedKeyCredentials = default)
@@ -288,7 +288,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsBlob(string contain
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new BlobSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials());
 
         public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsBlob(string containerName, string blobName, UserDelegationKey userDelegationKey, string accountName)
@@ -300,7 +300,7 @@ public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsBlob(string
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new BlobSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(userDelegationKey, accountName);
 
         public BlobSasQueryParameters GetNewBlobServiceSasCredentialsSnapshot(string containerName, string blobName, string snapshot, StorageSharedKeyCredential sharedKeyCredentials = default)
@@ -313,7 +313,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsSnapshot(string con
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new SnapshotSasPermissions { Read = true, Write = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials());
 
         public async Task<PageBlobClient> CreatePageBlobClientAsync(BlobContainerClient container, long size)

sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs

@@ -171,7 +171,7 @@ public void BlobUriBuilder_RegularUrl_SasTest()
 
             Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), blobUriBuilder.Sas.ExpiresOn);
             Assert.AreEqual("", blobUriBuilder.Sas.Identifier);
-            Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange);
+            Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange);
             Assert.AreEqual("rw", blobUriBuilder.Sas.Permissions);
             Assert.AreEqual(SasProtocol.Https, blobUriBuilder.Sas.Protocol);
             Assert.AreEqual("b", blobUriBuilder.Sas.Resource);
@@ -332,7 +332,7 @@ public void BlobUriBuilder_IPStyleUrl_SasTest()
 
             Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), blobUriBuilder.Sas.ExpiresOn);
             Assert.AreEqual("", blobUriBuilder.Sas.Identifier);
-            Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange);
+            Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange);
             Assert.AreEqual("rw", blobUriBuilder.Sas.Permissions);
             Assert.AreEqual(SasProtocol.Https, blobUriBuilder.Sas.Protocol);
             Assert.AreEqual("b", blobUriBuilder.Sas.Resource);

sdk/storage/Azure.Storage.Blobs/tests/SasQueryParametersTests.cs

@@ -25,7 +25,7 @@ public void SasQueryParameters_RoundTrip()
             SasProtocol protocol = SasProtocol.Https;
             DateTimeOffset startTime = DateTimeOffset.Now;
             DateTimeOffset expiryTime = startTime.AddDays(1);
-            var ipRange = new IPRange();
+            var ipRange = new SasIPRange();
             var identifier = "foo";
             var resource = "bar";
             var permissions = "rw";

sdk/storage/Azure.Storage.Common/src/Sas/AccountSasBuilder.cs

@@ -61,7 +61,7 @@ public struct AccountSasBuilder : IEquatable<AccountSasBuilder>
         /// When specifying a range of IP addresses, note that the range is
         /// inclusive.
         /// </summary>
-        public IPRange IPRange { get; set; }
+        public SasIPRange IPRange { get; set; }
 
         /// <summary>
         /// The services associated with the shared access signature. The

sdk/storage/Azure.Storage.Common/src/Sas/IPRange.cs → sdk/storage/Azure.Storage.Common/src/Sas/SasIPRange.cs

@@ -11,7 +11,7 @@ namespace Azure.Storage.Sas
     /// Represents a range of allowed IP addresses for constructing a Shared
     /// Access Signature.
     /// </summary>
-    public readonly struct IPRange : IEquatable<IPRange>
+    public readonly struct SasIPRange : IEquatable<SasIPRange>
     {
         /// <summary>
         /// Gets the start of the IP range.  Not specified if equal to null or
@@ -26,15 +26,15 @@ namespace Azure.Storage.Sas
         public IPAddress End { get; }
 
         /// <summary>
-        /// Creates a new <see cref="IPRange"/>.
+        /// Creates a new <see cref="SasIPRange"/>.
         /// </summary>
         /// <param name="start">
         /// The range's start <see cref="IPAddress"/>.
         /// </param>
         /// <param name="end">
         /// The range's optional end <see cref="IPAddress"/>.
         /// </param>
-        public IPRange(IPAddress start, IPAddress end = null)
+        public SasIPRange(IPAddress start, IPAddress end = null)
         {
             Start = start ?? IPAddress.None;
             End = end ?? IPAddress.None;
@@ -49,72 +49,72 @@ private static bool IsEmpty(IPAddress address) =>
             address == null || address == IPAddress.None;
 
         /// <summary>
-        /// Creates a string representation of an <see cref="IPRange"/>.
+        /// Creates a string representation of an <see cref="SasIPRange"/>.
         /// </summary>
         /// <returns>
-        /// A string representation of an <see cref="IPRange"/>.
+        /// A string representation of an <see cref="SasIPRange"/>.
         /// </returns>
         public override string ToString() =>
             IsEmpty(Start) ? string.Empty :
             IsEmpty(End) ? Start.ToString() :
             Start.ToString() + "-" + End.ToString();
 
         /// <summary>
-        /// Parse an IP range string into a new <see cref="IPRange"/>.
+        /// Parse an IP range string into a new <see cref="SasIPRange"/>.
         /// </summary>
         /// <param name="s">IP range string to parse.</param>
-        /// <returns>The parsed <see cref="IPRange"/>.</returns>
-        public static IPRange Parse(string s)
+        /// <returns>The parsed <see cref="SasIPRange"/>.</returns>
+        public static SasIPRange Parse(string s)
         {
             var dashIndex = s.IndexOf('-');
             return dashIndex == -1 ?
-                new IPRange(IPAddress.Parse(s)) :
-                new IPRange(
+                new SasIPRange(IPAddress.Parse(s)) :
+                new SasIPRange(
                     IPAddress.Parse(s.Substring(0, dashIndex)),
                     IPAddress.Parse(s.Substring(dashIndex + 1)));
         }
 
         /// <summary>
-        /// Check if two <see cref="IPRange"/> instances are equal.
+        /// Check if two <see cref="SasIPRange"/> instances are equal.
         /// </summary>
         /// <param name="obj">The instance to compare to.</param>
         /// <returns>True if they're equal, false otherwise.</returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) =>
-            obj is IPRange other && Equals(other);
+            obj is SasIPRange other && Equals(other);
 
         /// <summary>
-        /// Get a hash code for the <see cref="IPRange"/>.
+        /// Get a hash code for the <see cref="SasIPRange"/>.
         /// </summary>
-        /// <returns>Hash code for the <see cref="IPRange"/>.</returns>
+        /// <returns>Hash code for the <see cref="SasIPRange"/>.</returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() =>
             (Start?.GetHashCode() ?? 0) ^ (End?.GetHashCode() ?? 0);
 
         /// <summary>
-        /// Check if two <see cref="IPRange"/> instances are equal.
+        /// Check if two <see cref="SasIPRange"/> instances are equal.
         /// </summary>
         /// <param name="left">The first instance to compare.</param>
         /// <param name="right">The second instance to compare.</param>
         /// <returns>True if they're equal, false otherwise.</returns>
-        public static bool operator ==(IPRange left, IPRange right) =>
+        public static bool operator ==(SasIPRange left, SasIPRange right) =>
             left.Equals(right);
 
         /// <summary>
-        /// Check if two <see cref="IPRange"/> instances are not equal.
+        /// Check if two <see cref="SasIPRange"/> instances are not equal.
         /// </summary>
         /// <param name="left">The first instance to compare.</param>
         /// <param name="right">The second instance to compare.</param>
         /// <returns>True if they're not equal, false otherwise.</returns>
-        public static bool operator !=(IPRange left, IPRange right) =>
+        public static bool operator !=(SasIPRange left, SasIPRange right) =>
             !(left == right);
 
         /// <summary>
-        /// Check if two <see cref="IPRange"/> instances are equal.
+        /// Check if two <see cref="SasIPRange"/> instances are equal.
         /// </summary>
         /// <param name="other">The instance to compare to.</param>
         /// <returns>True if they're equal, false otherwise.</returns>
-        public bool Equals(IPRange other) =>
+        public bool Equals(SasIPRange other) =>
             ((IsEmpty(Start) && IsEmpty(other.Start)) ||
              (Start != null && Start.Equals(other.Start))) &&
             ((IsEmpty(End) && IsEmpty(other.End)) ||

sdk/storage/Azure.Storage.Common/src/Sas/SasQueryParameters.cs

@@ -56,7 +56,7 @@ internal static string FormatTimesForSasSigning(DateTimeOffset time) =>
         private readonly DateTimeOffset _expiryTime;
 
         // sip
-        private readonly IPRange _ipRange;
+        private readonly SasIPRange _ipRange;
 
         // si
         private readonly string _identifier;
@@ -128,7 +128,7 @@ internal static string FormatTimesForSasSigning(DateTimeOffset time) =>
         /// to accept requests.  When specifying a range, note that the range
         /// is inclusive.
         /// </summary>
-        public IPRange IPRange => _ipRange;
+        public SasIPRange IPRange => _ipRange;
 
         /// <summary>
         /// Gets the optional unique value up to 64 characters in length that
@@ -228,7 +228,7 @@ internal SasQueryParameters(
             SasProtocol protocol,
             DateTimeOffset startsOn,
             DateTimeOffset expiresOn,
-            IPRange ipRange,
+            SasIPRange ipRange,
             string identifier,
             string resource,
             string permissions,
@@ -312,7 +312,7 @@ internal SasQueryParameters(
                         _expiryTime = DateTimeOffset.ParseExact(kv.Value, Constants.SasTimeFormat, CultureInfo.InvariantCulture);
                         break;
                     case Constants.Sas.Parameters.IPRangeUpper:
-                        _ipRange = IPRange.Parse(kv.Value);
+                        _ipRange = SasIPRange.Parse(kv.Value);
                         break;
                     case Constants.Sas.Parameters.IdentifierUpper:
                         _identifier = kv.Value;

sdk/storage/Azure.Storage.Common/tests/Shared/Constants.cs

@@ -49,7 +49,7 @@ internal class SasConstants
             public DateTimeOffset ExpiryTime { get; protected internal set; }
             public IPAddress StartAddress { get; protected internal set; }
             public IPAddress EndAddress { get; protected internal set; }
-            public IPRange IPRange { get; protected internal set; }
+            public SasIPRange IPRange { get; protected internal set; }
             public DateTimeOffset KeyStart { get; protected internal set; }
             public DateTimeOffset KeyExpiry { get; protected internal set; }
             public StorageSharedKeyCredential SharedKeyCredential { get; protected internal set; }
@@ -82,7 +82,7 @@ public Constants(StorageTestBase test)
                 KeyStart = test.GetUtcNow().AddHours(-1),
                 KeyExpiry = test.GetUtcNow().AddHours(+1)
             };
-            Sas.IPRange = new IPRange(Sas.StartAddress, Sas.EndAddress);
+            Sas.IPRange = new SasIPRange(Sas.StartAddress, Sas.EndAddress);
             Sas.SharedKeyCredential = new StorageSharedKeyCredential(Sas.Account, Sas.AccountKey);
         }
     }

sdk/storage/Azure.Storage.Files/src/Sas/FileSasBuilder.cs

@@ -61,7 +61,7 @@ public struct FileSasBuilder : IEquatable<FileSasBuilder>
         /// When specifying a range of IP addresses, note that the range is
         /// inclusive.
         /// </summary>
-        public IPRange IPRange { get; set; }
+        public SasIPRange IPRange { get; set; }
 
         /// <summary>
         /// An optional unique value up to 64 characters in length that

sdk/storage/Azure.Storage.Files/tests/FileTestBase.cs

@@ -131,7 +131,7 @@ public SasQueryParameters GetNewAccountSasCredentials(StorageSharedKeyCredential
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new FileAccountSasPermissions { Create = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials);
 
         public SasQueryParameters GetNewFileServiceSasCredentialsShare(string shareName, StorageSharedKeyCredential sharedKeyCredentials = default)
@@ -142,7 +142,7 @@ public SasQueryParameters GetNewFileServiceSasCredentialsShare(string shareName,
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new ShareSasPermissions { Read = true, Write = true, List = true, Create = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials());
 
         public SasQueryParameters GetNewFileServiceSasCredentialsFile(string shareName, string filePath, StorageSharedKeyCredential sharedKeyCredentials = default)
@@ -154,7 +154,7 @@ public SasQueryParameters GetNewFileServiceSasCredentialsFile(string shareName,
                 StartsOn = Recording.UtcNow.AddHours(-1),
                 ExpiresOn = Recording.UtcNow.AddHours(+1),
                 Permissions = new FileSasPermissions { Read = true, Write = true, Create = true, Delete = true }.ToString(),
-                IPRange = new IPRange(IPAddress.None, IPAddress.None)
+                IPRange = new SasIPRange(IPAddress.None, IPAddress.None)
             }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials());
 
         public SignedIdentifier[] BuildSignedIdentifiers() =>

sdk/storage/Azure.Storage.Files/tests/FileUriBuilderTests.cs

@@ -160,7 +160,7 @@ public void FileUriBuilder_SasTest()
 
             Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), fileUriBuilder.Sas.ExpiresOn);
             Assert.AreEqual("", fileUriBuilder.Sas.Identifier);
-            Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), fileUriBuilder.Sas.IPRange);
+            Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), fileUriBuilder.Sas.IPRange);
             Assert.AreEqual("rw", fileUriBuilder.Sas.Permissions);
             Assert.AreEqual(SasProtocol.Https, fileUriBuilder.Sas.Protocol);
             Assert.AreEqual("b", fileUriBuilder.Sas.Resource);

sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs

@@ -62,7 +62,7 @@ public struct QueueSasBuilder : IEquatable<QueueSasBuilder>
         /// When specifying a range of IP addresses, note that the range is
         /// inclusive.
         /// </summary>
-        public IPRange IPRange { get; set; }
+        public SasIPRange IPRange { get; set; }
 
         /// <summary>
         /// An optional unique value up to 64 characters in length that