Internal Network resource - all properties are top level (PrivateEndp…

…ointConnectionProxy) (#16628) * Removed property bags from NRP proxy definition * Added top level suppression * Added provisioning state because of RPaaS validation * Another try at supressions * square #1 * square #0 * another try
Azure · Nov 2, 2021 · ab4df5f · ab4df5f
1 parent c4838f2
commit ab4df5f
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 113 deletions.
diff --git a/...date/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/...date/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json
@@ -1532,22 +1532,16 @@
       "allOf": [
         {
           "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
-        }
-      ],
-      "properties": {
-        "properties": {
-          "description": "Private endpoint connection proxy object properties.",
-          "x-ms-client-flatten": true,
+        },
+        {
           "$ref": "#/definitions/PrivateEndpointConnectionProxyProperties"
         }
-      },
-      "required": [
-        "properties"
       ]
     },
     "PrivateEndpointConnectionProxyProperties": {
       "description": "Private endpoint connection proxy object properties.",
       "type": "object",
+      "x-ms-client-flatten": true,
       "properties": {
         "eTag": {
           "description": "ETag from NRP.",

diff --git a/...mples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json b/...mples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json
@@ -6,12 +6,37 @@
     "privateEndpointConnectionProxyId": "peexample01",
     "api-version": "2020-03-01-preview",
     "privateEndpointConnectionProxy": {
-      "properties": {
+      "remotePrivateEndpoint": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
+        "manualPrivateLinkServiceConnections": [
+          {
+            "name": "{privateEndpointConnectionProxyId}",
+            "groupIds": [
+              "DeviceUpdate"
+            ],
+            "requestMessage": "Please approve my connection, thanks."
+          }
+        ],
+        "privateLinkServiceProxies": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
+            "groupConnectivityInformation": []
+          }
+        ]
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
+        "name": "peexample01",
+        "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
         "remotePrivateEndpoint": {
           "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
           "manualPrivateLinkServiceConnections": [
             {
-              "name": "{privateEndpointConnectionProxyId}",
+              "name": "{plsConnectionName}",
               "groupIds": [
                 "DeviceUpdate"
               ],
@@ -21,45 +46,16 @@
           "privateLinkServiceProxies": [
             {
               "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
-              "groupConnectivityInformation": []
+              "groupConnectivityInformation": [
+                {
+                  "groupId": "DeviceUpdate",
+                  "memberName": "adu"
+                }
+              ]
             }
           ]
         }
       }
     }
-  },
-  "responses": {
-    "201": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
-        "name": "peexample01",
-        "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
-        "properties": {
-          "remotePrivateEndpoint": {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
-            "manualPrivateLinkServiceConnections": [
-              {
-                "name": "{plsConnectionName}",
-                "groupIds": [
-                  "DeviceUpdate"
-                ],
-                "requestMessage": "Please approve my connection, thanks."
-              }
-            ],
-            "privateLinkServiceProxies": [
-              {
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
-                "groupConnectivityInformation": [
-                  {
-                    "groupId": "DeviceUpdate",
-                    "memberName": "adu"
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      }
-    }
   }
 }
diff --git a/...preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json b/...preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json
@@ -12,30 +12,28 @@
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
         "name": "peexample01",
         "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
-        "properties": {
-          "remotePrivateEndpoint": {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
-            "manualPrivateLinkServiceConnections": [
-              {
-                "name": "{plsConnectionName}",
-                "groupIds": [
-                  "DeviceUpdate"
-                ],
-                "requestMessage": "Please approve my connection, thanks."
-              }
-            ],
-            "privateLinkServiceProxies": [
-              {
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
-                "groupConnectivityInformation": [
-                  {
-                    "groupId": "DeviceUpdate",
-                    "memberName": "adu"
-                  }
-                ]
-              }
-            ]
-          }
+        "remotePrivateEndpoint": {
+          "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
+          "manualPrivateLinkServiceConnections": [
+            {
+              "name": "{plsConnectionName}",
+              "groupIds": [
+                "DeviceUpdate"
+              ],
+              "requestMessage": "Please approve my connection, thanks."
+            }
+          ],
+          "privateLinkServiceProxies": [
+            {
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
+              "groupConnectivityInformation": [
+                {
+                  "groupId": "DeviceUpdate",
+                  "memberName": "adu"
+                }
+              ]
+            }
+          ]
         }
       }
     }

diff --git a/...amples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json b/...amples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json
@@ -13,30 +13,28 @@
             "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
             "name": "peexample01",
             "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
-            "properties": {
-              "remotePrivateEndpoint": {
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
-                "manualPrivateLinkServiceConnections": [
-                  {
-                    "name": "{plsConnectionName}",
-                    "groupIds": [
-                      "DeviceUpdate"
-                    ],
-                    "requestMessage": "Please approve my connection, thanks."
-                  }
-                ],
-                "privateLinkServiceProxies": [
-                  {
-                    "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
-                    "groupConnectivityInformation": [
-                      {
-                        "groupId": "DeviceUpdate",
-                        "memberName": "adu"
-                      }
-                    ]
-                  }
-                ]
-              }
+            "remotePrivateEndpoint": {
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
+              "manualPrivateLinkServiceConnections": [
+                {
+                  "name": "{plsConnectionName}",
+                  "groupIds": [
+                    "DeviceUpdate"
+                  ],
+                  "requestMessage": "Please approve my connection, thanks."
+                }
+              ],
+              "privateLinkServiceProxies": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
+                  "groupConnectivityInformation": [
+                    {
+                      "groupId": "DeviceUpdate",
+                      "memberName": "adu"
+                    }
+                  ]
+                }
+              ]
             }
           }
         ]

diff --git a/...ew/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json b/...ew/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json
@@ -6,25 +6,23 @@
     "privateEndpointConnectionProxyId": "peexample01",
     "api-version": "2020-03-01-preview",
     "privateEndpointConnectionProxy": {
-      "properties": {
-        "remotePrivateEndpoint": {
-          "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
-          "manualPrivateLinkServiceConnections": [
-            {
-              "name": "{privateEndpointConnectionProxyId}",
-              "groupIds": [
-                "DeviceUpdate"
-              ],
-              "requestMessage": "Please approve my connection, thanks."
-            }
-          ],
-          "privateLinkServiceProxies": [
-            {
-              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
-              "groupConnectivityInformation": []
-            }
-          ]
-        }
+      "remotePrivateEndpoint": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
+        "manualPrivateLinkServiceConnections": [
+          {
+            "name": "{privateEndpointConnectionProxyId}",
+            "groupIds": [
+              "DeviceUpdate"
+            ],
+            "requestMessage": "Please approve my connection, thanks."
+          }
+        ],
+        "privateLinkServiceProxies": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
+            "groupConnectivityInformation": []
+          }
+        ]
       }
     }
   },

diff --git a/specification/deviceupdate/resource-manager/readme.md b/specification/deviceupdate/resource-manager/readme.md
@@ -47,6 +47,10 @@ directive:
     where: $.definitions.Identity.properties.type
     from: deviceupdate.json
     reason: Managed Identity type can be case in-sensitive
+  - suppress: BodyTopLevelProperties
+    from: deviceupdate.json
+    where: $.definitions.PrivateEndpointConnectionProxy
+    reason: Internal NRP resource, all properties are top level properties
 ```
 
 ---