Skip to content

Commit 83fe3f1

Browse files
athippathipp
committed
Merge remote-tracking branch 'origin/dev' into athipp-dev2
2 parents 3d1de62 + d462714 commit 83fe3f1

21 files changed

+1280
-1063
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,12 @@
88
<Component Id="cmpE1934F4197E90691F3F4FD7D0D17559F" Guid="*">
99
<File Id="filDF0DDEF57A08314CBF3061F3513F605F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\AzureRM.AnalysisServices.psd1" />
1010
</Component>
11-
<Component Id="cmp0D5B7BEC83F252C60F0ED4364BA4E301" Guid="*">
12-
<File Id="fil75D6A5E02F501F9DED47394B3FAE780A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\AzureRM.Tags.psd1" />
13-
</Component>
1411
<Component Id="cmpF0D8E7A18EC397D4F297FB010BB719FF" Guid="*">
1512
<File Id="fil3AF8A401B156C1E1081CD77287EB9456" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Hyak.Common.dll" />
1613
</Component>
1714
<Component Id="cmpB5FFAB492F5FC283B45A8B0FC8B85B23" Guid="*">
1815
<File Id="fil662A002742D1A6B36540F70969B80A9D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.ApplicationInsights.dll" />
1916
</Component>
20-
<Component Id="cmp86F0D7B41D7012F3BE0513236DE5DA43" Guid="*">
21-
<File Id="filB00E799CFA5824E75DAC5AEF0E0FF3C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.AnalsysisServices.format.ps1xml" />
22-
</Component>
2317
<Component Id="cmp6108BA66E02AF03106520F7A2C289BC7" Guid="*">
2418
<File Id="fil5BB6CCFE42A464236D5EB72623754357" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.AnalysisServices.dll" />
2519
</Component>
@@ -32,15 +26,6 @@
3226
<Component Id="cmpD58ABE4F9591F4B6AFCC66F94E0A0019" Guid="*">
3327
<File Id="fil21BAE98F98FB33C24D19E258775D830D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
3428
</Component>
35-
<Component Id="cmpEC0AB1B69CF83EA71D24996A83D3A185" Guid="*">
36-
<File Id="fil170D10D507E7DBDCFA7E0B7F4FC5EE3B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.Tags.dll" />
37-
</Component>
38-
<Component Id="cmp974A521880D93B51CE88F63213CFD02C" Guid="*">
39-
<File Id="filB4E7589E09806FAD84D46AA55DF14BD2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.Tags.dll-help.xml" />
40-
</Component>
41-
<Component Id="cmp63B666DD490ABED235009AFA13D40EFC" Guid="*">
42-
<File Id="fil6055812839E2A3C1DE9743C8A88CD19C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Commands.Tags.format.ps1xml" />
43-
</Component>
4429
<Component Id="cmp83A0E14BED2814B44ABE7DA08D9D8D03" Guid="*">
4530
<File Id="fil6A53E52E63A0103107AAB4DDC0113301" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Common.dll" />
4631
</Component>
@@ -50,18 +35,9 @@
5035
<Component Id="cmp02DC06DD48BBD3A3DAE9CB44578BE071" Guid="*">
5136
<File Id="filB561591EA69B4F9ED1F79B8DE0F438D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Management.Analysis.dll" />
5237
</Component>
53-
<Component Id="cmp79779D0D91813A3BD4AC23BEADFD6015" Guid="*">
54-
<File Id="fil2BDC9669397E3D83EB1740E5EBB634C2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.Management.ResourceManager.dll" />
55-
</Component>
56-
<Component Id="cmp65B14836A95DF47D0EF7367C48DA327B" Guid="*">
57-
<File Id="filFD20FF910DA794F51FC29B1195C69C33" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Azure.ResourceManager.dll" />
58-
</Component>
5938
<Component Id="cmp53145B1D571CA066487C18EB39268757" Guid="*">
6039
<File Id="fil05FED58236E9C23886043061A364DC63" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
6140
</Component>
62-
<Component Id="cmp5E2E77EAC2794CC61437C881B8A85365" Guid="*">
63-
<File Id="filBBFF2EB00F7CF5434C3EA9929DFB7956" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
64-
</Component>
6541
<Component Id="cmpA68ABDF0F5DDC292BBFB3380B5DC9B11" Guid="*">
6642
<File Id="filFF93E920A77E2DBE925204E1292FC816" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
6743
</Component>
@@ -83,9 +59,6 @@
8359
<Component Id="cmpB36CF33BC2D97DD90831B716158B7955" Guid="*">
8460
<File Id="filE71754779898CE9B86BA1342BE78051B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.WindowsAzure.Commands.Common.dll" />
8561
</Component>
86-
<Component Id="cmpDFBD439255A05B66C27D9F543F2E9CE5" Guid="*">
87-
<File Id="filFE5B7FF7E4987E65E4F07305D23FF1F9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Microsoft.WindowsAzure.Management.dll" />
88-
</Component>
8962
<Component Id="cmp15DB7B41839B518C871AB1C7F1008B91" Guid="*">
9063
<File Id="fil63BCF3AE45360F4F78693DDB1E7C1054" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AnalysisServices\Newtonsoft.Json.dll" />
9164
</Component>
@@ -5544,32 +5517,23 @@
55445517
<Fragment>
55455518
<ComponentGroup Id="azurecmdfiles">
55465519
<ComponentRef Id="cmpE1934F4197E90691F3F4FD7D0D17559F" />
5547-
<ComponentRef Id="cmp0D5B7BEC83F252C60F0ED4364BA4E301" />
55485520
<ComponentRef Id="cmpF0D8E7A18EC397D4F297FB010BB719FF" />
55495521
<ComponentRef Id="cmpB5FFAB492F5FC283B45A8B0FC8B85B23" />
5550-
<ComponentRef Id="cmp86F0D7B41D7012F3BE0513236DE5DA43" />
55515522
<ComponentRef Id="cmp6108BA66E02AF03106520F7A2C289BC7" />
55525523
<ComponentRef Id="cmp0E077802E445D50411F71866C69A9EB9" />
55535524
<ComponentRef Id="cmp1CEE4E00D234A8D8B553DA9595E61904" />
55545525
<ComponentRef Id="cmpD58ABE4F9591F4B6AFCC66F94E0A0019" />
5555-
<ComponentRef Id="cmpEC0AB1B69CF83EA71D24996A83D3A185" />
5556-
<ComponentRef Id="cmp974A521880D93B51CE88F63213CFD02C" />
5557-
<ComponentRef Id="cmp63B666DD490ABED235009AFA13D40EFC" />
55585526
<ComponentRef Id="cmp83A0E14BED2814B44ABE7DA08D9D8D03" />
55595527
<ComponentRef Id="cmp1041C83734412321A7D6AE4994BEB5D1" />
55605528
<ComponentRef Id="cmp02DC06DD48BBD3A3DAE9CB44578BE071" />
5561-
<ComponentRef Id="cmp79779D0D91813A3BD4AC23BEADFD6015" />
5562-
<ComponentRef Id="cmp65B14836A95DF47D0EF7367C48DA327B" />
55635529
<ComponentRef Id="cmp53145B1D571CA066487C18EB39268757" />
5564-
<ComponentRef Id="cmp5E2E77EAC2794CC61437C881B8A85365" />
55655530
<ComponentRef Id="cmpA68ABDF0F5DDC292BBFB3380B5DC9B11" />
55665531
<ComponentRef Id="cmpBCC309023CB3A878BF9256DA1943855A" />
55675532
<ComponentRef Id="cmp3DD869B6824B2913D04B0A4FB6D4B04E" />
55685533
<ComponentRef Id="cmp2E459760623158FCAF9D0A4B519E0637" />
55695534
<ComponentRef Id="cmp6E9F75BCAD634F076A3F4B2B95FE007D" />
55705535
<ComponentRef Id="cmp3A50F1319D78804190DB48C294EEEE59" />
55715536
<ComponentRef Id="cmpB36CF33BC2D97DD90831B716158B7955" />
5572-
<ComponentRef Id="cmpDFBD439255A05B66C27D9F543F2E9CE5" />
55735537
<ComponentRef Id="cmp15DB7B41839B518C871AB1C7F1008B91" />
55745538
<ComponentRef Id="cmp4239E298007039D73447BCF1C811AFFF" />
55755539
<ComponentRef Id="cmp52FA0519C93110702BAA6D4D39EED5A4" />

‎src/ResourceManager/AnalysisServices/AnalysisServices.sln

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
1212
EndProject
1313
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
1414
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}"
16-
EndProject
1715
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authentication", "..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj", "{D3804B64-C0D3-48F8-82EC-1F632F833C9E}"
1816
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
20-
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}"
22-
EndProject
2317
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices.Test", "Commands.AnalysisServices.Test\Commands.AnalysisServices.Test.csproj", "{B0D03ECF-9F25-499A-BE25-D668E0D208AA}"
2418
EndProject
2519
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AnalysisServices", "Commands.AnalysisServices\Commands.AnalysisServices.csproj", "{8AAB43E6-E8F6-4F91-AF8A-6A63CD78EF1E}"
@@ -48,22 +42,10 @@ Global
4842
{5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4943
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU
5044
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU
5545
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5646
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
5747
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
5848
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.Build.0 = Release|Any CPU
59-
{8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64-
{E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU
6749
{B0D03ECF-9F25-499A-BE25-D668E0D208AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6850
{B0D03ECF-9F25-499A-BE25-D668E0D208AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
6951
{B0D03ECF-9F25-499A-BE25-D668E0D208AA}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.0'
12+
ModuleVersion = '0.0.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'acace26c-1775-4100-85c0-20c4d71eaa21'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.1.0' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.3.0' })
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()
@@ -57,9 +57,7 @@ ScriptsToProcess = @()
5757
TypesToProcess = @()
5858

5959
# Format files (.ps1xml) to be loaded when importing this module
60-
FormatsToProcess = @(
61-
'.\Microsoft.Azure.Commands.AnalsysisServices.format.ps1xml'
62-
)
60+
FormatsToProcess = @()
6361

6462
# Modules to import as nested modules of the module specified in ModuleToProcess
6563
NestedModules = @(

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,12 @@
212212
<None Include="ScenarioTests\Common.ps1">
213213
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
214214
</None>
215-
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestAnalysisServicesServer.json" />
216-
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestNegativeAnalysisServicesServer.json" />
215+
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestAnalysisServicesServer.json">
216+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
217+
</None>
218+
<None Include="SessionRecords\Microsoft.Azure.Commands.AnalysisServices.Test.ScenarioTests.AsTests\TestNegativeAnalysisServicesServer.json">
219+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
220+
</None>
217221
</ItemGroup>
218222
<ItemGroup>
219223
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/ScenarioTests/AsTests.ps1

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ function Test-AnalysisServicesServer
3838

3939
# Updating server
4040
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
41-
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Tags $tagsToUpdate
42-
Assert-NotNull $serverUpdated.Tags "Tags do not exists"
43-
Assert-NotNull $serverUpdated.Tags["TestTag"] "The updated tag 'TestTag' does not exist"
41+
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Tag $tagsToUpdate -PassThru
42+
Assert-NotNull $serverUpdated.Tag "Tag do not exists"
43+
Assert-NotNull $serverUpdated.Tag["TestTag"] "The updated tag 'TestTag' does not exist"
4444

45-
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Administrators '[email protected]'
46-
Assert-NotNull $serverUpdated.AsAdministrators.Members "Server Administrators list i empty"
47-
Assert-AreEqual $serverUpdated.AsAdministrators.Members.Count 1
45+
$serverUpdated = Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Administrators '[email protected]' -PassThru
46+
Assert-NotNull $serverUpdated.AsAdministrators "Server Administrators list is empty"
47+
Assert-AreEqual $serverUpdated.AsAdministrators.Count 1
4848

4949
Assert-AreEqual $serverName $serverUpdated.Name
5050
Assert-AreEqual $location $serverUpdated.Location
@@ -103,16 +103,16 @@ function Test-AnalysisServicesServer
103103
Assert-True {$serverGetItem.ProvisioningState -like "Succeeded"}
104104

105105
# Delete Analysis Servicesserver
106-
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Force -PassThru
106+
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
107107

108108
# Verify that it is gone by trying to get it again
109109
Assert-Throws {Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName}
110110
}
111111
finally
112112
{
113113
# cleanup the resource group that was used in case it still exists. This is a best effort task, we ignore failures here.
114-
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Force -ErrorAction SilentlyContinue} -IgnoreFailures
115-
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -Force -ErrorAction SilentlyContinue} -IgnoreFailures
114+
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -ErrorAction SilentlyContinue} -IgnoreFailures
115+
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue} -IgnoreFailures
116116
}
117117
}
118118

@@ -147,25 +147,25 @@ function Test-NegativeAnalysisServicesServer
147147

148148
# attempt to update a non-existent server
149149
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
150-
Assert-Throws {Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $fakeserverName -Tags $tagsToUpdate}
150+
Assert-Throws {Set-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $fakeserverName -Tag $tagsToUpdate}
151151

152152
# attempt to get a non-existent server
153153
Assert-Throws {Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $fakeserverName}
154154

155155
# Delete Analysis Servicesserver
156-
Assert-True {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Force -PassThru} "Remove Account failed."
156+
Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru
157157

158158
# Delete Analysis Servicesserver again should throw.
159-
Assert-Throws {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Force -PassThru}
159+
Assert-Throws {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -PassThru}
160160

161161
# Verify that it is gone by trying to get it again
162162
Assert-Throws {Get-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName}
163163
}
164164
finally
165165
{
166166
# cleanup the resource group that was used in case it still exists. This is a best effort task, we ignore failures here.
167-
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -Force -ErrorAction SilentlyContinue} -IgnoreFailures
168-
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -Force -ErrorAction SilentlyContinue} -IgnoreFailures
167+
Invoke-HandledCmdlet -Command {Remove-AzureRmAnalysisServicesServer -ResourceGroupName $resourceGroupName -Name $serverName -ErrorAction SilentlyContinue} -IgnoreFailures
168+
Invoke-HandledCmdlet -Command {Remove-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue} -IgnoreFailures
169169
}
170170
}
171171

0 commit comments

Comments
 (0)