[DeploymentScripts] inclusion of storage account settings #9157
There are no files selected for viewing
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
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,111 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2019-10-01-preview", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "resourceGroupName": "script-rg", | ||
| "scriptName": "MyDeploymentScript", | ||
| "deploymentScript": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "properties": { | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "storageAccountSettings": { | ||
| "storageAccountName": "contosostorage", | ||
| "storageAccountKey": "contosostoragekey" | ||
| }, | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "PT7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "201": { | ||
| "body": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "string", | ||
| "createdByType": "Application", | ||
| "createdAt": "2020-02-01T01:01:01.1075056Z", | ||
| "lastModifiedBy": "string", | ||
| "lastModifiedByType": "Application", | ||
| "lastModifiedAt": "2020-02-01T01:01:01.1075056Z" | ||
| }, | ||
| "properties": { | ||
|
There was a problem hiding this comment.
The response is missing the specified There was a problem hiding this comment. Also, what are we going to return in the PUT response if you don't specify In reply to: 412423575 [](ancestors = 412423575) There was a problem hiding this comment. @majastrz added storageAccountSettings to the response and also updated the sample from container group name. Question, in a response that contains storageAccountSettings -> storageAccountName, storageAccountKey is set as an empty string because it is marked as a required property, does this results in the property being returned with an empty string value or it will be ignored from the response? There was a problem hiding this comment. Properties that are secrets generally shouldn't be returned in the response or returned with explicit null (2nd case is rare). We shouldn't return empty string. The service can enforce that the storageAccountKey is present on PUT but it doesn't need to be returned in the response. I don't see any of these marked as required in the Swagger unless I'm missing something. In reply to: 412492407 [](ancestors = 412492407) |
||
| "provisioningState": "Creating", | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "P7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always", | ||
| "status": { | ||
| "containerInstanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ContainerInstance/containerGroups/scriptContainer", | ||
| "storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.Storage/storageAccounts/scriptStorage", | ||
| "startTime": "2018-11-13T15:19:45-08:00", | ||
| "endTime": "2018-11-13T15:19:45-08:00", | ||
| "expirationTime": "2018-11-13T15:19:45-08:00" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "properties": { | ||
| "provisioningState": "Succeeded", | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "P7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always", | ||
| "status": { | ||
| "containerInstanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ContainerInstance/containerGroups/scriptContainer", | ||
| "storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.Storage/storageAccounts/scriptStorage", | ||
| "startTime": "2018-11-13T15:19:45-08:00", | ||
| "endTime": "2018-11-13T15:19:45-08:00", | ||
| "expirationTime": "2018-11-13T15:19:45-08:00" | ||
| }, | ||
| "outputs": { | ||
| "output1": "value1" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
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,110 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2019-10-01-preview", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "resourceGroupName": "script-rg", | ||
| "scriptName": "MyDeploymentScript", | ||
| "deploymentScript": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "properties": { | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "containerSettings": { | ||
| "containerGroupName": "contoso-aci" | ||
| }, | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "PT7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "201": { | ||
| "body": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "string", | ||
| "createdByType": "Application", | ||
| "createdAt": "2020-02-01T01:01:01.1075056Z", | ||
| "lastModifiedBy": "string", | ||
| "lastModifiedByType": "Application", | ||
| "lastModifiedAt": "2020-02-01T01:01:01.1075056Z" | ||
| }, | ||
| "properties": { | ||
| "provisioningState": "Creating", | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "P7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always", | ||
| "status": { | ||
| "containerInstanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ContainerInstance/containerGroups/scriptContainer", | ||
| "storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.Storage/storageAccounts/scriptStorage", | ||
| "startTime": "2018-11-13T15:19:45-08:00", | ||
| "endTime": "2018-11-13T15:19:45-08:00", | ||
| "expirationTime": "2018-11-13T15:19:45-08:00" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "kind": "AzurePowerShell", | ||
| "location": "westus", | ||
| "identity": { | ||
| "type": "UserAssigned", | ||
| "userAssignedIdentities": { | ||
| "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai": {} | ||
| } | ||
| }, | ||
| "properties": { | ||
| "provisioningState": "Succeeded", | ||
| "azPowerShellVersion": "1.7.0", | ||
| "scriptContent": "Param([string]$Location,[string]$Name) $deploymentScriptOutputs['test'] = 'value' Get-AzResourceGroup -Location $Location -Name $Name", | ||
| "arguments": "-Location 'westus' -Name \"*rg2\"", | ||
| "supportingScriptUris": [ | ||
| "https://uri1.to.supporting.script", | ||
| "https://uri2.to.supporting.script" | ||
| ], | ||
| "retentionInterval": "P7D", | ||
| "timeout": "PT1H", | ||
| "cleanupPreference": "Always", | ||
| "status": { | ||
| "containerInstanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.ContainerInstance/containerGroups/scriptContainer", | ||
| "storageAccountId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scriptRG/providers/Microsoft.Storage/storageAccounts/scriptStorage", | ||
| "startTime": "2018-11-13T15:19:45-08:00", | ||
| "endTime": "2018-11-13T15:19:45-08:00", | ||
| "expirationTime": "2018-11-13T15:19:45-08:00" | ||
| }, | ||
| "outputs": { | ||
| "output1": "value1" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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.
Just curious about the purpose of this property. It seems like it only has one possible value. Is this different than default restart policy setting on the containers?
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.
It is the same setting actually. In a recent PR update this property got removed (the RP got updated to not return this value, since it is read-only and sets only one value)