Revert "[Storage] Add Queue Permissions enum to represent QueueAccess…

…Policy.Permissions (#45234)" (#46048) This reverts commit 24fe003.
Azure · Sep 19, 2024 · c7548c1 · c7548c1
1 parent f362309
commit c7548c1
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 206 deletions.
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
@@ -422,14 +422,6 @@ internal static class Queue
             public const string UriSubDomain = "queue";
 
             public const string QueueTraitsMetadata = "metadata";
-
-            internal static class Permissions
-            {
-                public const char Read = 'r';
-                public const char Add = 'a';
-                public const char Update = 'u';
-                public const char Process = 'p';
-            }
         }
 
         /// <summary>

diff --git a/sdk/storage/Azure.Storage.Queues/CHANGELOG.md b/sdk/storage/Azure.Storage.Queues/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features Added
 - Includes all features from 12.20.0-beta.1.
+- Removed Queue Permissions enum from 12.20.0-beta.1.
 
 ### Bugs Fixed
 - Fixed \[BUG\] Fixed Equality failures due to implicit cast on QueueErrorCode #44213

diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.net6.0.cs
@@ -186,21 +186,9 @@ public partial class QueueAccessPolicy
     {
         public QueueAccessPolicy() { }
         public System.DateTimeOffset? ExpiresOn { get { throw null; } set { } }
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public string Permissions { get { throw null; } set { } }
-        public Azure.Storage.Queues.Models.QueueAccessPolicyPermissions? QueueAccessPolicyPermissions { get { throw null; } set { } }
         public System.DateTimeOffset? StartsOn { get { throw null; } set { } }
     }
-    [System.FlagsAttribute]
-    public enum QueueAccessPolicyPermissions
-    {
-        All = -1,
-        None = 0,
-        Read = 1,
-        Add = 2,
-        Update = 4,
-        Process = 8,
-    }
     public partial class QueueAnalyticsLogging
     {
         public QueueAnalyticsLogging() { }

diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.0.cs
@@ -186,21 +186,9 @@ public partial class QueueAccessPolicy
     {
         public QueueAccessPolicy() { }
         public System.DateTimeOffset? ExpiresOn { get { throw null; } set { } }
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public string Permissions { get { throw null; } set { } }
-        public Azure.Storage.Queues.Models.QueueAccessPolicyPermissions? QueueAccessPolicyPermissions { get { throw null; } set { } }
         public System.DateTimeOffset? StartsOn { get { throw null; } set { } }
     }
-    [System.FlagsAttribute]
-    public enum QueueAccessPolicyPermissions
-    {
-        All = -1,
-        None = 0,
-        Read = 1,
-        Add = 2,
-        Update = 4,
-        Process = 8,
-    }
     public partial class QueueAnalyticsLogging
     {
         public QueueAnalyticsLogging() { }

diff --git a/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs b/sdk/storage/Azure.Storage.Queues/api/Azure.Storage.Queues.netstandard2.1.cs
@@ -186,21 +186,9 @@ public partial class QueueAccessPolicy
     {
         public QueueAccessPolicy() { }
         public System.DateTimeOffset? ExpiresOn { get { throw null; } set { } }
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public string Permissions { get { throw null; } set { } }
-        public Azure.Storage.Queues.Models.QueueAccessPolicyPermissions? QueueAccessPolicyPermissions { get { throw null; } set { } }
         public System.DateTimeOffset? StartsOn { get { throw null; } set { } }
     }
-    [System.FlagsAttribute]
-    public enum QueueAccessPolicyPermissions
-    {
-        All = -1,
-        None = 0,
-        Read = 1,
-        Add = 2,
-        Update = 4,
-        Process = 8,
-    }
     public partial class QueueAnalyticsLogging
     {
         public QueueAnalyticsLogging() { }

diff --git a/sdk/storage/Azure.Storage.Queues/assets.json b/sdk/storage/Azure.Storage.Queues/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.Queues",
-  "Tag": "net/storage/Azure.Storage.Queues_56ef546658"
+  "Tag": "net/storage/Azure.Storage.Queues_ef3164e0b2"
 }
diff --git a/sdk/storage/Azure.Storage.Queues/src/Models/QueueAccessPolicy.cs b/sdk/storage/Azure.Storage.Queues/src/Models/QueueAccessPolicy.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Azure.Core;
-using System.ComponentModel;
 
 namespace Azure.Storage.Queues.Models
 {
@@ -28,18 +27,7 @@ public partial class QueueAccessPolicy
         /// <summary>
         /// The permissions for the acl policy.
         /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
         [CodeGenMember("Permission")]
-        public string Permissions
-        {
-            get => QueueAccessPolicyPermissions.ToPermissionsString();
-            set => QueueAccessPolicyPermissions = value.ToPermissionsEnum();
-        }
-
-        /// <summary>
-        /// To get/set the permissions enum for the queue access policy.
-        /// </summary>
-        [CodeGenMember("QueueAccessPolicyPermission")]
-        public QueueAccessPolicyPermissions? QueueAccessPolicyPermissions { get; set; }
+        public string Permissions { get; set; }
     }
 }
diff --git a/sdk/storage/Azure.Storage.Queues/src/Models/QueueAccessPolicyPermissions.cs b/sdk/storage/Azure.Storage.Queues/src/Models/QueueAccessPolicyPermissions.cs
diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueClientTests.cs
@@ -17,8 +17,6 @@
 using Moq.Protected;
 using Azure.Core.TestFramework;
 using Azure.Identity;
-using NUnit.Framework.Internal;
-using BenchmarkDotNet.Disassemblers;
 
 namespace Azure.Storage.Queues.Test
 {
@@ -2008,43 +2006,5 @@ public void CanMockClientConstructors()
             mock = new Mock<QueueClient>(new Uri("https://test/test"), new AzureSasCredential("foo"), new QueueClientOptions()).Object;
             mock = new Mock<QueueClient>(new Uri("https://test/test"), mockTokenCredential, new QueueClientOptions()).Object;
         }
-
-        [RecordedTest]
-        [TestCase("", null)]
-        [TestCase("u", QueueAccessPolicyPermissions.Update)]
-        [TestCase("au", QueueAccessPolicyPermissions.Add | QueueAccessPolicyPermissions.Update)]
-        [TestCase("rap", QueueAccessPolicyPermissions.Read | QueueAccessPolicyPermissions.Add | QueueAccessPolicyPermissions.Process)]
-        [TestCase("raup", QueueAccessPolicyPermissions.All)]
-        public async Task QueueClientPolicyPermissions_CheckIfSetCorrectly(string expectedPermissionsStr, QueueAccessPolicyPermissions? expectedPermissionsEnum)
-        {
-            await using DisposingQueue test = await GetTestQueueAsync();
-
-            QueueSignedIdentifier[] signedIdentifiers = new[]
-            {
-                new QueueSignedIdentifier
-                {
-                    Id = GetNewString(),
-                    AccessPolicy =
-                        new QueueAccessPolicy
-                        {
-                            StartsOn =  Recording.UtcNow.AddHours(-1),
-                            ExpiresOn =  Recording.UtcNow.AddHours(1),
-                            Permissions = expectedPermissionsStr
-                        }
-                }
-            };
-            await test.Queue.SetAccessPolicyAsync(signedIdentifiers);
-
-            Response<IEnumerable<Models.QueueSignedIdentifier>> getResult = await test.Queue.GetAccessPolicyAsync();
-            Models.QueueSignedIdentifier acl = getResult.Value.First();
-
-            string actualPermissionsStr = acl.AccessPolicy.Permissions;
-            QueueAccessPolicyPermissions? actualPermissionsEnum = acl.AccessPolicy.QueueAccessPolicyPermissions;
-
-            if (string.IsNullOrEmpty(expectedPermissionsStr)) expectedPermissionsStr = null;
-
-            Assert.AreEqual(expectedPermissionsStr, actualPermissionsStr);
-            Assert.AreEqual(expectedPermissionsEnum.ToPermissionsString(), actualPermissionsEnum.ToPermissionsString());
-        }
     }
 }