Skip to content

Commit ced8cef

Browse files
authored
Merge pull request Azure#32 from bganapa/MergeBranch
Set subscription cmdlet fixes
2 parents 08553cd + 7d9ed95 commit ced8cef

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Set-AzsOffer.ps1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ function Set-AzsOffer {
153153

154154
$ErrorActionPreference = 'Stop'
155155

156+
$NewOffer = $null
157+
156158
if ('InputObject' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
157159
$GetArmResourceIdParameterValue_params = @{
158160
IdTemplate = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}'
@@ -198,13 +200,15 @@ function Set-AzsOffer {
198200
}
199201

200202
$flattenedParameters = @('MaxSubscriptionsPerAccount', 'BasePlanIds', 'DisplayName', 'Description', 'ExternalReferenceId', 'State', 'Location', 'SubscriptionCount', 'AddonPlanDefinition')
201-
$utilityCmdParams = @{}
203+
if ($NewOffer -eq $null) {
204+
$NewOffer = Get-AzsManagedOffer -Name $Name -ResourceGroupName $ResourceGroupName
205+
}
206+
202207
$flattenedParameters | ForEach-Object {
203208
if ($PSBoundParameters.ContainsKey($_)) {
204-
$utilityCmdParams[$_] = $PSBoundParameters[$_]
209+
$NewOffer.$($_) = $PSBoundParameters[$_]
205210
}
206211
}
207-
$NewOffer = New-OfferObject @utilityCmdParams
208212

209213
if ('Update' -eq $PsCmdlet.ParameterSetName -or 'InputObject' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
210214
Write-Verbose -Message 'Performing operation update on $SubscriptionsAdminClient.'

src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Set-AzsOfferDelegation.ps1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ function Set-AzsOfferDelegation {
9595

9696
$ErrorActionPreference = 'Stop'
9797

98+
$NewOfferDelegation = $null
99+
98100
if ('InputObject' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
99101
$GetArmResourceIdParameterValue_params = @{
100102
IdTemplate = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/offerDelegations/{offerDelegationName}'
@@ -129,14 +131,16 @@ function Set-AzsOfferDelegation {
129131
$PSBoundParameters.Add("Location", $Location)
130132
}
131133

134+
if ($NewOfferDelegation -eq $null) {
135+
$NewOfferDelegation = Get-AzsOfferDelegation -Name $Name -OfferName $OfferName -ResourceGroupName $ResourceGroupName
136+
}
137+
132138
$flattenedParameters = @('SubscriptionId', 'Location')
133-
$utilityCmdParams = @{}
134139
$flattenedParameters | ForEach-Object {
135140
if ($PSBoundParameters.ContainsKey($_)) {
136-
$utilityCmdParams[$_] = $PSBoundParameters[$_]
141+
$NewOfferDelegation.$($_) = $PSBoundParameters[$_]
137142
}
138143
}
139-
$NewOfferDelegation = New-OfferDelegationObject @utilityCmdParams
140144

141145
if ('Update' -eq $PsCmdlet.ParameterSetName -or 'InputObject' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName) {
142146
Write-Verbose -Message 'Performing operation update on $SubscriptionsAdminClient.'

src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Set-AzsPlan.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function Set-AzsPlan {
189189

190190
$flattenedParameters | ForEach-Object {
191191
if ($PSBoundParameters.ContainsKey($_)) {
192-
$NewPlan[$_] = $PSBoundParameters[$_]
192+
$NewPlan.$($_) = $PSBoundParameters[$_]
193193
}
194194
}
195195

src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Set-AzsUserSubscription.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ function Set-AzsUserSubscription {
167167
if ( 'InputObject' -eq $PsCmdlet.ParameterSetName -or 'ResourceId' -eq $PsCmdlet.ParameterSetName -or 'Set' -eq $PsCmdlet.ParameterSetName ) {
168168

169169
if ( $updatedSubscription -eq $null ) {
170-
$updatedSubscription = Get-AzsUserSubscription | Where-Object { $_.SubscriptionId -eq $SubscriptionId }
170+
$updatedSubscription = Get-AzsUserSubscription -SubscriptionId $SubscriptionId
171171
}
172172

173173
$flattenedParameters = @('TenantId', 'SubscriptionId', 'DisplayName', 'DelegatedProviderSubscriptionId', 'Owner', 'RoutingResourceManagerType', 'ExternalReferenceId', 'State', 'Location', 'OfferId')
174174
$flattenedParameters | ForEach-Object {
175175
if ($PSBoundParameters.ContainsKey($_)) {
176-
$updatedSubscription[$_] = $PSBoundParameters[$_]
176+
$updatedSubscription.$($_) = $PSBoundParameters[$_]
177177
}
178178
}
179179

0 commit comments

Comments
 (0)