Skip to content

Commit

Permalink
Merge branch 'main' into get-rid-of-extra-resourcegroupnameparameter-…
Browse files Browse the repository at this point in the history
…in-monitor
  • Loading branch information
ArcturusZhang committed Dec 9, 2021
2 parents b5cd553 + 85d1147 commit 14877dd
Show file tree
Hide file tree
Showing 423 changed files with 45,731 additions and 1,146 deletions.
2 changes: 1 addition & 1 deletion .github/issue_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
- rule:
booleanFilterExpression: "APIStewardshipBoard-ReviewRequested"
assignees:
- mikekistler


8 changes: 8 additions & 0 deletions .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@
reviewers:
- zhenglaizhang

- rule:
paths:
- "specification/videoanalyzer/resource-manager/**"
- "specification/cognitiveservices/resource-manager/**"
- "specification/dataprotection/**"
reviewers:
- xiaoxuqi-ms

- rule:
paths:
- "documentation/**"
Expand Down
14 changes: 10 additions & 4 deletions arm-compute/quickstart-templates/aliases.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
},
"openSUSE-Leap": {
"publisher": "SUSE",
"offer": "openSUSE-Leap",
"sku": "42.3",
"offer": "opensuse-leap-15-3",
"sku": "gen2",
"version": "latest"
},
"RHEL": {
Expand All @@ -41,8 +41,8 @@
},
"SLES": {
"publisher": "SUSE",
"offer": "SLES",
"sku": "15",
"offer": "sles-15-sp3",
"sku": "gen2",
"version": "latest"
},
"UbuntuLTS": {
Expand All @@ -53,6 +53,12 @@
}
},
"Windows": {
"Win2022Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2022-Datacenter",
"version": "latest"
},
"Win2019Datacenter": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
Expand Down
19 changes: 18 additions & 1 deletion custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ decisionrule
decodable
Decompounder
dedicatedhsm
dedup
deduping
deduplication
defanged
Expand Down Expand Up @@ -2404,6 +2405,7 @@ DOCM
PPSX
PPTM
XLSM
xcool
DOCM
multislot
noAddressPrefixes
Expand Down Expand Up @@ -2439,4 +2441,19 @@ stackset
CSPM
autoprovisioning
schemagroups
videoanalyzer
videoanalyzer
loadtestservice
testmanager
additionalmetrics
loadtests
appcomponents
clientmetrics
vusers
clientmetric
testruns
odatatestxx
testrun
loadtest
xvalue
yvalue
servermetrics
3 changes: 1 addition & 2 deletions specification/azsadmin/resource-manager/compute/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ directive:
- $.definitions.ScaleUnit
suppress:
- NestedResourcesMustHaveListOperation
reason:
- CRP cannot support the list API for scale units due to the undesired load that would inflict on the system
reason: 'CRP cannot support the list API for scale units due to the undesired load that would inflict on the system'
```
### Tag: package-2021-09-01
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@
"Successful query": {
"$ref": "./examples/questionanswering/authoring/SuccessfulDeleteProject.json"
}
}
},
"x-ms-long-running-operation": true
}
},
"/query-knowledgebases/projects/deletion-jobs/{jobId}": {
Expand Down
113 changes: 113 additions & 0 deletions specification/common-types/resource-management/v4/managedidentity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"swagger": "2.0",
"info": {
"version": "4.0",
"title": "Common types"
},
"paths": {},
"definitions": {
"UserAssignedIdentities": {
"title": "User-Assigned Identities",
"description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedIdentity"
}
},
"UserAssignedIdentity": {
"type": "object",
"description": "User assigned identity properties",
"properties": {
"principalId": {
"description": "The principal ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
},
"clientId": {
"description": "The client ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
}
}
},
"ManagedServiceIdentityType": {
"description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
"enum": [
"None",
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ManagedServiceIdentityType",
"modelAsString": true
}
},
"ManagedServiceIdentity": {
"description": "Managed service identity (system assigned and/or user assigned identities)",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"type": {
"$ref": "#/definitions/ManagedServiceIdentityType"
},
"userAssignedIdentities": {
"$ref": "#/definitions/UserAssignedIdentities"
}
},
"required": [
"type"
]
},
"SystemAssignedServiceIdentityType": {
"description": "Type of managed service identity (either system assigned, or none).",
"enum": [
"None",
"SystemAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "SystemAssignedServiceIdentityType",
"modelAsString": true
}
},
"SystemAssignedServiceIdentity": {
"description": "Managed service identity (either system assigned, or none)",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"type": {
"$ref": "#/definitions/SystemAssignedServiceIdentityType"
}
},
"required": [
"type"
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ input-file:
- preview/2021-10-08-preview/CommunicationNetworkTraversal.json
```

### Tag: package-2022-02-01

These settings apply only when `--tag=package-2022-02-01` is specified on the command line.

```yaml $(tag) == 'package-2022-02-01'
input-file:
- stable/2022-02-01/CommunicationNetworkTraversal.json
```

---

# Code Generation
Expand Down
Loading

0 comments on commit 14877dd

Please sign in to comment.