From 73bc0e748d61c2fb0d54b053284c19bb28539230 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 27 May 2020 11:51:50 -0700 Subject: [PATCH 01/43] Adds base for updating Microsoft.Aadiam from version preview/2020-03-01-preview to version 2020-07-01-preview --- .../AzureADPrivateLinkPolicyCreate.json | 50 ++ .../AzureADPrivateLinkPolicyDelete.json | 24 + .../examples/AzureADPrivateLinkPolicyGet.json | 24 + .../AzureADPrivateLinkPolicyList.json | 27 + ...ADPrivateLinkPolicyListBySubscription.json | 27 + .../AzureADPrivateLinkPolicyMinCreate.json | 50 ++ .../AzureADPrivateLinkPolicyUpdate.json | 28 + .../AzureADPrivateLinkResourceGet.json | 25 + .../AzureADPrivateLinkResourceListGet.json | 29 ++ .../privateLinkForAzureAD.json | 480 ++++++++++++++++++ .../privateLinkResources.json | 267 ++++++++++ 11 files changed, 1031 insertions(+) create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json new file mode 100644 index 000000000000..57e47eddbf87 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview", + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json new file mode 100644 index 000000000000..a67dbec84476 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview", + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json new file mode 100644 index 000000000000..8dbe8dcf0e61 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview" + }, + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json new file mode 100644 index 000000000000..da9771decce0 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "api-version": "2020-03-01-preview" + }, + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json new file mode 100644 index 000000000000..4fb0b868ed83 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "api-version": "2020-03-01-preview" + }, + "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" + } + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json new file mode 100644 index 000000000000..75a8b97c04e2 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview", + "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": { + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json new file mode 100644 index 000000000000..5902885602af --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview", + "privateLinkPolicy": { + "tags": {} + } + }, + "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", + "tags": {} + } + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json new file mode 100644 index 000000000000..31fbcdc073ef --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "groupName": "azureactivedirectory", + "api-version": "2020-03-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkResources/azureactivedirectory", + "name": "azureactivedirectory", + "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", + "properties": { + "groupId": "azureactivedirectory", + "requiredMembers": [ + "authentication", + "nonauthentication" + ] + } + } + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json new file mode 100644 index 000000000000..60fe21893e83 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-03-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkResources/azureactivedirectory", + "name": "azureactivedirectory", + "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", + "properties": { + "groupId": "azureactivedirectory", + "requiredMembers": [ + "authentication", + "nonauthentication" + ] + } + } + ], + "nextLink": "null" + } + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json new file mode 100644 index 000000000000..beda20b39188 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json @@ -0,0 +1,480 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-03-01-preview", + "title": "azureactivedirectory", + "description": "Private link Policy for Azure Active Directory." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}": { + "put": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Create", + "x-ms-long-running-operation": true, + "description": "Creates a private link policy.", + "x-ms-examples": { + "privateLinkPolicyCreate": { + "$ref": "./examples/AzureADPrivateLinkPolicyCreate.json" + }, + "privateLinkPolicyMinCreate": { + "$ref": "./examples/AzureADPrivateLinkPolicyMinCreate.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "privateLinkPolicy", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + }, + "description": "private link Policy supplied to the operation." + } + ], + "responses": { + "200": { + "description": "Created -- Private Link Policy created.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "201": { + "description": "OK -- Private Link Policy is updated.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Update", + "description": "Updates private link policy tags with specified values.", + "x-ms-examples": { + "privateLinkPolicyUpdate": { + "$ref": "./examples/AzureADPrivateLinkPolicyUpdate.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "privateLinkPolicy", + "in": "body", + "schema": { + "$ref": "#/definitions/privateLinkPolicyUpdateParameter" + }, + "description": "Private Link Policy resource with the tags to be updated." + } + ], + "responses": { + "200": { + "description": "OK -- Private Link Policy tags are updated.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Get", + "description": "Gets a private link policy with a given name.", + "x-ms-examples": { + "privateLinkPolicyGet": { + "$ref": "./examples/AzureADPrivateLinkPolicyGet.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returns information about the private link policy.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Delete", + "description": "Deletes a private link policy. When operation completes, status code 200 returned without content.", + "x-ms-examples": { + "privateLinkPolicyDelete": { + "$ref": "./examples/AzureADPrivateLinkPolicyDelete.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- private link policy deleted." + }, + "204": { + "description": "private link policy does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_ListBySubscription", + "description": "Lists all Private Link Policies For AzureAD in the given subscription.", + "x-ms-examples": { + "privateLinkPolicyListBySubscription": { + "$ref": "./examples/AzureADPrivateLinkPolicyListBySubscription.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returns a list of private link policies.", + "schema": { + "$ref": "#/definitions/privateLinkPolicyListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_List", + "x-ms-examples": { + "privateLinkPolicyGetList": { + "$ref": "./examples/AzureADPrivateLinkPolicyList.json" + } + }, + "description": "Operation to return the list of Private Link Policies For AzureAD scoped to the resourceGroup.", + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successful request to get list of Private Links configuration objects For AzureAD.", + "schema": { + "$ref": "#/definitions/privateLinkPolicyListResult" + } + }, + "default": { + "description": "Error, failed to get list of Private Links For AzureAD.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "privateLinkPolicyListResult": { + "description": "A list of private link policies", + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link policies", + "items": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + } + }, + "privateLinkPolicy": { + "description": "PrivateLink Policy configuration object.", + "type": "object", + "properties": { + "name": { + "description": "Name of the Private Link Azure AD Policy.", + "type": "string" + }, + "ownerTenantId": { + "description": "Guid of the owner tenant", + "type": "string" + }, + "allTenants": { + "description": "Flag indicating whether all tenants are allowed", + "type": "boolean" + }, + "tenants": { + "description": "The list of tenantIds.", + "type": "array", + "items": { + "type": "string" + } + }, + "resourceName": { + "description": "Name of the private link policy resource", + "type": "string" + }, + "subscriptionId": { + "description": "Subscription Identifier", + "type": "string" + }, + "resourceGroup": { + "description": "Name of the resource group", + "type": "string" + }, + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/AzureResourceBase" + } + ] + }, + "AzureResourceBase": { + "x-ms-azure-resource": true, + "type": "object", + "description": "Common properties for all Azure resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "String Id used to locate any resource on Azure." + }, + "name": { + "readOnly": false, + "type": "string", + "description": "Name of this resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of this resource." + } + } + }, + "privateLinkPolicyUpdateParameter": { + "type": "object", + "description": "private Link policy parameters to be updated. ", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags to be updated.", + "additionalProperties": { + "type": "string" + } + } + } + }, + "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 + } + } + } + }, + "parameters": { + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure subscription ID.", + "required": true, + "type": "string", + "x-ms-parameter-location": "client" + }, + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "x-ms-parameter-location": "client", + "description": "Version of the API to be used with the client request." + }, + "resourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method", + "description": "Name of an Azure resource group." + }, + "policyNameParameter": { + "name": "policyName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method", + "description": "name of the private link policy." + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json new file mode 100644 index 000000000000..a5cb5c0cab09 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json @@ -0,0 +1,267 @@ +{ + "swagger": "2.0", + "info": { + "version": "2017-04-01", + "title": "azureactivedirectory", + "description": "Azure Active Directory Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}/privateLinkResources": { + "get": { + "tags": [ + "PrivateLinkResources" + ], + "description": "Gets the private link resources that need to be created for a policy of AzureAD.", + "operationId": "PrivateLinkResources_ListByPrivateLinkPolicy", + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved private link resources.", + "schema": { + "$ref": "#/definitions/PrivateLinkResourceListResult" + } + } + }, + "x-ms-examples": { + "Gets private endpoint connection.": { + "$ref": "./examples/AzureADPrivateLinkResourceListGet.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}/privateLinkResources/{groupName}": { + "get": { + "tags": [ + "PrivateLinkResources" + ], + "description": "Gets the private link resources that need to be created for a policy of AzureAD.", + "operationId": "PrivateLinkResources_Get", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/groupNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved a specified private link resource.", + "schema": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + }, + "x-ms-examples": { + "Gets private endpoint connection.": { + "$ref": "./examples/AzureADPrivateLinkResourceGet.json" + } + } + } + } + }, + "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", + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + } + }, + "PrivateLinkResource": { + "description": "A private link resource", + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/ARMProxyResource" + } + ] + }, + "PrivateLinkResourceProperties": { + "description": "Properties of a private link resource.", + "type": "object", + "properties": { + "groupId": { + "description": "The private link resource group id.", + "type": "string", + "readOnly": true + }, + "requiredMembers": { + "description": "The private link resource required member names.", + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true + } + } + }, + "ARMProxyResource": { + "type": "object", + "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The unique resource identifier of the Azure AD PrivateLink Policy." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the Azure AD PrivateLink Policy." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of Azure resource." + } + }, + "x-ms-azure-resource": true + } + }, + "parameters": { + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure subscription ID.", + "required": true, + "type": "string" + }, + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Version of the API to be used with the client request." + }, + "resourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method", + "description": "Name of an Azure resource group." + }, + "groupNameParameter": { + "name": "groupName", + "in": "path", + "description": "The name of the private link resource.", + "required": true, + "x-ms-parameter-location": "method", + "type": "string" + }, + "policyNameParameter": { + "name": "policyName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the private link policy name in Azure AD.", + "x-ms-parameter-location": "method" + } + } +} From 62e7cda5173edaa71fcd12bb24d862ba60b8632e Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 27 May 2020 11:52:12 -0700 Subject: [PATCH 02/43] Updates readme --- .../resource-manager/readme.md | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index b1d96fb51aa0..dfeb59154331 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -24,16 +24,26 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor These are the global settings for the azureactivedirectory. -```yaml +``` yaml openapi-type: arm -tag: package-2017-04-01 +tag: package-preview-2020-07 ``` + +### Tag: package-preview-2020-07 + +These settings apply only when `--tag=package-preview-2020-07` is specified on the command line. + +```yaml $(tag) == 'package-preview-2020-07' +input-file: + - Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json + - Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json +``` ### Tag: package-2017-04-01 These settings apply only when `--tag=package-2017-04-01` is specified on the command line. -```yaml $(tag) == 'package-2017-04-01' +``` yaml $(tag) == 'package-2017-04-01' input-file: - Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json ``` @@ -47,7 +57,7 @@ input-file: This section describes what SDK should be generated by the automatic system. This is not used by Autorest itself. -```yaml $(swagger-to-sdk) +``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python @@ -79,7 +89,7 @@ See configuration in [readme.typescript.md](./readme.typescript.md) See configuration in [readme.csharp.md](./readme.csharp.md) -## Multi-API/Profile support for AutoRest v3 generators +## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. @@ -95,11 +105,10 @@ input-file: ``` -If there are files that should not be in the `all-api-versions` set, +If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' #exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` - From 84f06b2407c3173974f02e924746b66fc02879ba Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 27 May 2020 11:52:15 -0700 Subject: [PATCH 03/43] Updates API version in new specs and examples --- .../examples/AzureADPrivateLinkPolicyCreate.json | 2 +- .../examples/AzureADPrivateLinkPolicyDelete.json | 2 +- .../examples/AzureADPrivateLinkPolicyGet.json | 2 +- .../examples/AzureADPrivateLinkPolicyList.json | 2 +- .../examples/AzureADPrivateLinkPolicyListBySubscription.json | 2 +- .../examples/AzureADPrivateLinkPolicyMinCreate.json | 2 +- .../examples/AzureADPrivateLinkPolicyUpdate.json | 2 +- .../examples/AzureADPrivateLinkResourceGet.json | 2 +- .../examples/AzureADPrivateLinkResourceListGet.json | 2 +- .../preview/2020-07-01-preview/privateLinkForAzureAD.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json index 57e47eddbf87..114ebf683d68 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview", + "api-version": "2020-07-01-preview", "privateLinkPolicy": { "name": "myOrgPrivateLinkPolicy", "allTenants": false, diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json index a67dbec84476..f7519fb8c592 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview", + "api-version": "2020-07-01-preview", "privateLinkPolicy": { "name": "myOrgPrivateLinkPolicy", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json index 8dbe8dcf0e61..5a219428b519 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json index da9771decce0..39a1a3b9248c 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "api-version": "2020-03-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json index 4fb0b868ed83..54e33a92a5c2 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "api-version": "2020-03-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json index 75a8b97c04e2..aa2d1e386ee5 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview", + "api-version": "2020-07-01-preview", "privateLinkPolicy": { "name": "myOrgPrivateLinkPolicy", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json index 5902885602af..c7e83faee51a 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview", + "api-version": "2020-07-01-preview", "privateLinkPolicy": { "tags": {} } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json index 31fbcdc073ef..ac37851d6f15 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "policyName": "ddb1", "groupName": "azureactivedirectory", - "api-version": "2020-03-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json index 60fe21893e83..7c83e2724b4b 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "policyName": "ddb1", - "api-version": "2020-03-01-preview" + "api-version": "2020-07-01-preview" }, "responses": { "200": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json index beda20b39188..6c49cb6ddc85 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-03-01-preview", + "version": "2020-07-01-preview", "title": "azureactivedirectory", "description": "Private link Policy for Azure Active Directory." }, From ea899b663d0e7a6387063a52f86d3ccd87aeac2d Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 27 May 2020 12:12:58 -0700 Subject: [PATCH 04/43] added azureADHealth --- .../2020-07-01-preview/azureADHealth.json | 480 ++++++++++++++++++ 1 file changed, 480 insertions(+) create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json new file mode 100644 index 000000000000..8297561ec8f0 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -0,0 +1,480 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-07-01-preview", + "title": "azureadhealth", + "description": "Metrics and Alerts for Azure Active Directory." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}": { + "put": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Create", + "x-ms-long-running-operation": true, + "description": "Creates a private link policy.", + "x-ms-examples": { + "privateLinkPolicyCreate": { + "$ref": "./examples/AzureADPrivateLinkPolicyCreate.json" + }, + "privateLinkPolicyMinCreate": { + "$ref": "./examples/AzureADPrivateLinkPolicyMinCreate.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "privateLinkPolicy", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + }, + "description": "private link Policy supplied to the operation." + } + ], + "responses": { + "200": { + "description": "Created -- Private Link Policy created.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "201": { + "description": "OK -- Private Link Policy is updated.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Update", + "description": "Updates private link policy tags with specified values.", + "x-ms-examples": { + "privateLinkPolicyUpdate": { + "$ref": "./examples/AzureADPrivateLinkPolicyUpdate.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "privateLinkPolicy", + "in": "body", + "schema": { + "$ref": "#/definitions/privateLinkPolicyUpdateParameter" + }, + "description": "Private Link Policy resource with the tags to be updated." + } + ], + "responses": { + "200": { + "description": "OK -- Private Link Policy tags are updated.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Get", + "description": "Gets a private link policy with a given name.", + "x-ms-examples": { + "privateLinkPolicyGet": { + "$ref": "./examples/AzureADPrivateLinkPolicyGet.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returns information about the private link policy.", + "schema": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_Delete", + "description": "Deletes a private link policy. When operation completes, status code 200 returned without content.", + "x-ms-examples": { + "privateLinkPolicyDelete": { + "$ref": "./examples/AzureADPrivateLinkPolicyDelete.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/policyNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- private link policy deleted." + }, + "204": { + "description": "private link policy does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_ListBySubscription", + "description": "Lists all Private Link Policies For AzureAD in the given subscription.", + "x-ms-examples": { + "privateLinkPolicyListBySubscription": { + "$ref": "./examples/AzureADPrivateLinkPolicyListBySubscription.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returns a list of private link policies.", + "schema": { + "$ref": "#/definitions/privateLinkPolicyListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "get": { + "tags": [ + "privateLinkForAzureAd" + ], + "operationId": "privateLinkForAzureAd_List", + "x-ms-examples": { + "privateLinkPolicyGetList": { + "$ref": "./examples/AzureADPrivateLinkPolicyList.json" + } + }, + "description": "Operation to return the list of Private Link Policies For AzureAD scoped to the resourceGroup.", + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successful request to get list of Private Links configuration objects For AzureAD.", + "schema": { + "$ref": "#/definitions/privateLinkPolicyListResult" + } + }, + "default": { + "description": "Error, failed to get list of Private Links For AzureAD.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "privateLinkPolicyListResult": { + "description": "A list of private link policies", + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link policies", + "items": { + "$ref": "#/definitions/privateLinkPolicy" + } + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + } + }, + "privateLinkPolicy": { + "description": "PrivateLink Policy configuration object.", + "type": "object", + "properties": { + "name": { + "description": "Name of the Private Link Azure AD Policy.", + "type": "string" + }, + "ownerTenantId": { + "description": "Guid of the owner tenant", + "type": "string" + }, + "allTenants": { + "description": "Flag indicating whether all tenants are allowed", + "type": "boolean" + }, + "tenants": { + "description": "The list of tenantIds.", + "type": "array", + "items": { + "type": "string" + } + }, + "resourceName": { + "description": "Name of the private link policy resource", + "type": "string" + }, + "subscriptionId": { + "description": "Subscription Identifier", + "type": "string" + }, + "resourceGroup": { + "description": "Name of the resource group", + "type": "string" + }, + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } + } + }, + "allOf": [ + { + "$ref": "#/definitions/AzureResourceBase" + } + ] + }, + "AzureResourceBase": { + "x-ms-azure-resource": true, + "type": "object", + "description": "Common properties for all Azure resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "String Id used to locate any resource on Azure." + }, + "name": { + "readOnly": false, + "type": "string", + "description": "Name of this resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of this resource." + } + } + }, + "privateLinkPolicyUpdateParameter": { + "type": "object", + "description": "private Link policy parameters to be updated. ", + "properties": { + "tags": { + "type": "object", + "description": "Resource tags to be updated.", + "additionalProperties": { + "type": "string" + } + } + } + }, + "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 + } + } + } + }, + "parameters": { + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure subscription ID.", + "required": true, + "type": "string", + "x-ms-parameter-location": "client" + }, + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "x-ms-parameter-location": "client", + "description": "Version of the API to be used with the client request." + }, + "resourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method", + "description": "Name of an Azure resource group." + }, + "policyNameParameter": { + "name": "policyName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method", + "description": "name of the private link policy." + } + } +} From 7e8d0b382bea3c07aa8fd880ce48aeb076c3b5ea Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Thu, 28 May 2020 09:21:50 -0700 Subject: [PATCH 05/43] rough commit (without examples) for azureADHealth --- .../2020-07-01-preview/azureADHealth.json | 158 ++++++++---------- 1 file changed, 72 insertions(+), 86 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index 8297561ec8f0..56d334482aa6 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-07-01-preview", - "title": "azureadhealth", + "title": "azureADHealth", "description": "Metrics and Alerts for Azure Active Directory." }, "host": "management.azure.com", @@ -34,20 +34,17 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/azureADHealth/{azureADHealthName}": { "put": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_Create", + "operationId": "azureADHealth_Create", "x-ms-long-running-operation": true, - "description": "Creates a private link policy.", + "description": "Creates a azureADHealth instance.", "x-ms-examples": { - "privateLinkPolicyCreate": { - "$ref": "./examples/AzureADPrivateLinkPolicyCreate.json" - }, - "privateLinkPolicyMinCreate": { - "$ref": "./examples/AzureADPrivateLinkPolicyMinCreate.json" + "azureADHealthCreate": { + "$ref": "./examples/AzureADHealthCreate.json" } }, "parameters": [ @@ -58,32 +55,32 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/policyNameParameter" + "$ref": "#/parameters/azureAdHealthNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" }, { - "name": "privateLinkPolicy", + "name": "azureADHealth", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" }, - "description": "private link Policy supplied to the operation." + "description": "AzureADHealth definition supplied to the operation." } ], "responses": { "200": { - "description": "Created -- Private Link Policy created.", + "description": "Created -- AzureADHealth instance created.", "schema": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" } }, "201": { - "description": "OK -- Private Link Policy is updated.", + "description": "OK -- AzureADHealth instance is updated.", "schema": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" } }, "default": { @@ -96,13 +93,13 @@ }, "patch": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_Update", - "description": "Updates private link policy tags with specified values.", + "operationId": "azureADHealth_Update", + "description": "Updates azureADHealth tags with specified values.", "x-ms-examples": { - "privateLinkPolicyUpdate": { - "$ref": "./examples/AzureADPrivateLinkPolicyUpdate.json" + "azureADHealthUpdate": { + "$ref": "./examples/AzureADHealthUpdate.json" } }, "parameters": [ @@ -113,25 +110,25 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/policyNameParameter" + "$ref": "#/parameters/azureADHealthNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" }, { - "name": "privateLinkPolicy", + "name": "azureADHealth", "in": "body", "schema": { - "$ref": "#/definitions/privateLinkPolicyUpdateParameter" + "$ref": "#/definitions/azureADHealthUpdateParameter" }, - "description": "Private Link Policy resource with the tags to be updated." + "description": "AzureADHealth resource with the tags to be updated." } ], "responses": { "200": { - "description": "OK -- Private Link Policy tags are updated.", + "description": "OK -- AzureADHealth tags are updated.", "schema": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" } }, "default": { @@ -144,13 +141,13 @@ }, "get": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_Get", - "description": "Gets a private link policy with a given name.", + "operationId": "azureADHealth_Get", + "description": "Gets a azureADHealth instance with a given name.", "x-ms-examples": { - "privateLinkPolicyGet": { - "$ref": "./examples/AzureADPrivateLinkPolicyGet.json" + "azureADHealthGet": { + "$ref": "./examples/AzureADHealthGet.json" } }, "parameters": [ @@ -161,7 +158,7 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/policyNameParameter" + "$ref": "#/parameters/azureADHealthNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -169,9 +166,9 @@ ], "responses": { "200": { - "description": "OK -- Returns information about the private link policy.", + "description": "OK -- Returns information about the azureADHealth resource.", "schema": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" } }, "default": { @@ -184,13 +181,13 @@ }, "delete": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_Delete", - "description": "Deletes a private link policy. When operation completes, status code 200 returned without content.", + "operationId": "azureADHealth_Delete", + "description": "Deletes a AzureADHealth resource. When operation completes, status code 200 returned without content.", "x-ms-examples": { - "privateLinkPolicyDelete": { - "$ref": "./examples/AzureADPrivateLinkPolicyDelete.json" + "azureADHealthDelete": { + "$ref": "./examples/AzureADHealthDelete.json" } }, "parameters": [ @@ -201,7 +198,7 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/policyNameParameter" + "$ref": "#/parameters/azureADHealthNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -209,10 +206,10 @@ ], "responses": { "200": { - "description": "OK -- private link policy deleted." + "description": "OK -- azureADHealth resource deleted." }, "204": { - "description": "private link policy does not exist." + "description": "azureADHealth does not exist." }, "default": { "description": "Error response describing why the operation failed.", @@ -223,16 +220,16 @@ } } }, - "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/azureADHealth": { "get": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_ListBySubscription", - "description": "Lists all Private Link Policies For AzureAD in the given subscription.", + "operationId": "azureADHealth_ListBySubscription", + "description": "Lists all AzureADHealth resources in the given subscription.", "x-ms-examples": { - "privateLinkPolicyListBySubscription": { - "$ref": "./examples/AzureADPrivateLinkPolicyListBySubscription.json" + "azureADHealthListBySubscription": { + "$ref": "./examples/AzureADHealthListBySubscription.json" } }, "parameters": [ @@ -245,9 +242,9 @@ ], "responses": { "200": { - "description": "OK -- Returns a list of private link policies.", + "description": "OK -- Returns a list azureADHealth resources.", "schema": { - "$ref": "#/definitions/privateLinkPolicyListResult" + "$ref": "#/definitions/azureADHealthListResult" } }, "default": { @@ -262,18 +259,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/azureADHealth": { "get": { "tags": [ - "privateLinkForAzureAd" + "azureADHealth" ], - "operationId": "privateLinkForAzureAd_List", + "operationId": "azureADHealth_List", "x-ms-examples": { - "privateLinkPolicyGetList": { - "$ref": "./examples/AzureADPrivateLinkPolicyList.json" + "azureADHealthGetList": { + "$ref": "./examples/AzureADHealthList.json" } }, - "description": "Operation to return the list of Private Link Policies For AzureAD scoped to the resourceGroup.", + "description": "Operation to return the list of AzureADHealth resources scoped to the resourceGroup.", "x-ms-pageable": { "nextLinkName": "nextLink" }, @@ -290,13 +287,13 @@ ], "responses": { "200": { - "description": "Successful request to get list of Private Links configuration objects For AzureAD.", + "description": "Successful request to get list of AzureADHealth resources For AzureAD.", "schema": { - "$ref": "#/definitions/privateLinkPolicyListResult" + "$ref": "#/definitions/azureADHealthListResult" } }, "default": { - "description": "Error, failed to get list of Private Links For AzureAD.", + "description": "Error, failed to get list of AzureADHealth resources.", "schema": { "$ref": "#/definitions/ErrorResponse" } @@ -306,15 +303,15 @@ } }, "definitions": { - "privateLinkPolicyListResult": { - "description": "A list of private link policies", + "azureADHealthListResult": { + "description": "A list of AzureADHealth resources", "type": "object", "properties": { "value": { "type": "array", - "description": "Array of private link policies", + "description": "Array of AzureADHealth resources.", "items": { - "$ref": "#/definitions/privateLinkPolicy" + "$ref": "#/definitions/azureADHealth" } }, "nextLink": { @@ -323,31 +320,20 @@ } } }, - "privateLinkPolicy": { - "description": "PrivateLink Policy configuration object.", + "azureADHealth": { + "description": "AzureADHealth resource.", "type": "object", "properties": { "name": { - "description": "Name of the Private Link Azure AD Policy.", + "description": "Name of the AzureADHealth configuration object.", "type": "string" }, "ownerTenantId": { "description": "Guid of the owner tenant", "type": "string" }, - "allTenants": { - "description": "Flag indicating whether all tenants are allowed", - "type": "boolean" - }, - "tenants": { - "description": "The list of tenantIds.", - "type": "array", - "items": { - "type": "string" - } - }, "resourceName": { - "description": "Name of the private link policy resource", + "description": "Name of the AzureAdHealth resource", "type": "string" }, "subscriptionId": { @@ -394,9 +380,9 @@ } } }, - "privateLinkPolicyUpdateParameter": { + "azureADHealthUpdateParameter": { "type": "object", - "description": "private Link policy parameters to be updated. ", + "description": "AzureADHealth parameters to be updated. ", "properties": { "tags": { "type": "object", @@ -468,13 +454,13 @@ "x-ms-parameter-location": "method", "description": "Name of an Azure resource group." }, - "policyNameParameter": { - "name": "policyName", + "azureADHealthNameParameter": { + "name": "azureAdHealthName", "in": "path", "required": true, "type": "string", "x-ms-parameter-location": "method", - "description": "name of the private link policy." + "description": "Name of the azureADHealth instance." } } } From 3dba45772a9836e9087425081bc6ae12d42a192c Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 09:54:24 -0700 Subject: [PATCH 06/43] changed Ad to AD --- .../preview/2020-07-01-preview/azureADHealth.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index 56d334482aa6..e5cd8d733671 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -55,7 +55,7 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/azureAdHealthNameParameter" + "$ref": "#/parameters/azureADHealthNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -455,7 +455,7 @@ "description": "Name of an Azure resource group." }, "azureADHealthNameParameter": { - "name": "azureAdHealthName", + "name": "azureADHealthName", "in": "path", "required": true, "type": "string", From 6b215ba32be72124f41fe2151cb8d9ac855838aa Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 10:19:35 -0700 Subject: [PATCH 07/43] added examples for azureadhealth --- .../examples/AzureADHealthCreate.json | 50 +++++++++++++++++++ .../examples/AzureADHealthDelete.json | 24 +++++++++ .../examples/AzureADHealthGet.json | 24 +++++++++ .../examples/AzureADHealthList.json | 27 ++++++++++ .../AzureADHealthListBySubscription.json | 27 ++++++++++ .../examples/AzureADHealthUpdate.json | 28 +++++++++++ 6 files changed, 180 insertions(+) create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json create mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json new file mode 100644 index 000000000000..114ebf683d68 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-07-01-preview", + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json new file mode 100644 index 000000000000..f7519fb8c592 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-07-01-preview", + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json new file mode 100644 index 000000000000..5a219428b519 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-07-01-preview" + }, + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json new file mode 100644 index 000000000000..39a1a3b9248c --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "api-version": "2020-07-01-preview" + }, + "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json new file mode 100644 index 000000000000..54e33a92a5c2 --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "api-version": "2020-07-01-preview" + }, + "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" + } + } + } +} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json new file mode 100644 index 000000000000..c7e83faee51a --- /dev/null +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "rg1", + "policyName": "ddb1", + "api-version": "2020-07-01-preview", + "privateLinkPolicy": { + "tags": {} + } + }, + "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", + "tags": {} + } + } + } +} From 06fda6bd19cd877ab7eff2addfc96e81c5bcb712 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 11:32:55 -0700 Subject: [PATCH 08/43] removed private link files from 2020-07-01 preview --- .../AzureADPrivateLinkPolicyCreate.json | 50 -- .../AzureADPrivateLinkPolicyDelete.json | 24 - .../examples/AzureADPrivateLinkPolicyGet.json | 24 - .../AzureADPrivateLinkPolicyList.json | 27 - ...ADPrivateLinkPolicyListBySubscription.json | 27 - .../AzureADPrivateLinkPolicyMinCreate.json | 50 -- .../AzureADPrivateLinkPolicyUpdate.json | 28 - .../AzureADPrivateLinkResourceGet.json | 25 - .../AzureADPrivateLinkResourceListGet.json | 29 -- .../privateLinkForAzureAD.json | 480 ------------------ .../privateLinkResources.json | 267 ---------- 11 files changed, 1031 deletions(-) delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json delete mode 100644 specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json deleted file mode 100644 index 114ebf683d68..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyCreate.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview", - "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json deleted file mode 100644 index f7519fb8c592..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyDelete.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview", - "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json deleted file mode 100644 index 5a219428b519..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyGet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview" - }, - "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json deleted file mode 100644 index 39a1a3b9248c..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyList.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "api-version": "2020-07-01-preview" - }, - "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json deleted file mode 100644 index 54e33a92a5c2..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyListBySubscription.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "api-version": "2020-07-01-preview" - }, - "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" - } - } - } -} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json deleted file mode 100644 index aa2d1e386ee5..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyMinCreate.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview", - "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": { - "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/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json deleted file mode 100644 index c7e83faee51a..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkPolicyUpdate.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview", - "privateLinkPolicy": { - "tags": {} - } - }, - "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", - "tags": {} - } - } - } -} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json deleted file mode 100644 index ac37851d6f15..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceGet.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "groupName": "azureactivedirectory", - "api-version": "2020-07-01-preview" - }, - "responses": { - "200": { - "body": { - "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkResources/azureactivedirectory", - "name": "azureactivedirectory", - "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", - "properties": { - "groupId": "azureactivedirectory", - "requiredMembers": [ - "authentication", - "nonauthentication" - ] - } - } - } - } -} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json deleted file mode 100644 index 7c83e2724b4b..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADPrivateLinkResourceListGet.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "policyName": "ddb1", - "api-version": "2020-07-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/privateLinkForAzureAD/ddb1/privateLinkResources/azureactivedirectory", - "name": "azureactivedirectory", - "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", - "properties": { - "groupId": "azureactivedirectory", - "requiredMembers": [ - "authentication", - "nonauthentication" - ] - } - } - ], - "nextLink": "null" - } - } - } -} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json deleted file mode 100644 index 6c49cb6ddc85..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json +++ /dev/null @@ -1,480 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2020-07-01-preview", - "title": "azureactivedirectory", - "description": "Private link Policy for Azure Active Directory." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}": { - "put": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_Create", - "x-ms-long-running-operation": true, - "description": "Creates a private link policy.", - "x-ms-examples": { - "privateLinkPolicyCreate": { - "$ref": "./examples/AzureADPrivateLinkPolicyCreate.json" - }, - "privateLinkPolicyMinCreate": { - "$ref": "./examples/AzureADPrivateLinkPolicyMinCreate.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - }, - { - "name": "privateLinkPolicy", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/privateLinkPolicy" - }, - "description": "private link Policy supplied to the operation." - } - ], - "responses": { - "200": { - "description": "Created -- Private Link Policy created.", - "schema": { - "$ref": "#/definitions/privateLinkPolicy" - } - }, - "201": { - "description": "OK -- Private Link Policy is updated.", - "schema": { - "$ref": "#/definitions/privateLinkPolicy" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "patch": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_Update", - "description": "Updates private link policy tags with specified values.", - "x-ms-examples": { - "privateLinkPolicyUpdate": { - "$ref": "./examples/AzureADPrivateLinkPolicyUpdate.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - }, - { - "name": "privateLinkPolicy", - "in": "body", - "schema": { - "$ref": "#/definitions/privateLinkPolicyUpdateParameter" - }, - "description": "Private Link Policy resource with the tags to be updated." - } - ], - "responses": { - "200": { - "description": "OK -- Private Link Policy tags are updated.", - "schema": { - "$ref": "#/definitions/privateLinkPolicy" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_Get", - "description": "Gets a private link policy with a given name.", - "x-ms-examples": { - "privateLinkPolicyGet": { - "$ref": "./examples/AzureADPrivateLinkPolicyGet.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- Returns information about the private link policy.", - "schema": { - "$ref": "#/definitions/privateLinkPolicy" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_Delete", - "description": "Deletes a private link policy. When operation completes, status code 200 returned without content.", - "x-ms-examples": { - "privateLinkPolicyDelete": { - "$ref": "./examples/AzureADPrivateLinkPolicyDelete.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- private link policy deleted." - }, - "204": { - "description": "private link policy does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/privateLinkForAzureAd": { - "get": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_ListBySubscription", - "description": "Lists all Private Link Policies For AzureAD in the given subscription.", - "x-ms-examples": { - "privateLinkPolicyListBySubscription": { - "$ref": "./examples/AzureADPrivateLinkPolicyListBySubscription.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK -- Returns a list of private link policies.", - "schema": { - "$ref": "#/definitions/privateLinkPolicyListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd": { - "get": { - "tags": [ - "privateLinkForAzureAd" - ], - "operationId": "privateLinkForAzureAd_List", - "x-ms-examples": { - "privateLinkPolicyGetList": { - "$ref": "./examples/AzureADPrivateLinkPolicyList.json" - } - }, - "description": "Operation to return the list of Private Link Policies For AzureAD scoped to the resourceGroup.", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Successful request to get list of Private Links configuration objects For AzureAD.", - "schema": { - "$ref": "#/definitions/privateLinkPolicyListResult" - } - }, - "default": { - "description": "Error, failed to get list of Private Links For AzureAD.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "privateLinkPolicyListResult": { - "description": "A list of private link policies", - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link policies", - "items": { - "$ref": "#/definitions/privateLinkPolicy" - } - }, - "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" - } - } - }, - "privateLinkPolicy": { - "description": "PrivateLink Policy configuration object.", - "type": "object", - "properties": { - "name": { - "description": "Name of the Private Link Azure AD Policy.", - "type": "string" - }, - "ownerTenantId": { - "description": "Guid of the owner tenant", - "type": "string" - }, - "allTenants": { - "description": "Flag indicating whether all tenants are allowed", - "type": "boolean" - }, - "tenants": { - "description": "The list of tenantIds.", - "type": "array", - "items": { - "type": "string" - } - }, - "resourceName": { - "description": "Name of the private link policy resource", - "type": "string" - }, - "subscriptionId": { - "description": "Subscription Identifier", - "type": "string" - }, - "resourceGroup": { - "description": "Name of the resource group", - "type": "string" - }, - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - } - }, - "allOf": [ - { - "$ref": "#/definitions/AzureResourceBase" - } - ] - }, - "AzureResourceBase": { - "x-ms-azure-resource": true, - "type": "object", - "description": "Common properties for all Azure resources.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "String Id used to locate any resource on Azure." - }, - "name": { - "readOnly": false, - "type": "string", - "description": "Name of this resource." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Type of this resource." - } - } - }, - "privateLinkPolicyUpdateParameter": { - "type": "object", - "description": "private Link policy parameters to be updated. ", - "properties": { - "tags": { - "type": "object", - "description": "Resource tags to be updated.", - "additionalProperties": { - "type": "string" - } - } - } - }, - "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 - } - } - } - }, - "parameters": { - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure subscription ID.", - "required": true, - "type": "string", - "x-ms-parameter-location": "client" - }, - "apiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "x-ms-parameter-location": "client", - "description": "Version of the API to be used with the client request." - }, - "resourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "pattern": "^[-\\w\\._\\(\\)]+$", - "minLength": 1, - "maxLength": 90, - "x-ms-parameter-location": "method", - "description": "Name of an Azure resource group." - }, - "policyNameParameter": { - "name": "policyName", - "in": "path", - "required": true, - "type": "string", - "x-ms-parameter-location": "method", - "description": "name of the private link policy." - } - } -} diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json deleted file mode 100644 index a5cb5c0cab09..000000000000 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json +++ /dev/null @@ -1,267 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2017-04-01", - "title": "azureactivedirectory", - "description": "Azure Active Directory Client." - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}/privateLinkResources": { - "get": { - "tags": [ - "PrivateLinkResources" - ], - "description": "Gets the private link resources that need to be created for a policy of AzureAD.", - "operationId": "PrivateLinkResources_ListByPrivateLinkPolicy", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Successfully retrieved private link resources.", - "schema": { - "$ref": "#/definitions/PrivateLinkResourceListResult" - } - } - }, - "x-ms-examples": { - "Gets private endpoint connection.": { - "$ref": "./examples/AzureADPrivateLinkResourceListGet.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/privateLinkForAzureAd/{policyName}/privateLinkResources/{groupName}": { - "get": { - "tags": [ - "PrivateLinkResources" - ], - "description": "Gets the private link resources that need to be created for a policy of AzureAD.", - "operationId": "PrivateLinkResources_Get", - "parameters": [ - { - "$ref": "#/parameters/subscriptionIdParameter" - }, - { - "$ref": "#/parameters/resourceGroupNameParameter" - }, - { - "$ref": "#/parameters/policyNameParameter" - }, - { - "$ref": "#/parameters/groupNameParameter" - }, - { - "$ref": "#/parameters/apiVersionParameter" - } - ], - "responses": { - "200": { - "description": "Successfully retrieved a specified private link resource.", - "schema": { - "$ref": "#/definitions/PrivateLinkResource" - } - } - }, - "x-ms-examples": { - "Gets private endpoint connection.": { - "$ref": "./examples/AzureADPrivateLinkResourceGet.json" - } - } - } - } - }, - "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", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } - }, - "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" - } - } - }, - "PrivateLinkResource": { - "description": "A private link resource", - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "#/definitions/ARMProxyResource" - } - ] - }, - "PrivateLinkResourceProperties": { - "description": "Properties of a private link resource.", - "type": "object", - "properties": { - "groupId": { - "description": "The private link resource group id.", - "type": "string", - "readOnly": true - }, - "requiredMembers": { - "description": "The private link resource required member names.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true - } - } - }, - "ARMProxyResource": { - "type": "object", - "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "The unique resource identifier of the Azure AD PrivateLink Policy." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the Azure AD PrivateLink Policy." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of Azure resource." - } - }, - "x-ms-azure-resource": true - } - }, - "parameters": { - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure subscription ID.", - "required": true, - "type": "string" - }, - "apiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Version of the API to be used with the client request." - }, - "resourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "pattern": "^[-\\w\\._\\(\\)]+$", - "minLength": 1, - "maxLength": 90, - "x-ms-parameter-location": "method", - "description": "Name of an Azure resource group." - }, - "groupNameParameter": { - "name": "groupName", - "in": "path", - "description": "The name of the private link resource.", - "required": true, - "x-ms-parameter-location": "method", - "type": "string" - }, - "policyNameParameter": { - "name": "policyName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the private link policy name in Azure AD.", - "x-ms-parameter-location": "method" - } - } -} From a74ae8c969715617f1bbaeb269d8660cb57b7a86 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 11:42:57 -0700 Subject: [PATCH 09/43] examples updated for azureadhealth --- .../examples/AzureADHealthCreate.json | 16 ++++++++-------- .../examples/AzureADHealthDelete.json | 8 ++++---- .../examples/AzureADHealthGet.json | 6 +++--- .../examples/AzureADHealthList.json | 4 ++-- .../AzureADHealthListBySubscription.json | 4 ++-- .../examples/AzureADHealthUpdate.json | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json index 114ebf683d68..0de8988e979e 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json @@ -2,17 +2,17 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "policyName": "ddb1", + "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "privateLinkPolicy": { - "name": "myOrgPrivateLinkPolicy", + "azureADHealth": { + "name": "myOrgAzureADHealth", "allTenants": false, "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } @@ -20,28 +20,28 @@ "responses": { "200": { "body": { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } }, "201": { "body": { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json index f7519fb8c592..319b20e147bf 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json @@ -2,17 +2,17 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "policyName": "ddb1", + "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "privateLinkPolicy": { - "name": "myOrgPrivateLinkPolicy", + "azureADHealth": { + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json index 5a219428b519..4be65bb20f0e 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json @@ -2,20 +2,20 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "policyName": "ddb1", + "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview" }, "responses": { "200": { "body": { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json index 39a1a3b9248c..ac237f38b452 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json @@ -9,13 +9,13 @@ "body": { "value": [ { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json index 54e33a92a5c2..32aa49ccaf75 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json @@ -8,14 +8,14 @@ "body": { "value": [ { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json index c7e83faee51a..ea62d8e4971d 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json @@ -2,23 +2,23 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "policyName": "ddb1", + "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "privateLinkPolicy": { + "azureADHealth": { "tags": {} } }, "responses": { "200": { "body": { - "name": "myOrgPrivateLinkPolicy", + "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "allTenants": false, "tenants": [ "3616657d-1c80-41ae-9d83-2a2776f2c9be", "727b6ef1-18ab-4627-ac95-3f9cd945ed87" ], - "resourceName": "myOrgVnetPrivateLink", + "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG", "tags": {} From 6e6f749ce6ca4f96367f815814eea81570e54a6d Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 11:53:47 -0700 Subject: [PATCH 10/43] removed alltenants and tenants params from examples --- .../examples/AzureADHealthCreate.json | 15 --------------- .../examples/AzureADHealthDelete.json | 5 ----- .../examples/AzureADHealthGet.json | 5 ----- .../examples/AzureADHealthList.json | 4 ---- .../examples/AzureADHealthListBySubscription.json | 5 ----- .../examples/AzureADHealthUpdate.json | 5 ----- 6 files changed, 39 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json index 0de8988e979e..2eebe5bbbbf7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json @@ -6,12 +6,7 @@ "api-version": "2020-07-01-preview", "azureADHealth": { "name": "myOrgAzureADHealth", - "allTenants": false, "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" @@ -22,11 +17,6 @@ "body": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" @@ -36,11 +26,6 @@ "body": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json index 319b20e147bf..0a6b925ce946 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json @@ -7,11 +7,6 @@ "azureADHealth": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json index 4be65bb20f0e..d905700925ee 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json @@ -10,11 +10,6 @@ "body": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json index ac237f38b452..130255c5729c 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json @@ -11,10 +11,6 @@ { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json index 32aa49ccaf75..d0fb8826cc6c 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json @@ -10,11 +10,6 @@ { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json index ea62d8e4971d..0ee8788b06de 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json @@ -13,11 +13,6 @@ "body": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "allTenants": false, - "tenants": [ - "3616657d-1c80-41ae-9d83-2a2776f2c9be", - "727b6ef1-18ab-4627-ac95-3f9cd945ed87" - ], "resourceName": "myOrgVnetAzureADHealth", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG", From 8f13e5ff5769c88c0ec854b71a6f0c47b6f083df Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Thu, 28 May 2020 15:21:35 -0700 Subject: [PATCH 11/43] Fix Linting errors --- .../2020-07-01-preview/azureADHealth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index e5cd8d733671..945da30d4992 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -61,11 +61,11 @@ "$ref": "#/parameters/apiVersionParameter" }, { - "name": "azureADHealth", + "name": "azureADHealthConfig", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" }, "description": "AzureADHealth definition supplied to the operation." } @@ -74,13 +74,13 @@ "200": { "description": "Created -- AzureADHealth instance created.", "schema": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" } }, "201": { "description": "OK -- AzureADHealth instance is updated.", "schema": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" } }, "default": { @@ -116,7 +116,7 @@ "$ref": "#/parameters/apiVersionParameter" }, { - "name": "azureADHealth", + "name": "azureADHealthConfig", "in": "body", "schema": { "$ref": "#/definitions/azureADHealthUpdateParameter" @@ -168,7 +168,7 @@ "200": { "description": "OK -- Returns information about the azureADHealth resource.", "schema": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" } }, "default": { @@ -311,7 +311,7 @@ "type": "array", "description": "Array of AzureADHealth resources.", "items": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" } }, "nextLink": { @@ -320,7 +320,7 @@ } } }, - "azureADHealth": { + "azureADHealthConfig": { "description": "AzureADHealth resource.", "type": "object", "properties": { From f249ddcbd31b163f0abe224720d0f9099d32e063 Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Thu, 28 May 2020 16:02:10 -0700 Subject: [PATCH 12/43] Update readme to make avocado fix --- .../resource-manager/readme.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index dfeb59154331..cd294edb518b 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -29,16 +29,25 @@ openapi-type: arm tag: package-preview-2020-07 ``` - ### Tag: package-preview-2020-07 These settings apply only when `--tag=package-preview-2020-07` is specified on the command line. ```yaml $(tag) == 'package-preview-2020-07' input-file: - - Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkForAzureAD.json - - Microsoft.Aadiam/preview/2020-07-01-preview/privateLinkResources.json + - Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +``` + +### Tag: package-preview-2020-03 + +These settings apply only when `--tag=package-preview-2020-03` is specified on the command line. + +```yaml $(tag) == 'package-preview-2020-07' +input-file: + - Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json + - Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json ``` + ### Tag: package-2017-04-01 These settings apply only when `--tag=package-2017-04-01` is specified on the command line. From 735ab69580eb9e63e811eab05e7f6cf52b0495f3 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 17:09:12 -0700 Subject: [PATCH 13/43] minor fix --- .../preview/2020-07-01-preview/azureADHealth.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index 945da30d4992..dc6f197fc1eb 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "version": "2020-07-01-preview", - "title": "azureADHealth", + "title": "azureactivedirectory", "description": "Metrics and Alerts for Azure Active Directory." }, "host": "management.azure.com", @@ -128,7 +128,7 @@ "200": { "description": "OK -- AzureADHealth tags are updated.", "schema": { - "$ref": "#/definitions/azureADHealth" + "$ref": "#/definitions/azureADHealthConfig" } }, "default": { From a20808faa5df309c2d8636db3c37632d3a2a93e1 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 28 May 2020 17:20:40 -0700 Subject: [PATCH 14/43] custom word addition --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 1c26a569001a..f62138974643 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1772,3 +1772,4 @@ userprincipalname sessionstate sessionhosts hostpool +azureADHealth From ca45c83b5a6eaba36a99e6118a5c8d5aea404ba8 Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Fri, 29 May 2020 09:13:18 -0700 Subject: [PATCH 15/43] Update examples to match spec --- .../2020-07-01-preview/examples/AzureADHealthCreate.json | 2 +- .../2020-07-01-preview/examples/AzureADHealthDelete.json | 2 +- .../2020-07-01-preview/examples/AzureADHealthUpdate.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json index 2eebe5bbbbf7..bcd12b04017d 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealth": { + "azureADHealthConfig": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "resourceName": "myOrgVnetAzureADHealth", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json index 0a6b925ce946..e4ed674c2deb 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealth": { + "azureADHealthConfig": { "name": "myOrgAzureADHealth", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", "resourceName": "myOrgVnetAzureADHealth", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json index 0ee8788b06de..f13b4fb52591 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg1", "azureADHealthName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealth": { + "azureADHealthConfig": { "tags": {} } }, From 4012b33693d0f000d27d05784c02d4830a2515d8 Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Fri, 29 May 2020 09:23:45 -0700 Subject: [PATCH 16/43] Make PrivateLinkPolicyName parameter have same values to solve LintDiff error --- .../preview/2020-03-01-preview/privateLinkForAzureAD.json | 2 +- .../preview/2020-03-01-preview/privateLinkResources.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json index beda20b39188..28cedade989e 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json @@ -474,7 +474,7 @@ "required": true, "type": "string", "x-ms-parameter-location": "method", - "description": "name of the private link policy." + "description": "The name of the private link policy in Azure AD." } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json index a5cb5c0cab09..91055a8d1817 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json @@ -260,7 +260,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of the private link policy name in Azure AD.", + "description": "The name of the private link policy in Azure AD.", "x-ms-parameter-location": "method" } } From 5b9012248e0cbf1cc9a5f8f44fe18a9151967aa9 Mon Sep 17 00:00:00 2001 From: Abbe Blank Date: Fri, 29 May 2020 10:41:11 -0700 Subject: [PATCH 17/43] Make subscriptionIdParameter identical in all json files --- .../preview/2020-03-01-preview/privateLinkResources.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json index 91055a8d1817..4954cbb46439 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json @@ -227,7 +227,8 @@ "in": "path", "description": "Azure subscription ID.", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "client" }, "apiVersionParameter": { "name": "api-version", From c2f47691bbaf4e860feaa6f91d2a24e9f77e3408 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 11:38:02 -0700 Subject: [PATCH 18/43] error fixes for all model errors --- .../2020-07-01-preview/azureADHealth.json | 10 +--------- .../resource-manager/readme.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index dc6f197fc1eb..a6b64e8c669b 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -49,7 +49,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/resourceGroupNameParameter" @@ -427,14 +427,6 @@ } }, "parameters": { - "subscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Azure subscription ID.", - "required": true, - "type": "string", - "x-ms-parameter-location": "client" - }, "apiVersionParameter": { "name": "api-version", "in": "query", diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index cd294edb518b..21a1036c7bca 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -57,6 +57,23 @@ input-file: - Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json ``` +## Suppression +``` yaml +directive: + - suppress: BodyTopLevelProperties + from: azureADHealth.json + where: $.definitions.azureADHealthConfig.properties + - suppress: BodyTopLevelProperties + from: privateLinkForAzureAD.json + where: $.definitions.privateLinkPolicy.properties + - suppress: RequiredPropertiesMissingInResourceModel + from: azureADHealth.json + where: $.definitions.azureADHealthConfig + - suppress: RequiredPropertiesMissingInResourceModel + from: privateLinkForAzureAD.json + where: $.definitions.privateLinkPolicy +``` + --- # Code Generation From ede7c14ecdf2d8cab8ca1cb5c5a12909bb0b8230 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 11:43:23 -0700 Subject: [PATCH 19/43] fixed model validation error --- .../preview/2020-07-01-preview/azureADHealth.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index a6b64e8c669b..bb3b00b23bb2 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -104,7 +104,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/resourceGroupNameParameter" @@ -152,7 +152,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/resourceGroupNameParameter" @@ -192,7 +192,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/resourceGroupNameParameter" @@ -234,7 +234,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -276,7 +276,7 @@ }, "parameters": [ { - "$ref": "#/parameters/subscriptionIdParameter" + "$ref": "../2020-03-01-preview/privateLinkForAzureAD.json#/parameters/subscriptionIdParameter" }, { "$ref": "#/parameters/resourceGroupNameParameter" From bf2eb56b0aa03a01539f866ffdc046dd0c349d5d Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 12:19:18 -0700 Subject: [PATCH 20/43] additional suppressions for pascal case and operations --- specification/azureactivedirectory/resource-manager/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index 21a1036c7bca..1eda2b72c0c4 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -72,6 +72,8 @@ directive: - suppress: RequiredPropertiesMissingInResourceModel from: privateLinkForAzureAD.json where: $.definitions.privateLinkPolicy + - suppress: R3020 + - suppress: R3023 ``` --- From 7790aaef850405413b5691c27ae33bcb7591fb0a Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 13:13:06 -0700 Subject: [PATCH 21/43] added azureadhealth in readme to fix avocado error --- specification/azureactivedirectory/resource-manager/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index 1eda2b72c0c4..fe58c6bbcf53 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -130,6 +130,8 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - $(this-folder)/Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json + - $(this-folder)/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json + ``` From 83686dd18d5471bb90c2fc75ae27e7c6d86dc655 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 13:31:40 -0700 Subject: [PATCH 22/43] added privatelink api version along with azureadhealth --- specification/azureactivedirectory/resource-manager/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index fe58c6bbcf53..e646d87003fd 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -131,6 +131,8 @@ require: $(this-folder)/../../../profiles/readme.md input-file: - $(this-folder)/Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json - $(this-folder)/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json + - $(this-folder)/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json + - $(this-folder)/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json ``` From e94db35def2fc4304c48d1c8b794a12450f7beb5 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 29 May 2020 13:50:00 -0700 Subject: [PATCH 23/43] changed api version to the filepath version --- .../preview/2020-03-01-preview/privateLinkResources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json index 4954cbb46439..dcd0d05e2ce0 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2017-04-01", + "version": "2020-03-01-preview", "title": "azureactivedirectory", "description": "Azure Active Directory Client." }, From 1464be2f6cb4f43688770a056429e0719965159e Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Tue, 2 Jun 2020 15:49:34 -0700 Subject: [PATCH 24/43] modified for corrections on AzureADHealthGet --- .../examples/AzureADHealthGet.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json index d905700925ee..88e20ef6dad7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json @@ -3,16 +3,22 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "azureADHealthName": "ddb1", + "groupName": "azureactivedirectory", "api-version": "2020-07-01-preview" }, "responses": { "200": { "body": { - "name": "myOrgAzureADHealth", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/azureADHealth/ddb1", + "name": "azureactivedirectory", + "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", + "properties": { + "groupId": "azureactivedirectory", + "requiredMembers": [ + "authentication", + "nonauthentication" + ] + } } } } From 055a9105c7c31bd8b1db94d6c7a86fd63d59776e Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 3 Jun 2020 14:26:20 -0700 Subject: [PATCH 25/43] aded changes to match spec and example --- .../preview/2020-07-01-preview/azureADHealth.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index bb3b00b23bb2..a0338bd5fb1e 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -322,7 +322,10 @@ }, "azureADHealthConfig": { "description": "AzureADHealth resource.", + "id" : "object", + "name" : "object", "type": "object", + "properties": { "name": { "description": "Name of the AzureADHealth configuration object.", @@ -344,6 +347,14 @@ "description": "Name of the resource group", "type": "string" }, + "groupId": { + "description": "Group ID of the resource group", + "type": "string" + }, + "requiredMembers": { + "description": "Required members of the resource group", + "type": "string" + }, "tags": { "type": "object", "description": "Resource tags.", From 34e8a297c3bae4b354fdbdeb240662f1e94b4d4e Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Wed, 3 Jun 2020 16:37:36 -0700 Subject: [PATCH 26/43] reverted passing commit from before --- .../2020-07-01-preview/azureADHealth.json | 11 ----------- .../examples/AzureADHealthGet.json | 16 +++++----------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json index a0338bd5fb1e..bb3b00b23bb2 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json @@ -322,10 +322,7 @@ }, "azureADHealthConfig": { "description": "AzureADHealth resource.", - "id" : "object", - "name" : "object", "type": "object", - "properties": { "name": { "description": "Name of the AzureADHealth configuration object.", @@ -347,14 +344,6 @@ "description": "Name of the resource group", "type": "string" }, - "groupId": { - "description": "Group ID of the resource group", - "type": "string" - }, - "requiredMembers": { - "description": "Required members of the resource group", - "type": "string" - }, "tags": { "type": "object", "description": "Resource tags.", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json index 88e20ef6dad7..d905700925ee 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json @@ -3,22 +3,16 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "azureADHealthName": "ddb1", - "groupName": "azureactivedirectory", "api-version": "2020-07-01-preview" }, "responses": { "200": { "body": { - "id": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default/providers/microsoft.aadiam/azureADHealth/ddb1", - "name": "azureactivedirectory", - "type": "microsoft.aadiam/privateLinkforAzureAD/privateLinkResources", - "properties": { - "groupId": "azureactivedirectory", - "requiredMembers": [ - "authentication", - "nonauthentication" - ] - } + "name": "myOrgAzureADHealth", + "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", + "resourceName": "myOrgVnetAzureADHealth", + "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", + "resourceGroup": "myOrgVnetRG" } } } From 953e8fa1efe1780fcce531f1af995f4079d2490c Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 13:07:17 -0700 Subject: [PATCH 27/43] renamed to azureadmetrics --- ...azureADHealth.json => azureADMetrics.json} | 142 +++++++++--------- ...hCreate.json => AzureADMetricsCreate.json} | 16 +- ...hDelete.json => AzureADMetricsDelete.json} | 8 +- ...DHealthGet.json => AzureADMetricsGet.json} | 0 ...ealthList.json => AzureADMetricsList.json} | 0 ... => AzureADMetricsListBySubscription.json} | 0 ...hUpdate.json => AzureADMetricsUpdate.json} | 0 7 files changed, 83 insertions(+), 83 deletions(-) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/{azureADHealth.json => azureADMetrics.json} (71%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthCreate.json => AzureADMetricsCreate.json} (70%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthDelete.json => AzureADMetricsDelete.json} (71%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthGet.json => AzureADMetricsGet.json} (100%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthList.json => AzureADMetricsList.json} (100%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthListBySubscription.json => AzureADMetricsListBySubscription.json} (100%) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADHealthUpdate.json => AzureADMetricsUpdate.json} (100%) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json similarity index 71% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index bb3b00b23bb2..3cb43c4dd300 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -34,17 +34,17 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/azureADHealth/{azureADHealthName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.aadiam/azureADMetrics/{azureADMetricsName}": { "put": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_Create", + "operationId": "azureADMetrics_Create", "x-ms-long-running-operation": true, - "description": "Creates a azureADHealth instance.", + "description": "Creates a azureADMetrics instance.", "x-ms-examples": { - "azureADHealthCreate": { - "$ref": "./examples/AzureADHealthCreate.json" + "azureADMetricsCreate": { + "$ref": "./examples/AzureADMetricsCreate.json" } }, "parameters": [ @@ -55,32 +55,32 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/azureADHealthNameParameter" + "$ref": "#/parameters/azureADMetricsNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" }, { - "name": "azureADHealthConfig", + "name": "azureADMetricsConfig", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" }, - "description": "AzureADHealth definition supplied to the operation." + "description": "AzureADMetrics definition supplied to the operation." } ], "responses": { "200": { - "description": "Created -- AzureADHealth instance created.", + "description": "Created -- AzureADMetrics instance created.", "schema": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" } }, "201": { - "description": "OK -- AzureADHealth instance is updated.", + "description": "OK -- AzureADMetrics instance is updated.", "schema": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" } }, "default": { @@ -93,13 +93,13 @@ }, "patch": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_Update", - "description": "Updates azureADHealth tags with specified values.", + "operationId": "azureADMetrics_Update", + "description": "Updates azureADMetrics tags with specified values.", "x-ms-examples": { - "azureADHealthUpdate": { - "$ref": "./examples/AzureADHealthUpdate.json" + "azureADMetricsUpdate": { + "$ref": "./examples/AzureADMetricsUpdate.json" } }, "parameters": [ @@ -110,25 +110,25 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/azureADHealthNameParameter" + "$ref": "#/parameters/azureADMetricsNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" }, { - "name": "azureADHealthConfig", + "name": "azureADMetricsConfig", "in": "body", "schema": { - "$ref": "#/definitions/azureADHealthUpdateParameter" + "$ref": "#/definitions/azureADMetricsUpdateParameter" }, - "description": "AzureADHealth resource with the tags to be updated." + "description": "AzureADMetrics resource with the tags to be updated." } ], "responses": { "200": { - "description": "OK -- AzureADHealth tags are updated.", + "description": "OK -- AzureADMetrics tags are updated.", "schema": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" } }, "default": { @@ -141,13 +141,13 @@ }, "get": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_Get", - "description": "Gets a azureADHealth instance with a given name.", + "operationId": "azureADMetrics_Get", + "description": "Gets a azureADMetrics instance with a given name.", "x-ms-examples": { - "azureADHealthGet": { - "$ref": "./examples/AzureADHealthGet.json" + "azureADMetricsGet": { + "$ref": "./examples/AzureADMetricsGet.json" } }, "parameters": [ @@ -158,7 +158,7 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/azureADHealthNameParameter" + "$ref": "#/parameters/azureADMetricsNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -166,9 +166,9 @@ ], "responses": { "200": { - "description": "OK -- Returns information about the azureADHealth resource.", + "description": "OK -- Returns information about the azureADMetrics resource.", "schema": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" } }, "default": { @@ -181,13 +181,13 @@ }, "delete": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_Delete", - "description": "Deletes a AzureADHealth resource. When operation completes, status code 200 returned without content.", + "operationId": "azureADMetrics_Delete", + "description": "Deletes a AzureADMetrics resource. When operation completes, status code 200 returned without content.", "x-ms-examples": { - "azureADHealthDelete": { - "$ref": "./examples/AzureADHealthDelete.json" + "azureADMetricsDelete": { + "$ref": "./examples/AzureADMetricsDelete.json" } }, "parameters": [ @@ -198,7 +198,7 @@ "$ref": "#/parameters/resourceGroupNameParameter" }, { - "$ref": "#/parameters/azureADHealthNameParameter" + "$ref": "#/parameters/azureADMetricsNameParameter" }, { "$ref": "#/parameters/apiVersionParameter" @@ -206,10 +206,10 @@ ], "responses": { "200": { - "description": "OK -- azureADHealth resource deleted." + "description": "OK -- azureADMetrics resource deleted." }, "204": { - "description": "azureADHealth does not exist." + "description": "azureADMetrics does not exist." }, "default": { "description": "Error response describing why the operation failed.", @@ -220,16 +220,16 @@ } } }, - "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/azureADHealth": { + "/subscriptions/{subscriptionId}/providers/microsoft.aadiam/azureADMetrics": { "get": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_ListBySubscription", - "description": "Lists all AzureADHealth resources in the given subscription.", + "operationId": "azureADMetrics_ListBySubscription", + "description": "Lists all AzureADMetrics resources in the given subscription.", "x-ms-examples": { - "azureADHealthListBySubscription": { - "$ref": "./examples/AzureADHealthListBySubscription.json" + "azureADMetricsListBySubscription": { + "$ref": "./examples/AzureADMetricsListBySubscription.json" } }, "parameters": [ @@ -242,9 +242,9 @@ ], "responses": { "200": { - "description": "OK -- Returns a list azureADHealth resources.", + "description": "OK -- Returns a list azureADMetrics resources.", "schema": { - "$ref": "#/definitions/azureADHealthListResult" + "$ref": "#/definitions/azureADMetricsListResult" } }, "default": { @@ -259,18 +259,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/azureADHealth": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.aadiam/azureADMetrics": { "get": { "tags": [ - "azureADHealth" + "azureADMetrics" ], - "operationId": "azureADHealth_List", + "operationId": "azureADMetrics_List", "x-ms-examples": { - "azureADHealthGetList": { - "$ref": "./examples/AzureADHealthList.json" + "azureADMetricsGetList": { + "$ref": "./examples/AzureADMetricsList.json" } }, - "description": "Operation to return the list of AzureADHealth resources scoped to the resourceGroup.", + "description": "Operation to return the list of AzureADMetrics resources scoped to the resourceGroup.", "x-ms-pageable": { "nextLinkName": "nextLink" }, @@ -287,13 +287,13 @@ ], "responses": { "200": { - "description": "Successful request to get list of AzureADHealth resources For AzureAD.", + "description": "Successful request to get list of AzureADMetrics resources For AzureAD.", "schema": { - "$ref": "#/definitions/azureADHealthListResult" + "$ref": "#/definitions/azureADMetricsListResult" } }, "default": { - "description": "Error, failed to get list of AzureADHealth resources.", + "description": "Error, failed to get list of AzureADMetrics resources.", "schema": { "$ref": "#/definitions/ErrorResponse" } @@ -303,15 +303,15 @@ } }, "definitions": { - "azureADHealthListResult": { - "description": "A list of AzureADHealth resources", + "azureADMetricsListResult": { + "description": "A list of AzureADMetrics resources", "type": "object", "properties": { "value": { "type": "array", - "description": "Array of AzureADHealth resources.", + "description": "Array of AzureADMetrics resources.", "items": { - "$ref": "#/definitions/azureADHealthConfig" + "$ref": "#/definitions/azureADMetricsConfig" } }, "nextLink": { @@ -320,12 +320,12 @@ } } }, - "azureADHealthConfig": { - "description": "AzureADHealth resource.", + "azureADMetricsConfig": { + "description": "AzureADMetrics resource.", "type": "object", "properties": { "name": { - "description": "Name of the AzureADHealth configuration object.", + "description": "Name of the AzureADMetrics configuration object.", "type": "string" }, "ownerTenantId": { @@ -333,7 +333,7 @@ "type": "string" }, "resourceName": { - "description": "Name of the AzureAdHealth resource", + "description": "Name of the AzureAdMetrics resource", "type": "string" }, "subscriptionId": { @@ -380,9 +380,9 @@ } } }, - "azureADHealthUpdateParameter": { + "azureADMetricsUpdateParameter": { "type": "object", - "description": "AzureADHealth parameters to be updated. ", + "description": "AzureADMetrics parameters to be updated. ", "properties": { "tags": { "type": "object", @@ -446,13 +446,13 @@ "x-ms-parameter-location": "method", "description": "Name of an Azure resource group." }, - "azureADHealthNameParameter": { - "name": "azureADHealthName", + "azureADMetricsNameParameter": { + "name": "azureADMetricsName", "in": "path", "required": true, "type": "string", "x-ms-parameter-location": "method", - "description": "Name of the azureADHealth instance." + "description": "Name of the azureADMetrics instance." } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json similarity index 70% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json index bcd12b04017d..0467c5907b28 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json @@ -2,12 +2,12 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "azureADHealthName": "ddb1", + "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealthConfig": { - "name": "myOrgAzureADHealth", + "azureADMetricsConfig": { + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } @@ -15,18 +15,18 @@ "responses": { "200": { "body": { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } }, "201": { "body": { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json similarity index 71% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json index e4ed674c2deb..829fd7c93202 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json @@ -2,12 +2,12 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "azureADHealthName": "ddb1", + "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealthConfig": { - "name": "myOrgAzureADHealth", + "azureADMetricsConfig": { + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json similarity index 100% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthGet.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json similarity index 100% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthList.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json similarity index 100% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthListBySubscription.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json similarity index 100% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADHealthUpdate.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json From d9d1c40fb918fcbbcd42e599342d6b1e5046cb45 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 13:10:39 -0700 Subject: [PATCH 28/43] Readme changes --- .../azureactivedirectory/resource-manager/readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/readme.md b/specification/azureactivedirectory/resource-manager/readme.md index e646d87003fd..46fe420e432e 100644 --- a/specification/azureactivedirectory/resource-manager/readme.md +++ b/specification/azureactivedirectory/resource-manager/readme.md @@ -35,7 +35,7 @@ These settings apply only when `--tag=package-preview-2020-07` is specified on t ```yaml $(tag) == 'package-preview-2020-07' input-file: - - Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json + - Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json ``` ### Tag: package-preview-2020-03 @@ -61,14 +61,14 @@ input-file: ``` yaml directive: - suppress: BodyTopLevelProperties - from: azureADHealth.json - where: $.definitions.azureADHealthConfig.properties + from: azureADMetrics.json + where: $.definitions.azureADMetricsConfig.properties - suppress: BodyTopLevelProperties from: privateLinkForAzureAD.json where: $.definitions.privateLinkPolicy.properties - suppress: RequiredPropertiesMissingInResourceModel - from: azureADHealth.json - where: $.definitions.azureADHealthConfig + from: azureADMetrics.json + where: $.definitions.azureADMetricsConfig - suppress: RequiredPropertiesMissingInResourceModel from: privateLinkForAzureAD.json where: $.definitions.privateLinkPolicy @@ -130,7 +130,7 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - $(this-folder)/Microsoft.Aadiam/stable/2017-04-01/azureactivedirectory.json - - $(this-folder)/Microsoft.Aadiam/preview/2020-07-01-preview/azureADHealth.json + - $(this-folder)/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json - $(this-folder)/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkForAzureAD.json - $(this-folder)/Microsoft.Aadiam/preview/2020-03-01-preview/privateLinkResources.json From a317dfa32848b402ce64f544a568c5f58a8f68aa Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 13:12:25 -0700 Subject: [PATCH 29/43] azureadmetrics custom word change --- custom-words.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 716a784e50f8..6a31e803cb69 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1781,6 +1781,6 @@ userprincipalname sessionstate sessionhosts hostpool -azureADHealth +azureADMetrics sparkr ambari From eb68e57d186374ea395329cb75ae378c681ad6b0 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 13:24:19 -0700 Subject: [PATCH 30/43] azureadmetrics file updates --- .../2020-07-01-preview/examples/AzureADMetricsGet.json | 6 +++--- .../2020-07-01-preview/examples/AzureADMetricsList.json | 4 ++-- .../examples/AzureADMetricsListBySubscription.json | 4 ++-- .../2020-07-01-preview/examples/AzureADMetricsUpdate.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index d905700925ee..9447d32995b0 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -2,15 +2,15 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "azureADHealthName": "ddb1", + "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview" }, "responses": { "200": { "body": { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index 130255c5729c..b15074810701 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index d0fb8826cc6c..59083e3841b9 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index f13b4fb52591..1020b6266af8 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -2,18 +2,18 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", - "azureADHealthName": "ddb1", + "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", - "azureADHealthConfig": { + "azureADMetricsConfig": { "tags": {} } }, "responses": { "200": { "body": { - "name": "myOrgAzureADHealth", + "name": "myOrgAzureADMetrics", "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADHealth", + "resourceName": "myOrgVnetAzureADMetrics", "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", "resourceGroup": "myOrgVnetRG", "tags": {} From 5390302a37697e14b1ba366129195fd44e56de58 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 15:43:46 -0700 Subject: [PATCH 31/43] properties --- .../2020-07-01-preview/azureADMetrics.json | 27 +++++-------------- .../examples/AzureADMetricsCreate.json | 18 ++++--------- .../examples/AzureADMetricsGet.json | 6 ++--- .../examples/AzureADMetricsList.json | 6 ++--- .../AzureADMetricsListBySubscription.json | 6 ++--- .../examples/AzureADMetricsUpdate.json | 8 ++---- 6 files changed, 19 insertions(+), 52 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 3cb43c4dd300..2f8d4e178756 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -324,32 +324,17 @@ "description": "AzureADMetrics resource.", "type": "object", "properties": { - "name": { - "description": "Name of the AzureADMetrics configuration object.", - "type": "string" - }, - "ownerTenantId": { - "description": "Guid of the owner tenant", - "type": "string" - }, - "resourceName": { - "description": "Name of the AzureAdMetrics resource", + "id": { + "description": "ID of the AzureADMetrics configuration object.", "type": "string" }, - "subscriptionId": { - "description": "Subscription Identifier", + "name": { + "description": "Name of the AzureADMetrics configuration object.", "type": "string" }, - "resourceGroup": { - "description": "Name of the resource group", + "type": { + "description": "Type of the AzureADMetrics configuration object.", "type": "string" - }, - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } } }, "allOf": [ diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json index 0467c5907b28..1ec6d4fb7f00 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json @@ -5,30 +5,22 @@ "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", "azureADMetricsConfig": { - "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "name": "myOrgAzureADMetrics" } }, "responses": { "200": { "body": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "type": "Microsoft.Aadiam/azureADMetrics" } }, "201": { "body": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "type": "Microsoft.Aadiam/azureADMetrics" } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 9447d32995b0..dcb2e7b86680 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -8,11 +8,9 @@ "responses": { "200": { "body": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "type": "Microsoft.Aadiam/azureADMetrics" } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index b15074810701..ae51908cd4c5 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -9,11 +9,9 @@ "body": { "value": [ { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "type": "Microsoft.Aadiam/azureADMetrics" } ], "nextLink": "null" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index 59083e3841b9..ab74ddb03a8f 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -8,11 +8,9 @@ "body": { "value": [ { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "type": "Microsoft.Aadiam/azureADMetrics" } ], "nextLink": "null" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index 1020b6266af8..b40409e35742 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -5,18 +5,14 @@ "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", "azureADMetricsConfig": { - "tags": {} } }, "responses": { "200": { "body": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG", - "tags": {} + "type": "Microsoft.Aadiam/azureADMetrics" } } } From 82bf75ddeb04b2dbaa4177bc0a9fd1a65f75c2dc Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 16:05:03 -0700 Subject: [PATCH 32/43] quick prettier fix --- .../2020-07-01-preview/examples/AzureADMetricsUpdate.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index b40409e35742..2351f9db2bab 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -4,8 +4,7 @@ "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", - "azureADMetricsConfig": { - } + "azureADMetricsConfig": {} }, "responses": { "200": { From dac496d53cf61a1b640dd01a071cbe9850087be6 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Thu, 4 Jun 2020 19:14:29 -0700 Subject: [PATCH 33/43] minor change to run tests again --- .../examples/AzureADMetricsListBySubscription.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index ab74ddb03a8f..4279adbd3286 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/Microsoft.Aadiam/azureADMetrics", "name": "myOrgAzureADMetrics", "type": "Microsoft.Aadiam/azureADMetrics" } From 7e36d10cd644fd5310416792628fce54f32614dc Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 5 Jun 2020 15:14:26 -0700 Subject: [PATCH 34/43] addressing comments --- .../2020-07-01-preview/azureADMetrics.json | 29 +++++++++---------- .../examples/AzureADMetricsCreate.json | 16 +++++----- .../examples/AzureADMetricsDelete.json | 6 +--- .../examples/AzureADMetricsGet.json | 2 +- .../examples/AzureADMetricsList.json | 2 +- .../AzureADMetricsListBySubscription.json | 5 ++-- .../examples/AzureADMetricsUpdate.json | 9 ++++-- 7 files changed, 33 insertions(+), 36 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 2f8d4e178756..037dd5957f35 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -72,13 +72,13 @@ ], "responses": { "200": { - "description": "Created -- AzureADMetrics instance created.", + "description": "OK -- AzureADMetrics instance is updated.", "schema": { "$ref": "#/definitions/azureADMetricsConfig" } }, "201": { - "description": "OK -- AzureADMetrics instance is updated.", + "description": "Created -- AzureADMetrics instance created.", "schema": { "$ref": "#/definitions/azureADMetricsConfig" } @@ -312,11 +312,13 @@ "description": "Array of AzureADMetrics resources.", "items": { "$ref": "#/definitions/azureADMetricsConfig" - } + }, + "readOnly": true }, "nextLink": { "description": "The link used to get the next page of operations.", - "type": "string" + "type": "string", + "readOnly": true } } }, @@ -324,22 +326,17 @@ "description": "AzureADMetrics resource.", "type": "object", "properties": { - "id": { - "description": "ID of the AzureADMetrics configuration object.", - "type": "string" - }, - "name": { - "description": "Name of the AzureADMetrics configuration object.", - "type": "string" - }, - "type": { - "description": "Type of the AzureADMetrics configuration object.", - "type": "string" + "tags": { + "type": "object", + "description": "Resource tags.", + "additionalProperties": { + "type": "string" + } } }, "allOf": [ { - "$ref": "#/definitions/AzureResourceBase" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ] }, diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json index 1ec6d4fb7f00..3996dd624ac7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json @@ -5,22 +5,24 @@ "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", "azureADMetricsConfig": { - "name": "myOrgAzureADMetrics" + "tags": {} } }, "responses": { "200": { "body": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", - "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", + "name": "azureADMetricsName", + "type": "Microsoft.Aadiam/azureADMetrics", + "tags": {} } }, "201": { "body": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", - "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", + "name": "azureADMetricsName", + "type": "Microsoft.Aadiam/azureADMetrics", + "tags": {} } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json index 829fd7c93202..351a19b38bc8 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json @@ -5,11 +5,7 @@ "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", "azureADMetricsConfig": { - "name": "myOrgAzureADMetrics", - "ownerTenantId": "950f8bca-bf4d-4a41-ad10-034e792a243d", - "resourceName": "myOrgVnetAzureADMetrics", - "subscriptionId": "57849194-ea1f-470b-abda-d195b25634c1", - "resourceGroup": "myOrgVnetRG" + "name": "myOrgAzureADMetrics" } }, "responses": { diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index dcb2e7b86680..3e6dbaf061a0 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -8,7 +8,7 @@ "responses": { "200": { "body": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", "type": "Microsoft.Aadiam/azureADMetrics" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index ae51908cd4c5..6331bb9dbd7e 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", "type": "Microsoft.Aadiam/azureADMetrics" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index 4279adbd3286..7b9cc87ed126 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -8,12 +8,11 @@ "body": { "value": [ { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/Microsoft.Aadiam/azureADMetrics", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", "type": "Microsoft.Aadiam/azureADMetrics" } - ], - "nextLink": "null" + ] } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index 2351f9db2bab..fa25d1fc9919 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -4,14 +4,17 @@ "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", - "azureADMetricsConfig": {} + "azureADMetricsConfig": { + "tags": {} + } }, "responses": { "200": { "body": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "type": "Microsoft.Aadiam/azureADMetrics", + "tags": {} } } } From f5619a77fc6a3f750a4a747677555adccd85b9a1 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 5 Jun 2020 16:06:24 -0700 Subject: [PATCH 35/43] location and tag changes --- .../2020-07-01-preview/examples/AzureADMetricsCreate.json | 7 +++++-- .../2020-07-01-preview/examples/AzureADMetricsGet.json | 7 +++++-- .../2020-07-01-preview/examples/AzureADMetricsList.json | 6 +++--- .../examples/AzureADMetricsListBySubscription.json | 3 ++- .../2020-07-01-preview/examples/AzureADMetricsUpdate.json | 4 +++- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json index 3996dd624ac7..5c633c72ac1a 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json @@ -5,6 +5,7 @@ "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", "azureADMetricsConfig": { + "location": "West US", "tags": {} } }, @@ -14,7 +15,8 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "azureADMetricsName", "type": "Microsoft.Aadiam/azureADMetrics", - "tags": {} + "tags": {}, + "location": "West US" } }, "201": { @@ -22,7 +24,8 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "azureADMetricsName", "type": "Microsoft.Aadiam/azureADMetrics", - "tags": {} + "tags": {}, + "location": "West US" } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 3e6dbaf061a0..4377e633cb00 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -3,14 +3,17 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", - "api-version": "2020-07-01-preview" + "api-version": "2020-07-01-preview", + "location": "West US" }, "responses": { "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "type": "Microsoft.Aadiam/azureADMetrics", + "tags": {}, + "location": "West US" } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index 6331bb9dbd7e..a13a6e99e54a 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -11,10 +11,10 @@ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "type": "Microsoft.Aadiam/azureADMetrics", + "location": "West US" } - ], - "nextLink": "null" + ] } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index 7b9cc87ed126..70409fc93f95 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -10,7 +10,8 @@ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics" + "type": "Microsoft.Aadiam/azureADMetrics", + "location": "West US" } ] } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index fa25d1fc9919..8083657de7b3 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -4,6 +4,7 @@ "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", "api-version": "2020-07-01-preview", + "location": "West US", "azureADMetricsConfig": { "tags": {} } @@ -14,7 +15,8 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "myOrgAzureADMetrics", "type": "Microsoft.Aadiam/azureADMetrics", - "tags": {} + "tags": {}, + "location": "West US" } } } From 46e70dc1bbdf14dc6760c0a16772d741472240e1 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 5 Jun 2020 16:23:31 -0700 Subject: [PATCH 36/43] delete doesnt take in param --- .../2020-07-01-preview/examples/AzureADMetricsDelete.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json index 351a19b38bc8..87571e561014 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsDelete.json @@ -3,10 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", - "api-version": "2020-07-01-preview", - "azureADMetricsConfig": { - "name": "myOrgAzureADMetrics" - } + "api-version": "2020-07-01-preview" }, "responses": { "200": {}, From a5d964afdad1d4f295c32515b1d35ce69d070d2c Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 5 Jun 2020 16:28:52 -0700 Subject: [PATCH 37/43] removed duplicate tag def --- .../preview/2020-07-01-preview/azureADMetrics.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 037dd5957f35..b2a1807a20f7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -326,13 +326,6 @@ "description": "AzureADMetrics resource.", "type": "object", "properties": { - "tags": { - "type": "object", - "description": "Resource tags.", - "additionalProperties": { - "type": "string" - } - } }, "allOf": [ { From d4c5a8ea37b85ec9dddf380d2b390d73ac04c84a Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Fri, 5 Jun 2020 16:32:41 -0700 Subject: [PATCH 38/43] syntax check --- .../preview/2020-07-01-preview/azureADMetrics.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index b2a1807a20f7..b92885ae11ab 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -325,8 +325,7 @@ "azureADMetricsConfig": { "description": "AzureADMetrics resource.", "type": "object", - "properties": { - }, + "properties": {}, "allOf": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" From ae6c9baf30451177ec4907e58dc062b4c7a1cc21 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Mon, 8 Jun 2020 12:17:07 -0700 Subject: [PATCH 39/43] comment changes, except the provisioningState change --- .../2020-07-01-preview/azureADMetrics.json | 22 ------------------- .../examples/AzureADMetricsCreate.json | 4 ++-- .../examples/AzureADMetricsGet.json | 5 ++--- .../examples/AzureADMetricsList.json | 2 +- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index b92885ae11ab..cc23223487f1 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -332,28 +332,6 @@ } ] }, - "AzureResourceBase": { - "x-ms-azure-resource": true, - "type": "object", - "description": "Common properties for all Azure resources.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "String Id used to locate any resource on Azure." - }, - "name": { - "readOnly": false, - "type": "string", - "description": "Name of this resource." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Type of this resource." - } - } - }, "azureADMetricsUpdateParameter": { "type": "object", "description": "AzureADMetrics parameters to be updated. ", diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json index 5c633c72ac1a..b32c03c8c47a 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json @@ -13,7 +13,7 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "azureADMetricsName", + "name": "ddb1", "type": "Microsoft.Aadiam/azureADMetrics", "tags": {}, "location": "West US" @@ -22,7 +22,7 @@ "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "azureADMetricsName", + "name": "ddb1", "type": "Microsoft.Aadiam/azureADMetrics", "tags": {}, "location": "West US" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 4377e633cb00..5ab7e14be0c0 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -3,14 +3,13 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "rg1", "azureADMetricsName": "ddb1", - "api-version": "2020-07-01-preview", - "location": "West US" + "api-version": "2020-07-01-preview" }, "responses": { "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "myOrgAzureADMetrics", + "name": "ddb1", "type": "Microsoft.Aadiam/azureADMetrics", "tags": {}, "location": "West US" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index a13a6e99e54a..c98b3fdd432c 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -10,7 +10,7 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "myOrgAzureADMetrics", + "name": "ddb1", "type": "Microsoft.Aadiam/azureADMetrics", "location": "West US" } From 75170ff0f329d6b44e8a7a3d1c7391234a67449e Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Mon, 8 Jun 2020 13:26:26 -0700 Subject: [PATCH 40/43] provisioningstate property addition --- .../2020-07-01-preview/azureADMetrics.json | 11 ++++++++--- ...ate.json => AzureADMetricsCreateOrUpdate.json} | 15 +++++++++++---- .../examples/AzureADMetricsGet.json | 7 +++++-- .../examples/AzureADMetricsList.json | 7 +++++-- .../AzureADMetricsListBySubscription.json | 9 ++++++--- .../examples/AzureADMetricsUpdate.json | 9 ++++++--- 6 files changed, 41 insertions(+), 17 deletions(-) rename specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/{AzureADMetricsCreate.json => AzureADMetricsCreateOrUpdate.json} (70%) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index cc23223487f1..0a9db641a083 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -39,12 +39,12 @@ "tags": [ "azureADMetrics" ], - "operationId": "azureADMetrics_Create", + "operationId": "azureADMetrics_CreateOrUpdate", "x-ms-long-running-operation": true, "description": "Creates a azureADMetrics instance.", "x-ms-examples": { "azureADMetricsCreate": { - "$ref": "./examples/AzureADMetricsCreate.json" + "$ref": "./examples/AzureADMetricsCreateOrUpdate.json" } }, "parameters": [ @@ -325,7 +325,12 @@ "azureADMetricsConfig": { "description": "AzureADMetrics resource.", "type": "object", - "properties": {}, + "properties": { + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource." + } + }, "allOf": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json similarity index 70% rename from specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json rename to specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json index b32c03c8c47a..322c2247ac52 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json @@ -13,19 +13,26 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", + "location": "West US", "name": "ddb1", - "type": "Microsoft.Aadiam/azureADMetrics", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, - "location": "West US" + "type": "Microsoft.Aadiam/azureADMetrics" } }, "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", + "location": "West US", "name": "ddb1", - "type": "Microsoft.Aadiam/azureADMetrics", + "properties": { + "provisioningState": "Created" + }, "tags": {}, - "location": "West US" + "type": "Microsoft.Aadiam/azureADMetrics" + } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 5ab7e14be0c0..8dbfdc69b9d7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -10,9 +10,12 @@ "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", - "type": "Microsoft.Aadiam/azureADMetrics", + "location": "West US", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, - "location": "West US" + "type": "Microsoft.Aadiam/azureADMetrics" } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index c98b3fdd432c..519c5cc740f1 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -11,8 +11,11 @@ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", - "type": "Microsoft.Aadiam/azureADMetrics", - "location": "West US" + "location": "West US", + "properties": { + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Aadiam/azureADMetrics" } ] } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index 70409fc93f95..f8bf57a8f2be 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -9,9 +9,12 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics", - "location": "West US" + "name": "ddb1", + "location": "West US", + "properties": { + "provisioningState": "Succeeded" + }, + "type": "Microsoft.Aadiam/azureADMetrics" } ] } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index 8083657de7b3..bc7f75389954 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -13,10 +13,13 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", - "name": "myOrgAzureADMetrics", - "type": "Microsoft.Aadiam/azureADMetrics", + "location": "West US", + "name": "ddb1", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, - "location": "West US" + "type": "Microsoft.Aadiam/azureADMetrics" } } } From 00718be8d98165d5e456313ab529f177963a8b3c Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Mon, 8 Jun 2020 14:19:42 -0700 Subject: [PATCH 41/43] provisioningState example fixes --- .../preview/2020-07-01-preview/azureADMetrics.json | 4 ++-- .../examples/AzureADMetricsCreateOrUpdate.json | 9 ++------- .../2020-07-01-preview/examples/AzureADMetricsGet.json | 4 +--- .../2020-07-01-preview/examples/AzureADMetricsList.json | 4 +--- .../examples/AzureADMetricsListBySubscription.json | 4 +--- .../examples/AzureADMetricsUpdate.json | 4 +--- 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 0a9db641a083..11697c8aeb12 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -327,8 +327,8 @@ "type": "object", "properties": { "provisioningState": { - "type": "string", - "description": "The provisioning state of the resource." + "description": "The provisioning state of the resource.", + "type": "string" } }, "allOf": [ diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json index 322c2247ac52..49d7ffa4d2a2 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json @@ -15,9 +15,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "properties": { - "provisioningState": "Succeeded" - }, + "provisioningState": "Succeeded", "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } @@ -27,12 +25,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "properties": { - "provisioningState": "Created" - }, + "provisioningState": "Created", "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" - } } } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 8dbfdc69b9d7..1017b9e82815 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -11,9 +11,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "properties": { - "provisioningState": "Succeeded" - }, + "provisioningState": "Succeeded", "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index 519c5cc740f1..68ccc14d8ce9 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -12,9 +12,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "properties": { - "provisioningState": "Succeeded" - }, + "provisioningState": "Succeeded", "type": "Microsoft.Aadiam/azureADMetrics" } ] diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index f8bf57a8f2be..1260fdddcc01 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -11,9 +11,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "properties": { - "provisioningState": "Succeeded" - }, + "provisioningState": "Succeeded", "type": "Microsoft.Aadiam/azureADMetrics" } ] diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index bc7f75389954..09e6dcb4a74a 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -15,9 +15,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "properties": { - "provisioningState": "Succeeded" - }, + "provisioningState": "Succeeded", "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } From 493695b6768a0445139c2cfa825bc2a3957f6028 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Mon, 8 Jun 2020 16:39:55 -0700 Subject: [PATCH 42/43] properties fix --- .../2020-07-01-preview/azureADMetrics.json | 16 +++++++++++++--- .../examples/AzureADMetricsCreateOrUpdate.json | 8 ++++++-- .../examples/AzureADMetricsGet.json | 4 +++- .../examples/AzureADMetricsList.json | 4 +++- .../AzureADMetricsListBySubscription.json | 4 +++- .../examples/AzureADMetricsUpdate.json | 4 +++- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 11697c8aeb12..62da70fc0b57 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -326,9 +326,19 @@ "description": "AzureADMetrics resource.", "type": "object", "properties": { - "provisioningState": { - "description": "The provisioning state of the resource.", - "type": "string" + "properties": { + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource.", + "enum": [ + "Succeeded", + "Created" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + } } }, "allOf": [ diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json index 49d7ffa4d2a2..5c9e06214b75 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsCreateOrUpdate.json @@ -15,7 +15,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "provisioningState": "Succeeded", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } @@ -25,7 +27,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "provisioningState": "Created", + "properties": { + "provisioningState": "Created" + }, "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json index 1017b9e82815..8dbfdc69b9d7 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json @@ -11,7 +11,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "provisioningState": "Succeeded", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json index 68ccc14d8ce9..519c5cc740f1 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json @@ -12,7 +12,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "provisioningState": "Succeeded", + "properties": { + "provisioningState": "Succeeded" + }, "type": "Microsoft.Aadiam/azureADMetrics" } ] diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json index 1260fdddcc01..f8bf57a8f2be 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json @@ -11,7 +11,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "name": "ddb1", "location": "West US", - "provisioningState": "Succeeded", + "properties": { + "provisioningState": "Succeeded" + }, "type": "Microsoft.Aadiam/azureADMetrics" } ] diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json index 09e6dcb4a74a..bc7f75389954 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json @@ -15,7 +15,9 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1", "location": "West US", "name": "ddb1", - "provisioningState": "Succeeded", + "properties": { + "provisioningState": "Succeeded" + }, "tags": {}, "type": "Microsoft.Aadiam/azureADMetrics" } From 35545ac23b54b5dd1778c0ca34056f6f4ba7cfb7 Mon Sep 17 00:00:00 2001 From: Hyewon Lee Date: Mon, 8 Jun 2020 17:20:26 -0700 Subject: [PATCH 43/43] semantic validation error fix --- .../2020-07-01-preview/azureADMetrics.json | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json index 62da70fc0b57..1111208831f3 100644 --- a/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json +++ b/specification/azureactivedirectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json @@ -327,18 +327,7 @@ "type": "object", "properties": { "properties": { - "provisioningState": { - "type": "string", - "description": "The provisioning state of the resource.", - "enum": [ - "Succeeded", - "Created" - ], - "x-ms-enum": { - "name": "ProvisioningState", - "modelAsString": true - } - } + "$ref": "#/definitions/AzureADMetricsPropertiesFormat" } }, "allOf": [ @@ -347,6 +336,24 @@ } ] }, + "AzureADMetricsPropertiesFormat": { + "properties": { + "provisioningState": { + "type": "string", + "description": "The provisioning state of the resource.", + "enum": [ + "Succeeded", + "Created", + "Failed" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + }, + "readOnly": true + } + } + }, "azureADMetricsUpdateParameter": { "type": "object", "description": "AzureADMetrics parameters to be updated. ",