From d1f4d6fcf1bbb2e71a32bb2079de12f17fedf56a Mon Sep 17 00:00:00 2001 From: jmegha123 <144662309+jmegha123@users.noreply.github.com> Date: Thu, 9 May 2024 08:34:52 +0530 Subject: [PATCH] revert changes for user mi (#28839) --- custom-words.txt | 1 - .../NetworkWatcherFlowLogConfigure.json | 24 ------------------- .../examples/NetworkWatcherFlowLogCreate.json | 24 ------------------- .../examples/NetworkWatcherFlowLogGet.json | 11 +-------- .../examples/NetworkWatcherFlowLogList.json | 22 ++--------------- .../NetworkWatcherFlowLogStatusQuery.json | 18 -------------- .../NetworkWatcherFlowLogUpdateTags.json | 11 +-------- .../stable/2023-11-01/networkWatcher.json | 8 ------- 8 files changed, 4 insertions(+), 115 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index d7857d83c0cc..30b747c50c4e 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1046,7 +1046,6 @@ fiveqi flexera flink flowlet -flowlog fluentd forceclosehandles forceencryption diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogConfigure.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogConfigure.json index bcf8273c4dc2..0595cbb99a67 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogConfigure.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogConfigure.json @@ -9,12 +9,6 @@ "properties": { "storageId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", "enabled": true - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {} - } } } }, @@ -25,15 +19,6 @@ "properties": { "storageId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", "enabled": true - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } } } }, @@ -46,15 +31,6 @@ "properties": { "storageId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", "enabled": true - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogCreate.json index aae326485fb0..4fdba8aa3bd3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogCreate.json @@ -15,12 +15,6 @@ "type": "JSON", "version": 1 } - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {} - } } } }, @@ -47,15 +41,6 @@ } }, "type": "Microsoft.Network/networkWatchers/FlowLogs", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - }, "location": "centraluseuap" } }, @@ -81,15 +66,6 @@ } }, "type": "Microsoft.Network/networkWatchers/FlowLogs", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - }, "location": "centraluseuap" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogGet.json index 5bddee8b4d62..cac8309d825e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogGet.json @@ -36,16 +36,7 @@ } }, "location": "centraluseuap", - "type": "Microsoft.Network/networkWatchers/FlowLogs", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - } + "type": "Microsoft.Network/networkWatchers/FlowLogs" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogList.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogList.json index 305a9fa404e1..0f94167d3b6e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogList.json @@ -37,16 +37,7 @@ } }, "location": "centraluseuap", - "type": "Microsoft.Network/networkWatchers/FlowLogs", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - } + "type": "Microsoft.Network/networkWatchers/FlowLogs" }, { "name": "flowLog2", @@ -69,16 +60,7 @@ } }, "type": "Microsoft.Network/networkWatchers/FlowLogs", - "location": "centraluseuap", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - } + "location": "centraluseuap" } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogStatusQuery.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogStatusQuery.json index 4b8e2d571b7a..1f25c541d745 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogStatusQuery.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogStatusQuery.json @@ -15,15 +15,6 @@ "properties": { "storageId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", "enabled": true - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } } } }, @@ -36,15 +27,6 @@ "properties": { "storageId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/st1", "enabled": true - }, - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogUpdateTags.json index d39514d2e08f..b61735f4bde0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogUpdateTags.json @@ -39,16 +39,7 @@ "tag2": "value2" }, "type": "Microsoft.Network/networkWatchers/FlowLogs", - "location": "centralus", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "c16d15e1-f60a-40e4-8a05-df3d3f655c14", - "principalId": "e3858881-e40c-43bd-9cde-88da39c05023" - } - } - } + "location": "centralus" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/networkWatcher.json index eabf3f2eb9c8..6ec21b03d05e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2023-11-01/networkWatcher.json @@ -3159,10 +3159,6 @@ "readOnly": true, "type": "string", "description": "A unique read-only string that changes whenever the resource is updated." - }, - "identity": { - "description": "FlowLog resource Managed Identity", - "$ref": "./network.json#/definitions/ManagedServiceIdentity" } }, "allOf": [ @@ -3309,10 +3305,6 @@ "flowAnalyticsConfiguration": { "$ref": "#/definitions/TrafficAnalyticsProperties", "description": "Parameters that define the configuration of traffic analytics." - }, - "identity": { - "description": "FlowLog resource Managed Identity", - "$ref": "./network.json#/definitions/ManagedServiceIdentity" } } },