[Hub Generated] Review request for Microsoft.Aadiam to add version pr…

…eview/2020-03-01-preview and stable/2020-03-01 (#15861) * Adds base for updating Microsoft.Aadiam from version preview/2020-03-01-preview to version 2020-03-01 * Updates readme * Updates API version in new specs and examples * Adding changes from previous PR * Ran prettier, fixed types.json reference * Remove changes to preview version * Fix python failure * Try switching error locations * Change error location back * fix old examples * Try to fix python check
Azure · Sep 8, 2021 · 7f3c455 · 7f3c455
1 parent 5959573
commit 7f3c455
Show file tree

Hide file tree

Showing 21 changed files with 1,565 additions and 35 deletions.
diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/common/1.0/types.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/common/1.0/types.json
@@ -0,0 +1,42 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Common types",
+    "version": "1.0"
+  },
+  "paths": {},
+  "definitions": {
+    "ErrorResponse": {
+      "description": "Error response.",
+      "properties": {
+        "error": {
+          "$ref": "#/definitions/ErrorDefinition",
+          "description": "The error details."
+        }
+      }
+    },
+    "ErrorDefinition": {
+      "description": "Error definition.",
+      "properties": {
+        "code": {
+          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
+          "type": "string",
+          "readOnly": true
+        },
+        "message": {
+          "description": "Description of the error.",
+          "type": "string",
+          "readOnly": true
+        },
+        "details": {
+          "description": "Internal error details.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ErrorDefinition"
+          },
+          "readOnly": true
+        }
+      }
+    }
+  }
+}
diff --git a/...ry/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json b/...ry/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json
@@ -114,38 +114,6 @@
     }
   },
   "definitions": {
-    "ErrorResponse": {
-      "description": "Error response.",
-      "properties": {
-        "error": {
-          "$ref": "#/definitions/ErrorDefinition",
-          "description": "The error details."
-        }
-      }
-    },
-    "ErrorDefinition": {
-      "description": "Error definition.",
-      "properties": {
-        "code": {
-          "description": "Service specific error code which serves as the substatus for the HTTP error code.",
-          "type": "string",
-          "readOnly": true
-        },
-        "message": {
-          "description": "Description of the error.",
-          "type": "string",
-          "readOnly": true
-        },
-        "details": {
-          "description": "Internal error details.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ErrorDefinition"
-          },
-          "readOnly": true
-        }
-      }
-    },
     "PrivateLinkResourceListResult": {
       "description": "A list of private link resources",
       "type": "object",

diff --git a/...-manager/Microsoft.Aadiam/stable/2017-04-01/examples/createOrUpdateDiagnosticSetting.json b/...-manager/Microsoft.Aadiam/stable/2017-04-01/examples/createOrUpdateDiagnosticSetting.json
@@ -3,9 +3,6 @@
     "name": "mysetting",
     "api-version": "2017-04-01",
     "parameters": {
-      "id": "providers/microsoft.aadiam/diagnosticSettings/mysetting",
-      "name": "mysetting",
-      "type": "",
       "properties": {
         "storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
         "workspaceId": "",

diff --git a/.../Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsCreate.json b/.../Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsCreate.json
@@ -0,0 +1,41 @@
+{
+  "parameters": {
+    "policyName": "example-policy-5849",
+    "resourceGroupName": "resourcegroup",
+    "api-version": "2020-03-01",
+    "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff",
+    "privateEndpointConnectionName": "{privateEndpointConnection name}",
+    "parameters": {
+      "properties": {
+        "privateEndpoint": {
+          "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkConnections/{privateEndpointConnection name}"
+        },
+        "privateLinkServiceConnectionState": {
+          "status": "Approved",
+          "description": "You may pass",
+          "actionsRequired": "None"
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkConnections/{privateEndpointConnection name}",
+        "name": "{privateEndpointConnection name}",
+        "type": "microsoft.aadiam/privateLinkForAzureAD/privateEndpointConnections",
+        "properties": {
+          "provisioningState": "Provisioning",
+          "privateEndpoint": {
+            "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkConnections/{privateEndpointConnection name}"
+          },
+          "privateLinkServiceConnectionState": {
+            "status": "Approved",
+            "description": "You may pass",
+            "actionsRequired": "None"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/.../Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsDelete.json b/.../Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsDelete.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "policyName": "example-policy-5849",
+    "resourceGroupName": "myResourceGroup",
+    "api-version": "2020-03-01",
+    "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff",
+    "privateEndpointConnectionName": "{privateEndpointConnection name}"
+  },
+  "responses": {
+    "200": {},
+    "202": {},
+    "204": {}
+  }
+}
diff --git a/...ger/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsGet.json b/...ger/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsGet.json
@@ -0,0 +1,29 @@
+{
+  "parameters": {
+    "policyName": "example-policy-5849",
+    "resourceGroupName": "myResourceGroup",
+    "api-version": "2020-03-01",
+    "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff",
+    "privateEndpointConnectionName": "{privateEndpointConnection name}"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.aadiam/privateLinkForAzureAD/example-policy-5849/privateLinkConnections/{privateEndpointConnection name}",
+        "name": "{privateEndpointConnection name}",
+        "type": "microsoft.aadiam/privateLinkForAzureAD/privateEndpointConnections",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "privateEndpoint": {
+            "id": "subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.aadiam/privateLinkForAzureAD/example-policy-5849/privateLinkConnections/{privateEndpointConnection name}"
+          },
+          "privateLinkServiceConnectionState": {
+            "status": "Pending",
+            "description": "approve please",
+            "actionsRequired": "None"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/...er/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsList.json b/...er/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateEndpointConnectionsList.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "policyName": "example-policy-5849",
+    "resourceGroupName": "myResourceGroup",
+    "api-version": "2020-03-01",
+    "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.aadiam/privateLinkForAzureAD/example-policy-5849/privateLinkConnections/{privateEndpointConnection name}",
+            "name": "{privateEndpointConnection name}",
+            "type": "microsoft.aadiam/privateLinkForAzureAD/privateEndpointConnections",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "privateEndpoint": {
+                "id": "subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.aadiam/privateLinkForAzureAD/example-policy-5849/privateLinkConnections/{privateEndpointConnection name}"
+              },
+              "privateLinkServiceConnectionState": {
+                "status": "Pending",
+                "description": "approve please",
+                "actionsRequired": "None"
+              }
+            }
+          }
+        ],
+        "nextLink": null
+      }
+    }
+  }
+}
diff --git a/...e-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyCreate.json b/...e-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyCreate.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "rg1",
+    "policyName": "ddb1",
+    "api-version": "2020-03-01",
+    "privateLinkPolicy": {
+      "name": "myOrgPrivateLinkPolicy",
+      "allTenants": false,
+      "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+      "tenants": [
+        "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+        "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+      ],
+      "resourceName": "myOrgVnetPrivateLink",
+      "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+      "resourceGroup": "myOrgVnetRG"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "myOrgPrivateLinkPolicy",
+        "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+        "allTenants": false,
+        "tenants": [
+          "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+          "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+        ],
+        "resourceName": "myOrgVnetPrivateLink",
+        "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+        "resourceGroup": "myOrgVnetRG"
+      }
+    },
+    "201": {
+      "body": {
+        "name": "myOrgPrivateLinkPolicy",
+        "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+        "allTenants": false,
+        "tenants": [
+          "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+          "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+        ],
+        "resourceName": "myOrgVnetPrivateLink",
+        "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+        "resourceGroup": "myOrgVnetRG"
+      }
+    }
+  }
+}
diff --git a/...e-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyDelete.json b/...e-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyDelete.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "rg1",
+    "policyName": "ddb1",
+    "api-version": "2020-03-01",
+    "privateLinkPolicy": {
+      "name": "myOrgPrivateLinkPolicy",
+      "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+      "allTenants": false,
+      "tenants": [
+        "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+        "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+      ],
+      "resourceName": "myOrgVnetPrivateLink",
+      "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+      "resourceGroup": "myOrgVnetRG"
+    }
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/...urce-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyGet.json b/...urce-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyGet.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "rg1",
+    "policyName": "ddb1",
+    "api-version": "2020-03-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "myOrgPrivateLinkPolicy",
+        "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+        "allTenants": false,
+        "tenants": [
+          "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+          "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+        ],
+        "resourceName": "myOrgVnetPrivateLink",
+        "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+        "resourceGroup": "myOrgVnetRG"
+      }
+    }
+  }
+}
diff --git a/...rce-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyList.json b/...rce-manager/Microsoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyList.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "rg1",
+    "api-version": "2020-03-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "myOrgPrivateLinkPolicy",
+            "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+            "tenants": [
+              "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+              "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+            ],
+            "resourceName": "myOrgVnetPrivateLink",
+            "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+            "resourceGroup": "myOrgVnetRG"
+          }
+        ],
+        "nextLink": "null"
+      }
+    }
+  }
+}
diff --git a/...crosoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyListBySubscription.json b/...crosoft.Aadiam/stable/2020-03-01/examples/AzureADPrivateLinkPolicyListBySubscription.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "api-version": "2020-03-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "myOrgPrivateLinkPolicy",
+            "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d",
+            "allTenants": false,
+            "tenants": [
+              "3616657d-1c80-41ae-9d83-2a2776f2c9be",
+              "727b6ef1-18ab-4627-ac95-3f9cd945ed87"
+            ],
+            "resourceName": "myOrgVnetPrivateLink",
+            "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1",
+            "resourceGroup": "myOrgVnetRG"
+          }
+        ],
+        "nextLink": "null"
+      }
+    }
+  }
+}