[Microsoft.Storage] Adding support for ResourceAccessRules (Azure#10868)

* [Microsoft.Storage] Adding support for ResourceAccessRules [Microsoft.Storage] Adding support for ResourceAccessRules * PrettierCheck failure
nitegupt · Sep 25, 2020 · 5bc6aab · 5bc6aab
1 parent 5a06e34
commit 5bc6aab
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 2 deletions.
diff --git a/...er/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetProperties.json b/...er/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetProperties.json
@@ -25,7 +25,13 @@
             "bypass": "AzureServices",
             "defaultAction": "Allow",
             "ipRules": [],
-            "virtualNetworkRules": []
+            "virtualNetworkRules": [],
+            "resourceAccessRules": [
+              {
+                "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
+                "resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
+              }
+            ]
           },
           "primaryEndpoints": {
             "web": "https://sto8596.web.core.windows.net/",

diff --git a/...ft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetPropertiesCMKEnabled.json b/...ft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetPropertiesCMKEnabled.json
@@ -30,7 +30,8 @@
             "bypass": "AzureServices",
             "defaultAction": "Allow",
             "ipRules": [],
-            "virtualNetworkRules": []
+            "virtualNetworkRules": [],
+            "resourceAccessRules": []
           },
           "primaryEndpoints": {
             "web": "https://sto8596.web.core.windows.net/",

diff --git a/...rce-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountList.json b/...rce-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountList.json
@@ -129,6 +129,12 @@
               "isHnsEnabled": true,
               "creationTime": "2017-06-01T02:42:41.7633306Z",
               "networkAcls": {
+                "resourceAccessRules": [
+                  {
+                    "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
+                    "resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
+                  }
+                ],
                 "bypass": "AzureServices",
                 "defaultAction": "Allow",
                 "ipRules": [],

diff --git a/...e-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountUpdate.json b/...e-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountUpdate.json
@@ -10,6 +10,12 @@
         "allowBlobPublicAccess": false,
         "minimumTlsVersion": "TLS1_2",
         "networkAcls": {
+          "resourceAccessRules": [
+            {
+              "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
+              "resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
+            }
+          ],
           "defaultAction": "Allow"
         },
         "routingPreference": {
@@ -46,6 +52,12 @@
           "minimumTlsVersion": "TLS1_2",
           "creationTime": "2017-06-01T02:42:41.7633306Z",
           "networkAcls": {
+            "resourceAccessRules": [
+              {
+                "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
+                "resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
+              }
+            ],
             "bypass": "AzureServices",
             "defaultAction": "Allow",
             "ipRules": [],

diff --git a/...cation/storage/resource-manager/Microsoft.Storage/preview/2020-08-01-preview/storage.json b/...cation/storage/resource-manager/Microsoft.Storage/preview/2020-08-01-preview/storage.json
@@ -1979,6 +1979,19 @@
       ],
       "description": "The encryption settings on the storage account."
     },
+    "ResourceAccessRule": {
+      "properties": {
+        "tenantId": {
+          "type": "string",
+          "description": "Tenant Id"
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "Resource Id"
+        }
+      },
+      "description": "Resource Access Rule."
+    },
     "VirtualNetworkRule": {
       "properties": {
         "id": {
@@ -2062,6 +2075,13 @@
           "default": "AzureServices",
           "description": "Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Possible values are any combination of Logging|Metrics|AzureServices (For example, \"Logging, Metrics\"), or None to bypass none of those traffics."
         },
+        "resourceAccessRules": {
+          "type": "array",
+          "items": {
+            "description": "Resource Access Rules.",
+            "$ref": "#/definitions/ResourceAccessRule"
+          }
+        },
         "virtualNetworkRules": {
           "type": "array",
           "items": {