From 4c7c09e5b3779e56961db6371b80faf4c536c571 Mon Sep 17 00:00:00 2001
From: yuanzhang9 <doggie_zhang@163.com>
Date: Tue, 22 Oct 2024 15:00:48 +0800
Subject: [PATCH] Solve file conflicts for PR #1759

---
 .../customRoleDefinitions.json                | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json b/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json
index 87e9aa662..6c8ce646a 100644
--- a/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json
+++ b/eslzArm/managementGroupTemplates/roleDefinitions/customRoleDefinitions.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.22.6.54827",
-      "templateHash": "14490525755972949150"
+      "version": "0.29.47.4906",
+      "templateHash": "12429908550017328445"
     }
   },
   "variables": {
@@ -38,25 +38,22 @@
       }
     },
     "$fxv#1": {
-      "name": "402344ce-48c4-5ac1-9320-16726050f964",
+      "name": "dc726155-3983-5405-b446-9bb27b94e02c",
       "type": "Microsoft.Authorization/roleDefinitions",
       "apiVersion": "2022-04-01",
       "properties": {
-        "roleName": "Subscription-Owner",
-        "description": "Delegated role for subscription owner generated from subscription Owner role",
+        "roleName": "Network-Management",
+        "description": "Platform-wide global connectivity management: virtual networks, UDRs, NSGs, NVAs, VPN, Azure ExpressRoute, and others",
         "type": "customRole",
         "permissions": [
           {
             "actions": [
-              "*"
-            ],
-            "notActions": [
-              "Microsoft.Authorization/*/write",
-              "Microsoft.Network/vpnGateways/*",
-              "Microsoft.Network/expressRouteCircuits/*",
-              "Microsoft.Network/routeTables/write",
-              "Microsoft.Network/vpnSites/*"
+              "*/read",
+              "Microsoft.Network/*",
+              "Microsoft.Resources/deployments/*",
+              "Microsoft.Support/*"
             ],
+            "notActions": [],
             "dataActions": [],
             "notDataActions": []
           }
@@ -101,22 +98,25 @@
       }
     },
     "$fxv#3": {
-      "name": "dc726155-3983-5405-b446-9bb27b94e02c",
+      "name": "402344ce-48c4-5ac1-9320-16726050f964",
       "type": "Microsoft.Authorization/roleDefinitions",
       "apiVersion": "2022-04-01",
       "properties": {
-        "roleName": "Network-Management",
-        "description": "Platform-wide global connectivity management: virtual networks, UDRs, NSGs, NVAs, VPN, Azure ExpressRoute, and others",
+        "roleName": "Subscription-Owner",
+        "description": "Delegated role for subscription owner generated from subscription Owner role",
         "type": "customRole",
         "permissions": [
           {
             "actions": [
-              "*/read",
-              "Microsoft.Network/*",
-              "Microsoft.Resources/deployments/*",
-              "Microsoft.Support/*"
+              "*"
+            ],
+            "notActions": [
+              "Microsoft.Authorization/*/write",
+              "Microsoft.Network/vpnGateways/*",
+              "Microsoft.Network/expressRouteCircuits/*",
+              "Microsoft.Network/routeTables/write",
+              "Microsoft.Network/vpnSites/*"
             ],
-            "notActions": [],
             "dataActions": [],
             "notDataActions": []
           }
@@ -130,12 +130,11 @@
     "loadRoleDefinitions": {
       "All": [
         "[variables('$fxv#0')]",
-        "[variables('$fxv#1')]"
-      ],
-      "AzureCloud": [
+        "[variables('$fxv#1')]",
         "[variables('$fxv#2')]",
         "[variables('$fxv#3')]"
       ],
+      "AzureCloud": [],
       "AzureChinaCloud": [],
       "AzureUSGovernment": []
     },