Added optional Properties publicNetworkAccess and trustedServiceAcces… (

Azure#15112) * Added optional Properties publicNetworkAccess and trustedServiceAccessEnabled * lint fix
mkarmark · Jul 20, 2021 · 8c9397a · 8c9397a
1 parent 463e839
commit 8c9397a
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 0 deletions.
diff --git a/...ource-manager/Microsoft.EventHub/preview/2021-06-01-preview/networkrulessets-preview.json b/...ource-manager/Microsoft.EventHub/preview/2021-06-01-preview/networkrulessets-preview.json
@@ -206,6 +206,19 @@
                 "$ref": "#/definitions/NWRuleSetIpRules"
               },
               "description": "List of IpRules"
+            },
+            "publicNetworkAccess": {
+              "description": "This determines if traffic is allowed over public network. By default it is enabled.",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "PublicNetworkAccessFlag",
+                "modelAsString": true
+              },
+              "default": "Enabled"
             }
           }
         },

diff --git a/...vicebus/resource-manager/Microsoft.ServiceBus/preview/2021-06-01-preview/networksets.json b/...vicebus/resource-manager/Microsoft.ServiceBus/preview/2021-06-01-preview/networksets.json
@@ -226,6 +226,10 @@
           "description": "NetworkRuleSet properties",
           "x-ms-client-flatten": true,
           "properties": {
+            "trustedServiceAccessEnabled": {
+              "type": "boolean",
+              "description": "Value that indicates whether Trusted Service Access is Enabled or not."
+            },
             "defaultAction": {
               "type": "string",
               "description": "Default Action for Network Rule Set",
@@ -251,6 +255,19 @@
                 "$ref": "#/definitions/NWRuleSetIpRules"
               },
               "description": "List of IpRules"
+            },
+            "publicNetworkAccess": {
+              "description": "This determines if traffic is allowed over public network. By default it is enabled.",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "PublicNetworkAccessFlag",
+                "modelAsString": true
+              },
+              "default": "Enabled"
             }
           }
         },

diff --git a/...cebus/resource-manager/Microsoft.ServiceBus/preview/2021-06-01-preview/subscriptions.json b/...cebus/resource-manager/Microsoft.ServiceBus/preview/2021-06-01-preview/subscriptions.json
@@ -370,9 +370,35 @@
         "forwardDeadLetteredMessagesTo": {
           "type": "string",
           "description": "Queue/Topic name to forward the Dead Letter message"
+        },
+        "isClientAffine": {
+          "type": "boolean",
+          "description": "Value that indicates whether the subscription has an affinity to the client id."
+        },
+        "clientAffineProperties": {
+          "$ref": "#/definitions/SBClientAffineProperties",
+          "description": "Properties specific to client affine subscriptions."
         }
       },
       "description": "Description of Subscription Resource."
+    },
+    "SBClientAffineProperties": {
+      "type": "object",
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "Indicates the Client ID of the application that created the client-affine subscription."
+        },
+        "isDurable": {
+          "type": "boolean",
+          "description": "For client-affine subscriptions, this value indicates whether the subscription is durable or not."
+        },
+        "isShared": {
+          "type": "boolean",
+          "description": "For client-affine subscriptions, this value indicates whether the subscription is shared or not."
+        }
+      },
+      "description": "Properties specific to client affine subscriptions."
     }
   },
   "parameters": {}