mgmt servicebus, support chained declaration of authorizationrule's listen/send/manage (#45772)

* code

* recording

* format

Author: XiaofeiCao

sdk/resourcemanager/azure-resourcemanager-servicebus/CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Features Added
 
+- Supported disabling SAS authentication for `ServiceBusNamespace`.
+- Supported chained declaration of `withListeningEnabled`, `withSendingEnabled` and `withManagingEnabled` during creation of `NamespaceAuthorizationRule`, `QueueAuthorizationRule` and `TopicAuthorizationRule`.
+
 ### Breaking Changes
 
 ### Bugs Fixed

sdk/resourcemanager/azure-resourcemanager-servicebus/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager-servicebus",
-  "Tag": "java/resourcemanager/azure-resourcemanager-servicebus_da8c52136e"
+  "Tag": "java/resourcemanager/azure-resourcemanager-servicebus_e9f2926d84"
 }

sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/implementation/ServiceBusNamespaceImpl.java

@@ -5,6 +5,7 @@
 
 import com.azure.resourcemanager.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
 import com.azure.resourcemanager.resources.fluentcore.model.Creatable;
+import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
 import com.azure.resourcemanager.servicebus.ServiceBusManager;
 import com.azure.resourcemanager.servicebus.fluent.models.SBNamespaceInner;
 import com.azure.resourcemanager.servicebus.models.NamespaceAuthorizationRule;
@@ -78,6 +79,11 @@ public NamespaceAuthorizationRulesImpl authorizationRules() {
         return new NamespaceAuthorizationRulesImpl(this.resourceGroupName(), this.name(), this.region(), manager());
     }
 
+    @Override
+    public boolean localAuthDisabled() {
+        return ResourceManagerUtils.toPrimitiveBoolean(this.innerModel().disableLocalAuth());
+    }
+
     @Override
     public ServiceBusNamespaceImpl withSku(NamespaceSku namespaceSku) {
         this.innerModel()
@@ -161,6 +167,12 @@ public Mono<ServiceBusNamespace> createResourceAsync() {
             .then(Mono.just(self));
     }
 
+    @Override
+    public ServiceBusNamespaceImpl disableLocalAuth() {
+        this.innerModel().withDisableLocalAuth(true);
+        return this;
+    }
+
     private void initChildrenOperationsCache() {
         this.queuesToCreate = new ArrayList<>();
         this.topicsToCreate = new ArrayList<>();

sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/models/NamespaceAuthorizationRule.java

@@ -36,7 +36,8 @@ interface Blank extends AuthorizationRule.DefinitionStages.WithListenOrSendOrMan
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<NamespaceAuthorizationRule> {
+        interface WithCreate extends AuthorizationRule.DefinitionStages.WithListenOrSendOrManage<WithCreate>,
+            Creatable<NamespaceAuthorizationRule> {
         }
     }
 

sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/models/QueueAuthorizationRule.java

@@ -44,7 +44,8 @@ interface Blank extends
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<QueueAuthorizationRule> {
+        interface WithCreate extends Creatable<QueueAuthorizationRule>,
+            AuthorizationRule.DefinitionStages.WithListenOrSendOrManage<QueueAuthorizationRule.DefinitionStages.WithCreate> {
         }
     }
 

sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/models/ServiceBusNamespace.java

@@ -77,6 +77,15 @@ public interface ServiceBusNamespace extends GroupableResource<ServiceBusManager
      */
     NamespaceAuthorizationRules authorizationRules();
 
+    /**
+     * Checks whether local auth is disabled.
+     *
+     * @return whether local auth is disabled
+     */
+    default boolean localAuthDisabled() {
+        throw new UnsupportedOperationException("[localAuthDisabled] is not supported in " + getClass());
+    }
+
     /**
      * The entirety of the Service Bus namespace definition.
      */
@@ -171,14 +180,29 @@ interface WithAuthorizationRule {
             WithCreate withNewManageRule(String name);
         }
 
+        /**
+         * The stage of Service Bus namespace definition allowing to disable local auth.
+         */
+        interface WithLocalAuth {
+            /**
+             * Disables SAS authentication for the Service Bus namespace.
+             *
+             * @return next stage of the Service Bus namespace definition
+             */
+            default WithCreate disableLocalAuth() {
+                throw new UnsupportedOperationException("[disableLocalAuth] is not supported in " + getClass());
+            }
+        }
+
         /**
          * The stage of the definition which contains all the minimum required inputs for
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
         interface WithCreate extends Creatable<ServiceBusNamespace>, Resource.DefinitionWithTags<WithCreate>,
             ServiceBusNamespace.DefinitionStages.WithSku, ServiceBusNamespace.DefinitionStages.WithQueue,
-            ServiceBusNamespace.DefinitionStages.WithTopic, ServiceBusNamespace.DefinitionStages.WithAuthorizationRule {
+            ServiceBusNamespace.DefinitionStages.WithTopic, ServiceBusNamespace.DefinitionStages.WithAuthorizationRule,
+            ServiceBusNamespace.DefinitionStages.WithLocalAuth {
         }
     }
 
@@ -187,7 +211,8 @@ interface WithCreate extends Creatable<ServiceBusNamespace>, Resource.Definition
      */
     interface Update extends Appliable<ServiceBusNamespace>, Resource.UpdateWithTags<Update>,
         ServiceBusNamespace.UpdateStages.WithSku, ServiceBusNamespace.UpdateStages.WithQueue,
-        ServiceBusNamespace.UpdateStages.WithTopic, ServiceBusNamespace.UpdateStages.WithAuthorizationRule {
+        ServiceBusNamespace.UpdateStages.WithTopic, ServiceBusNamespace.UpdateStages.WithAuthorizationRule,
+        ServiceBusNamespace.UpdateStages.WithLocalAuth {
     }
 
     /**
@@ -288,6 +313,20 @@ interface WithAuthorizationRule {
              */
             Update withoutAuthorizationRule(String name);
         }
+
+        /**
+         * The stage of Service Bus namespace update allowing to disable local auth.
+         */
+        interface WithLocalAuth {
+            /**
+             * Disables SAS authentication for the Service Bus namespace.
+             *
+             * @return next stage of the Service Bus namespace update
+             */
+            default Update disableLocalAuth() {
+                throw new UnsupportedOperationException("[disableLocalAuth] is not supported in " + getClass());
+            }
+        }
     }
 
 }

sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/models/TopicAuthorizationRule.java

@@ -44,7 +44,8 @@ interface Blank extends
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<TopicAuthorizationRule> {
+        interface WithCreate extends Creatable<TopicAuthorizationRule>,
+            AuthorizationRule.DefinitionStages.WithListenOrSendOrManage<TopicAuthorizationRule.DefinitionStages.WithCreate> {
         }
     }
 

sdk/resourcemanager/azure-resourcemanager-servicebus/src/test/java/com/azure/resourcemanager/servicebus/ServiceBusOperationsTests.java

@@ -356,7 +356,10 @@ public void canOperateOnAuthorizationRules() {
             .withNewQueue(queueName, 1024)
             .withNewTopic(topicName, 1024)
             .withNewManageRule(nsRuleName)
+            .disableLocalAuth()
             .create();
+
+        Assertions.assertTrue(namespace.localAuthDisabled());
         // Lookup ns authorization rule
         //
         PagedIterable<NamespaceAuthorizationRule> rulesInNamespace = namespace.authorizationRules().list();
@@ -383,6 +386,12 @@ public void canOperateOnAuthorizationRules() {
         if (!isPlaybackMode()) {
             Assertions.assertNotEquals(nsRuleKeys.primaryKey(), primaryKey);
         }
+
+        NamespaceAuthorizationRule nsRule2
+            = namespace.authorizationRules().define("rule2").withListeningEnabled().withSendingEnabled().create();
+        Assertions.assertNotNull(nsRule2.rights());
+        Assertions.assertTrue(nsRule2.rights().contains(AccessRights.LISTEN));
+        Assertions.assertTrue(nsRule2.rights().contains(AccessRights.SEND));
         // Lookup queue & operate on auth rules
         //
         PagedIterable<Queue> queuesInNamespace = namespace.queues().list();
@@ -392,11 +401,13 @@ public void canOperateOnAuthorizationRules() {
         Assertions.assertNotNull(queue);
         Assertions.assertNotNull(queue.innerModel());
 
-        QueueAuthorizationRule qRule = queue.authorizationRules().define("rule1").withListeningEnabled().create();
+        QueueAuthorizationRule qRule
+            = queue.authorizationRules().define("rule1").withListeningEnabled().withSendingEnabled().create();
         Assertions.assertNotNull(qRule);
-        Assertions.assertNotNull(qRule.rights().contains(AccessRights.LISTEN));
+        Assertions.assertTrue(qRule.rights().contains(AccessRights.LISTEN));
+        Assertions.assertTrue(qRule.rights().contains(AccessRights.SEND));
         qRule = qRule.update().withManagementEnabled().apply();
-        Assertions.assertNotNull(qRule.rights().contains(AccessRights.MANAGE));
+        Assertions.assertTrue(qRule.rights().contains(AccessRights.MANAGE));
         PagedIterable<QueueAuthorizationRule> rulesInQueue = queue.authorizationRules().list();
         Assertions.assertTrue(TestUtilities.getSize(rulesInQueue) > 0);
         boolean foundQRule = false;
@@ -416,11 +427,13 @@ public void canOperateOnAuthorizationRules() {
         Topic topic = topicsInNamespace.iterator().next();
         Assertions.assertNotNull(topic);
         Assertions.assertNotNull(topic.innerModel());
-        TopicAuthorizationRule tRule = topic.authorizationRules().define("rule2").withSendingEnabled().create();
+        TopicAuthorizationRule tRule
+            = topic.authorizationRules().define("rule2").withListeningEnabled().withSendingEnabled().create();
         Assertions.assertNotNull(tRule);
-        Assertions.assertNotNull(tRule.rights().contains(AccessRights.SEND));
+        Assertions.assertTrue(tRule.rights().contains(AccessRights.LISTEN));
+        Assertions.assertTrue(tRule.rights().contains(AccessRights.SEND));
         tRule = tRule.update().withManagementEnabled().apply();
-        Assertions.assertNotNull(tRule.rights().contains(AccessRights.MANAGE));
+        Assertions.assertTrue(tRule.rights().contains(AccessRights.MANAGE));
         PagedIterable<TopicAuthorizationRule> rulesInTopic = topic.authorizationRules().list();
         Assertions.assertTrue(TestUtilities.getSize(rulesInTopic) > 0);
         boolean foundTRule = false;