-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
[Hub Generated] Review request for Microsoft.HybridCompute to add version preview/2023-03-15-preview #22933
Merged
XiaofeiCao
merged 29 commits into
main
from
dkirby017-hybridcompute-Microsoft.HybridCompute-2023-03-15-preview
Apr 20, 2023
Merged
[Hub Generated] Review request for Microsoft.HybridCompute to add version preview/2023-03-15-preview #22933
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
8aa21c4
Adds base for updating Microsoft.HybridCompute from version preview/2…
dkirby017 35c83eb
Updates readme
dkirby017 19d9e80
Updates API version in new specs and examples
dkirby017 cf451ef
add HybridIdentityMetadata read-only proxy resource to new api version
dkirby017 001f8b0
add kind property to machines on the new api version
dkirby017 a3c0827
update description for kind and updated examples
dkirby017 0676fd6
update desription for kind
dkirby017 d3b45d5
clear kind from examples
dkirby017 6f1cc2a
remove readonly from kind
dkirby017 5009015
small change
dorothyhu 41d9891
used v3 instead of v2
dorothyhu b62243f
added kind to machineUpdate
dorothyhu 55396b7
testing
shmalhotra ce7ac8d
added get agent versions api
shmalhotra 261ee75
trigger pipeline again
shmalhotra 8598da5
fixed agent list model
dorothyhu 040fcad
fixed the get latest agent version example
dorothyhu 4b8e7f2
added ostype and changed route
shmalhotra 093ef20
experience with agent version get for latest
dorothyhu 77317db
ran npm prettier
dorothyhu 1d5781f
unified tags and changed the agent version get description
dorothyhu 041eda3
fixed prettier check
shmalhotra b8ab2b0
fixed conflict
shmalhotra ee7d54c
update description
shmalhotra e478599
quynh changes
shmalhotra 89955ed
Added missing lastAttemptDesiredVersion
PakDLiu f40dc60
Added x-ms-identifiers for AgentVersionsList
PakDLiu 9244e31
Removed kind in Machine_Update.json
PakDLiu 08b2819
ran prettier
PakDLiu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2,208 changes: 2,208 additions & 0 deletions
2,208
...te/resource-manager/Microsoft.HybridCompute/preview/2023-03-15-preview/HybridCompute.json
Large diffs are not rendered by default.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
...-manager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/DELETEExtension.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscriptionId}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "machineName": "myMachine", | ||
| "extensionName": "MMA", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": {}, | ||
| "202": { | ||
| "headers": { | ||
| "Location": "{callbackUrl}", | ||
| "Retry-After": 200, | ||
| "Azure-AsyncOperation": "{callbackUri}" | ||
| } | ||
| }, | ||
| "204": {} | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...er/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/ExtensionMetadata_Get.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", | ||
| "location": "EastUS", | ||
| "publisher": "microsoft.azure.monitor", | ||
| "extensionType": "azuremonitorlinuxagent", | ||
| "version": "1.9.1", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/Providers/Microsoft.HybridCompute/locations/eastus/publishers/microsoft.azure.monitor/extensionTypes/azuremonitorlinuxagent/versions/1.9.1", | ||
| "properties": { | ||
| "version": "1.9.1", | ||
| "extensionType": "azuremonitorlinuxagent", | ||
| "publisher": "microsoft.azure.monitor" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
...r/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/ExtensionMetadata_List.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", | ||
| "location": "EastUS", | ||
| "publisher": "microsoft.azure.monitor", | ||
| "extensionType": "azuremonitorlinuxagent", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "properties": { | ||
| "version": "1.9.1", | ||
| "extensionType": "azuremonitorlinuxagent", | ||
| "publisher": "microsoft.azure.monitor" | ||
| }, | ||
| "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/Providers/Microsoft.HybridCompute/locations/eastus/publishers/microsoft.azure.monitor/extensionTypes/azuremonitorlinuxagent/versions/1.9.1" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "version": "1.9.2", | ||
| "extensionType": "azuremonitorlinuxagent", | ||
| "publisher": "microsoft.azure.monitor" | ||
| }, | ||
| "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/Providers/Microsoft.HybridCompute/locations/eastus/publishers/microsoft.azure.monitor/extensionTypes/azuremonitorlinuxagent/versions/1.9.2" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
...nager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/Extensions_Upgrade.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscriptionId}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "machineName": "myMachine", | ||
| "api-version": "2023-03-15-preview", | ||
| "extensionUpgradeParameters": { | ||
| "extensionTargets": { | ||
| "Microsoft.Compute.CustomScriptExtension": { | ||
| "targetVersion": "1.10" | ||
| }, | ||
| "Microsoft.Azure.Monitoring": { | ||
| "targetVersion": "2.0" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": {}, | ||
| "202": { | ||
| "headers": { | ||
| "Location": "{callbackUrl}", | ||
| "Retry-After": 200, | ||
| "Azure-AsyncOperation": "{callbackUri}" | ||
| } | ||
| } | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...manager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/GETAgentVersions.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "parameters": { | ||
| "osType": "myOsType", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "agentVersion": "1.26", | ||
| "downloadLink": "https://download.microsoft.com/download/8/4/5/845d5e04-bb09-4ed2-9ca8-bb51184cddc9/AzureConnectedMachineAgent.msi", | ||
| "osType": "myOsType" | ||
| }, | ||
| { | ||
| "agentVersion": "1.27", | ||
| "downloadLink": "https://download.microsoft.com/download/8/4/5/845d5e04-bb09-4ed2-9ca8-bb51184cddc9/AzureConnectedMachineAgent.msi", | ||
| "osType": "myOsType" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
...rce-manager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/GETExtension.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscriptionId}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "machineName": "myMachine", | ||
| "extensionName": "CustomScriptExtension", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/Machines/myMachine/Extensions/CustomScriptExtension", | ||
| "name": "CustomScriptExtension", | ||
| "type": "Microsoft.HybridCompute/machines/extensions", | ||
| "location": "eastus2euap", | ||
| "properties": { | ||
| "publisher": "Microsoft.Compute", | ||
| "type": "string", | ||
| "typeHandlerVersion": "1.10.3", | ||
| "autoUpgradeMinorVersion": false, | ||
| "settings": { | ||
| "commandToExecute": "powershell.exe -c \"Get-Process | Where-Object { $_.CPU -gt 10000 }\"" | ||
| }, | ||
| "protectedSettings": {}, | ||
| "provisioningState": "Succeeded", | ||
| "instanceView": { | ||
| "name": "CustomScriptExtension", | ||
| "type": "CustomScriptExtension", | ||
| "typeHandlerVersion": "1.10.3", | ||
| "status": { | ||
| "code": "success", | ||
| "level": "Information", | ||
| "displayStatus": "Provisioning succeeded", | ||
| "message": "Finished executing command, StdOut: , StdErr:", | ||
| "time": "2019-08-08T20:42:10.999Z" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...er/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/GETLatestAgentVersion.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "parameters": { | ||
| "osType": "myOsType", | ||
| "version": "1.27", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "agentVersion": "1.27", | ||
| "downloadLink": "https://download.microsoft.com/download/8/4/5/845d5e04-bb09-4ed2-9ca8-bb51184cddc9/AzureConnectedMachineAgent.msi", | ||
| "osType": "myOsType" | ||
| } | ||
| } | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...anager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/GETNetworkProfile.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "machineName": "myMachine", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "networkInterfaces": [ | ||
| { | ||
| "ipAddresses": [ | ||
| { | ||
| "address": "192.168.12.345", | ||
| "ipAddressVersion": "IPv4", | ||
| "subnet": { | ||
| "addressPrefix": "192.168.12.0/24" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "ipAddresses": [ | ||
| { | ||
| "address": "1001:0:34aa:5000:1234:aaaa:bbbb:cccc", | ||
| "ipAddressVersion": "IPv6", | ||
| "subnet": { | ||
| "addressPrefix": "1001:0:34aa:5000::/64" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
...icrosoft.HybridCompute/preview/2023-03-15-preview/examples/GetHybridIdentityMetadata.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2023-03-15-preview", | ||
| "subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b", | ||
| "resourceGroupName": "testrg", | ||
| "machineName": "ContosoVm", | ||
| "metadataName": "default" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/testrg/providers/Microsoft.HybridCompute/machines/ContosoVm/hybridIdentityMetadata/default", | ||
| "name": "testItem", | ||
| "type": "Microsoft.HybridCompute/machines/hybridIdentityMetadata", | ||
| "properties": { | ||
| "vmId": "f8b82dff-38ef-4220-99ef-d3a3f86ddc6c", | ||
| "publicKey": "8ec7d60c-9700-40b1-8e6e-e5b2f6f477f2", | ||
| "identity": { | ||
| "principalId": "7b5129bc-8642-4a6a-95f8-63400ca6ec4d", | ||
| "tenantId": "ec46ca82-5d4a-4e3e-b4b7-e27f9318645d", | ||
| "type": "SystemAssigned" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
30 changes: 30 additions & 0 deletions
30
...ute/preview/2023-03-15-preview/examples/HybridIdentityMetadata_ListByVirtualMachines.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2023-03-15-preview", | ||
| "subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b", | ||
| "resourceGroupName": "testrg", | ||
| "machineName": "ContosoVm" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/testrg/providers/Microsoft.HybridCompute/machines/ContosoVm/hybridIdentityMetadata/default", | ||
| "name": "testItem", | ||
| "type": "Microsoft.HybridCompute/machines/hybridIdentityMetadata", | ||
| "properties": { | ||
| "vmId": "f8b82dff-38ef-4220-99ef-d3a3f86ddc6c", | ||
| "publicKey": "8ec7d60c-9700-40b1-8e6e-e5b2f6f477f2", | ||
| "identity": { | ||
| "principalId": "7b5129bc-8642-4a6a-95f8-63400ca6ec4d", | ||
| "tenantId": "ec46ca82-5d4a-4e3e-b4b7-e27f9318645d", | ||
| "type": "SystemAssigned" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
...ce-manager/Microsoft.HybridCompute/preview/2023-03-15-preview/examples/LISTExtension.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscriptionId}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "machineName": "myMachine", | ||
| "api-version": "2023-03-15-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/Machines/myMachine/Extensions/CustomScriptExtension", | ||
| "name": "CustomScriptExtension", | ||
| "location": "eastus2euap", | ||
| "type": "Microsoft.HybridCompute/machines/extensions", | ||
| "properties": { | ||
| "publisher": "Microsoft.Compute", | ||
| "type": "CustomScriptExtension", | ||
| "typeHandlerVersion": "1.10.3", | ||
| "autoUpgradeMinorVersion": false, | ||
| "settings": { | ||
| "commandToExecute": "powershell.exe -c \"Get-Process | Where-Object { $_.CPU -gt 10000 }\"" | ||
| }, | ||
| "provisioningState": "Succeeded", | ||
| "instanceView": { | ||
| "name": "CustomScriptExtension", | ||
| "type": "CustomScriptExtension", | ||
| "typeHandlerVersion": "1.10.3", | ||
| "status": { | ||
| "code": "success", | ||
| "level": "Information", | ||
| "displayStatus": "Provisioning succeeded", | ||
| "message": "formattedMessage: Finished executing command, StdOut: , StdErr: ", | ||
| "time": "2020-08-13T17:18:57.405Z" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/Machines/myMachine/Extensions/winosupdateextension", | ||
| "name": "winosupdateextension", | ||
| "location": "eastus2euap", | ||
| "type": "Microsoft.HybridCompute/machines/extensions", | ||
| "properties": { | ||
| "publisher": "microsoft.softwareupdatemanagement.test", | ||
| "type": "windowsosupdateextension", | ||
| "typeHandlerVersion": "1.0.0.0", | ||
| "autoUpgradeMinorVersion": false, | ||
| "settings": {}, | ||
| "provisioningState": "Creating", | ||
| "instanceView": { | ||
| "name": "winosupdateextension", | ||
| "type": "windowsosupdateextension", | ||
| "typeHandlerVersion": "1.0.0.0", | ||
| "status": {} | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this vmid refer to ? please rename to something that does not end in id since it is not the resource id of the VM
#Resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the same vmId that appears under properties in the parent /machines resource. If we change the name here, particularly if we dropped the -id, it would lose that connection and cause confusion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@raosuhas