Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding new resource type azureADMetrics #9636

Merged
merged 45 commits into from
Jun 9, 2020
Merged

Adding new resource type azureADMetrics #9636

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
73bc0e7
Adds base for updating Microsoft.Aadiam from version preview/2020-03-…
hyewonlee98 May 27, 2020
62e7cda
Updates readme
hyewonlee98 May 27, 2020
84f06b2
Updates API version in new specs and examples
hyewonlee98 May 27, 2020
ea899b6
added azureADHealth
May 27, 2020
7e8d0b3
rough commit (without examples) for azureADHealth
ablank-at-microsoft May 28, 2020
3dba457
changed Ad to AD
May 28, 2020
6b215ba
added examples for azureadhealth
May 28, 2020
06fda6b
removed private link files from 2020-07-01 preview
May 28, 2020
a74ae8c
examples updated for azureadhealth
May 28, 2020
6e6f749
removed alltenants and tenants params from examples
May 28, 2020
8f13e5f
Fix Linting errors
ablank-at-microsoft May 28, 2020
f249ddc
Update readme to make avocado fix
ablank-at-microsoft May 28, 2020
735ab69
minor fix
May 29, 2020
a20808f
custom word addition
May 29, 2020
ca45c83
Update examples to match spec
ablank-at-microsoft May 29, 2020
4012b33
Make PrivateLinkPolicyName parameter have same values to solve LintDi…
ablank-at-microsoft May 29, 2020
5b90122
Make subscriptionIdParameter identical in all json files
ablank-at-microsoft May 29, 2020
c2f4769
error fixes for all model errors
May 29, 2020
ede7c14
fixed model validation error
May 29, 2020
bf2eb56
additional suppressions for pascal case and operations
May 29, 2020
7790aae
added azureadhealth in readme to fix avocado error
May 29, 2020
83686dd
added privatelink api version along with azureadhealth
May 29, 2020
e94db35
changed api version to the filepath version
May 29, 2020
1464be2
modified for corrections on AzureADHealthGet
Jun 2, 2020
be8e838
Merge branch 'master' into dev-azureactivedirectory-Microsoft.Aadiam-…
hyewonlee98 Jun 3, 2020
055a910
aded changes to match spec and example
Jun 3, 2020
2ae0756
Merge branch 'dev-azureactivedirectory-Microsoft.Aadiam-2020-07-01-pr…
Jun 3, 2020
34e8a29
reverted passing commit from before
Jun 3, 2020
953e8fa
renamed to azureadmetrics
Jun 4, 2020
d9d1c40
Readme changes
Jun 4, 2020
a317dfa
azureadmetrics custom word change
Jun 4, 2020
eb68e57
azureadmetrics file updates
Jun 4, 2020
5390302
properties
Jun 4, 2020
82bf75d
quick prettier fix
Jun 4, 2020
dac496d
minor change to run tests again
Jun 5, 2020
7e36d10
addressing comments
Jun 5, 2020
f5619a7
location and tag changes
Jun 5, 2020
46e70dc
delete doesnt take in param
Jun 5, 2020
a5d964a
removed duplicate tag def
Jun 5, 2020
d4c5a8e
syntax check
Jun 5, 2020
ae6c9ba
comment changes, except the provisioningState change
Jun 8, 2020
75170ff
provisioningstate property addition
Jun 8, 2020
00718be
provisioningState example fixes
Jun 8, 2020
493695b
properties fix
Jun 8, 2020
35545ac
semantic validation error fix
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions ...irectory/resource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/azureADMetrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"tags": [
"azureADMetrics"
],
"operationId": "azureADMetrics_Create",
"operationId": "azureADMetrics_CreateOrUpdate",
"x-ms-long-running-operation": true,
hyewonlee98 marked this conversation as resolved.
Show resolved Hide resolved
"description": "Creates a azureADMetrics instance.",
"x-ms-examples": {
"azureADMetricsCreate": {
"$ref": "./examples/AzureADMetricsCreate.json"
"$ref": "./examples/AzureADMetricsCreateOrUpdate.json"
}
},
"parameters": [
Expand Down Expand Up @@ -325,35 +325,18 @@
"azureADMetricsConfig": {
"description": "AzureADMetrics resource.",
"type": "object",
"properties": {},
"properties": {
"provisioningState": {
"description": "The provisioning state of the resource.",
"type": "string"
}
hyewonlee98 marked this conversation as resolved.
Show resolved Hide resolved
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
]
},
"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. ",
Expand Down
14 changes: 8 additions & 6 deletions ...review/examples/AzureADMetricsCreate.json → ...xamples/AzureADMetricsCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Aadiam/azureADMetrics/ddb1",
"name": "azureADMetricsName",
"type": "Microsoft.Aadiam/azureADMetrics",
"location": "West US",
"name": "ddb1",
"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",
"name": "azureADMetricsName",
"type": "Microsoft.Aadiam/azureADMetrics",
"location": "West US",
"name": "ddb1",
"provisioningState": "Created",
hyewonlee98 marked this conversation as resolved.
Show resolved Hide resolved
"tags": {},
"location": "West US"
"type": "Microsoft.Aadiam/azureADMetrics"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...ource-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"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",
"type": "Microsoft.Aadiam/azureADMetrics",
"name": "ddb1",
"location": "West US",
"provisioningState": "Succeeded",
"tags": {},
"location": "West US"
"type": "Microsoft.Aadiam/azureADMetrics"
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions ...urce-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"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",
"provisioningState": "Succeeded",
"type": "Microsoft.Aadiam/azureADMetrics"
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions ...icrosoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
"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",
"provisioningState": "Succeeded",
"type": "Microsoft.Aadiam/azureADMetrics"
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions ...ce-manager/Microsoft.Aadiam/preview/2020-07-01-preview/examples/AzureADMetricsUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
"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",
"provisioningState": "Succeeded",
"tags": {},
"location": "West US"
"type": "Microsoft.Aadiam/azureADMetrics"
}
}
}
Expand Down