Skip to content

vm adp token and description fix #980

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

Merged
eriqua merged 2 commits into from
Feb 8, 2022
Merged

vm adp token and description fix #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ffe32
vm adp token
Feb 7, 2022
1637cec
Required osDisk
Feb 7, 2022
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
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ param tags object = {}
@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered')
param cuaId string = ''

@description('Optional. The chosen OS type')
@description('Required. The chosen OS type')
@allowed([
'Windows'
'Linux'
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachineScaleSets/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The following resources are required to be able to deploy this resource.
| `name` | string | | | Required. Name of the VMSS. |
| `nicConfigurations` | array | `[]` | | Required. Configures NICs and PIPs. |
| `osDisk` | object | | | Required. Specifies the OS disk. |
| `osType` | string | | `[Windows, Linux]` | Optional. The chosen OS type |
| `osType` | string | | `[Windows, Linux]` | Required. The chosen OS type |
| `overprovision` | bool | | | Optional. Specifies whether the Virtual Machine Scale Set should be overprovisioned. |
| `pauseTimeBetweenBatches` | string | `PT0S` | | Optional. The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format |
| `plan` | object | `{object}` | | Optional. Specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use. |
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachines/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ param baseTime string = utcNow('u')
@description('Optional. SAS token validity length to use to download files from storage accounts. Usage: \'PT8H\' - valid for 8 hours; \'P5D\' - valid for 5 days; \'P1Y\' - valid for 1 year. When not provided, the SAS token will be valid for 8 hours.')
param sasTokenValidityLength string = 'PT8H'

@description('Optional. The chosen OS type')
@description('Required. The chosen OS type')
@allowed([
'Windows'
'Linux'
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Compute/virtualMachines/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally
| `nicConfigurations` | array | | | Required. Configures NICs and PIPs. |
| `nicMetricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. |
| `osDisk` | object | | | Required. Specifies the OS disk. |
| `osType` | string | | `[Windows, Linux]` | Optional. The chosen OS type |
| `osType` | string | | `[Windows, Linux]` | Required. The chosen OS type |
| `pipLogsToEnable` | array | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | Optional. The name of logs that will be streamed. |
| `pipMetricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. |
| `plan` | object | `{object}` | | Optional. Specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use. |
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/networkWatchers/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{
"name": "<<namePrefix>>-az-subnet-x-001(validation-rg)",
"type": "AzureVM",
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/virtualMachines/adp-vm-001"
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Compute/virtualMachines/adp-<<namePrefix>>-vm-001"
},
{
"name": "Office Portal",
Expand Down
2 changes: 1 addition & 1 deletion ...ities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-vm-001"
"value": "adp-<<namePrefix>>-vm-001"
},
"vmSize": {
"value": "Standard_B1s"
Expand Down