revert changes for user mi (Azure#28839)

solankisamir · May 9, 2024 · d1f4d6f · d1f4d6f
1 parent b722d75
commit d1f4d6f
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 115 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1046,7 +1046,6 @@ fiveqi
 flexera
 flink
 flowlet
-flowlog
 fluentd
 forceclosehandles
 forceencryption

diff --git a/...-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogConfigure.json b/...-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/...rce-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogCreate.json b/...rce-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/...source-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogGet.json b/...source-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/...ource-manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogList.json b/...ource-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/...anager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogStatusQuery.json b/...anager/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/...manager/Microsoft.Network/stable/2023-11-01/examples/NetworkWatcherFlowLogUpdateTags.json b/...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/...fication/network/resource-manager/Microsoft.Network/stable/2023-11-01/networkWatcher.json b/...fication/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"
         }
       }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -1046,7 +1046,6 @@ fiveqi @@
     flexera
     flink
     flowlet
-    flowlog
     fluentd
     forceclosehandles
     forceencryption
@@ Expand Down @@