Skip to content

Commit 39042f5

Browse files
DCMattyGDCMattyG
committed
Fixed token acquisition to account for newer PowerShell versions returning a SecureString by default
1 parent 5304df0 commit 39042f5

File tree

1 file changed

+37
-34
lines changed

1 file changed

+37
-34
lines changed

‎tests/azureipam.tests.ps1‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ BeforeAll {
44
Set-StrictMode -Version Latest
55

66
[string]$baseUrl = "$env:IPAM_URL/api"
7-
[System.Security.SecureString]$accessToken = ConvertTo-SecureString (Get-AzAccessToken -ResourceUrl api://$env:IPAM_ENGINE_APP_ID).Token -AsPlainText
7+
8+
$token = (Get-AzAccessToken -ResourceUrl api://$env:IPAM_ENGINE_APP_ID).Token
9+
[System.Security.SecureString]$accessToken = if ($token -is [System.Security.SecureString]) { $token } else { ConvertTo-SecureString $token -AsPlainText }
10+
811
[hashtable]$headers = @{
912
"Content-Type" = "application/json"
1013
}
@@ -169,7 +172,7 @@ BeforeAll {
169172

170173
# Convert from JSON to PSObject
171174
$tokenObj = $tokenJson | ConvertFrom-Json
172-
175+
173176
Write-Output $headerObj, $tokenObj
174177
}
175178
}
@@ -199,7 +202,7 @@ Context 'Spaces' {
199202
New-ApiResource '/spaces' $spaceB
200203

201204
$spaces, $spacesStatus = Get-ApiResource '/spaces'
202-
205+
203206
$spaces.Count | Should -Be 2
204207
$spaces.Name -contains 'TestSpace01' | Should -Be $true
205208
$spaces.Name -contains 'TestSpace02' | Should -Be $true
@@ -210,7 +213,7 @@ Context 'Spaces' {
210213
Remove-ApiResource '/spaces/TestSpace02'
211214

212215
$spaces, $spacesStatus = Get-ApiResource '/spaces'
213-
216+
214217
$spaces.Count | Should -Be 1
215218
$spaces.Name -contains 'TestSpace01' | Should -Be $true
216219
$spaces.Name -contains 'TestSpace02' | Should -Be $false
@@ -234,7 +237,7 @@ Context 'Spaces' {
234237
Update-ApiResource '/spaces/TestSpace01' $update
235238

236239
$spaces, $spacesStatus = Get-ApiResource '/spaces'
237-
240+
238241
$spaces.Count | Should -Be 1
239242
$spaces[0].Name -eq 'TestSpaceA' | Should -Be $true
240243
$spaces[0].Desc -eq 'Test Space A' | Should -Be $true
@@ -275,7 +278,7 @@ Context 'Blocks' {
275278
New-ApiResource '/spaces/TestSpaceA/blocks' $blockB
276279

277280
$blocks, $blocksStatus = Get-ApiResource '/spaces/TestSpaceA/blocks'
278-
281+
279282
$blocks.Count | Should -Be 2
280283
$blocks.Name -contains 'TestBlock01' | Should -Be $true
281284
$blocks.Name -contains 'TestBlock02' | Should -Be $true
@@ -286,7 +289,7 @@ Context 'Blocks' {
286289
Remove-ApiResource '/spaces/TestSpaceA/blocks/TestBlock02'
287290

288291
$blocks, $blocksStatus = Get-ApiResource '/spaces/TestSpaceA/blocks'
289-
292+
290293
$blocks.Count | Should -Be 1
291294
$blocks.Name -contains 'TestBlock01' | Should -Be $true
292295
$blocks.Name -contains 'TestBlock02' | Should -Be $false
@@ -310,7 +313,7 @@ Context 'Blocks' {
310313
Update-ApiResource '/spaces/TestSpaceA/blocks/TestBlock01' $update
311314

312315
$blocks, $blocksStatus = Get-ApiResource '/spaces/TestSpaceA/blocks'
313-
316+
314317
$blocks.Count | Should -Be 1
315318
$blocks[0].Name -eq 'TestBlockA' | Should -Be $true
316319
$blocks[0].Cidr -eq '10.1.0.0/16' | Should -Be $true
@@ -331,7 +334,7 @@ Context 'Networks' {
331334
It 'Verify No Networks Exist in Block' {
332335

333336
$networks, $networksStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/networks'
334-
337+
335338
$networks | Should -Be $null
336339
}
337340

@@ -399,7 +402,7 @@ Context 'External Networks' {
399402
It 'Verify No External Networks Exist in Block' {
400403

401404
$externals, $externalsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals'
402-
405+
403406
$externals.Count | Should -Be 0
404407
}
405408

@@ -414,7 +417,7 @@ Context 'External Networks' {
414417
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals' $script:externalA
415418

416419
$externals, $externalsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals'
417-
420+
418421
$externals.Count | Should -Be 1
419422

420423
$externals[0].Name -eq "ExternalNetA" | Should -Be $true
@@ -433,7 +436,7 @@ Context 'External Networks' {
433436
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals' $script:externalB
434437

435438
$externals, $externalsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals'
436-
439+
437440
$externals.Count | Should -Be 2
438441

439442
$externals[0].Name -eq "ExternalNetA" | Should -Be $true
@@ -449,7 +452,7 @@ Context 'External Networks' {
449452
It 'Get a Specific External Network' {
450453

451454
$external, $externalStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetB'
452-
455+
453456
$external.Name -eq "ExternalNetB" | Should -Be $true
454457
$external.Desc -eq "External Network B" | Should -Be $true
455458
$external.Cidr -eq "10.1.2.0/24" | Should -Be $true
@@ -478,7 +481,7 @@ Context 'External Networks' {
478481
Update-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetB' $update
479482

480483
$externals, $externalsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals'
481-
484+
482485
$externals.Count | Should -Be 2
483486

484487
$externals[0].Name -eq "ExternalNetA" | Should -Be $true
@@ -495,7 +498,7 @@ Context 'External Networks' {
495498
Remove-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetC'
496499

497500
$externals, $externalsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals'
498-
501+
499502
$externals.Count | Should -Be 1
500503

501504
$externals[0].Name -eq "ExternalNetA" | Should -Be $true
@@ -507,7 +510,7 @@ Context 'External Networks' {
507510
It 'Verify No External Subnets Exist in External Network' {
508511

509512
$subnets, $subnetsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets'
510-
513+
511514
$subnets.Count | Should -Be 0
512515
}
513516

@@ -522,7 +525,7 @@ Context 'External Networks' {
522525
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets' $script:subnetA
523526

524527
$subnets, $subnetsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets'
525-
528+
526529
$subnets.Count | Should -Be 1
527530

528531
$subnets[0].Name -eq "SubnetA" | Should -Be $true
@@ -541,7 +544,7 @@ Context 'External Networks' {
541544
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets' $script:subnetB
542545

543546
$subnets, $subnetsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets'
544-
547+
545548
$subnets.Count | Should -Be 2
546549

547550
$subnets[0].Name -eq "SubnetA" | Should -Be $true
@@ -557,7 +560,7 @@ Context 'External Networks' {
557560
It 'Get Specific External Subnet' {
558561

559562
$subnet, $subnetStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetB'
560-
563+
561564
$subnet.Name -eq "SubnetB" | Should -Be $true
562565
$subnet.Desc -eq "Subnet B" | Should -Be $true
563566
$subnet.Cidr -eq "10.1.1.64/26" | Should -Be $true
@@ -586,7 +589,7 @@ Context 'External Networks' {
586589
Update-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetB' $update
587590

588591
$subnets, $subnetsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets'
589-
592+
590593
$subnets.Count | Should -Be 2
591594

592595
$subnets[0].Name -eq "SubnetA" | Should -Be $true
@@ -603,7 +606,7 @@ Context 'External Networks' {
603606
Remove-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetC'
604607

605608
$subnets, $subnetsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets'
606-
609+
607610
$subnets.Count | Should -Be 1
608611

609612
$subnets[0].Name -eq "SubnetA" | Should -Be $true
@@ -615,7 +618,7 @@ Context 'External Networks' {
615618
It 'Verify No External Endpoints Exist in External Subnet' {
616619

617620
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
618-
621+
619622
$endpoints.Count | Should -Be 0
620623
}
621624

@@ -630,7 +633,7 @@ Context 'External Networks' {
630633
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints' $script:endpointA
631634

632635
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
633-
636+
634637
$endpoints.Count | Should -Be 1
635638

636639
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -649,7 +652,7 @@ Context 'External Networks' {
649652
New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints' $script:endpointB
650653

651654
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
652-
655+
653656
$endpoints.Count | Should -Be 2
654657

655658
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -685,7 +688,7 @@ Context 'External Networks' {
685688
Set-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints' $body
686689

687690
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
688-
691+
689692
$endpoints.Count | Should -Be 4
690693

691694
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -715,7 +718,7 @@ Context 'External Networks' {
715718
Remove-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints' $body
716719

717720
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
718-
721+
719722
$endpoints.Count | Should -Be 2
720723

721724
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -731,7 +734,7 @@ Context 'External Networks' {
731734
It 'Get a Specific External Endpoint' {
732735

733736
$endpoint, $endpointStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints/EndpointA'
734-
737+
735738
$endpoint.Name | Should -Be "EndpointA"
736739
$endpoint.Desc | Should -Be "Endpoint A"
737740
$endpoint.IP | Should -Be "10.1.1.4"
@@ -760,7 +763,7 @@ Context 'External Networks' {
760763
Update-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints/EndpointB' $update
761764

762765
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
763-
766+
764767
$endpoints.Count | Should -Be 2
765768

766769
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -777,7 +780,7 @@ Context 'External Networks' {
777780
Remove-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints/EndpointC'
778781

779782
$endpoints, $endpointsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/externals/ExternalNetA/subnets/SubnetA/endpoints'
780-
783+
781784
$endpoints.Count | Should -Be 1
782785

783786
$endpoints[0].Name -eq "EndpointA" | Should -Be $true
@@ -791,7 +794,7 @@ Context 'Reservations' {
791794
It 'Verify No Reservations Exist in Block' {
792795

793796
$reservations, $reservationsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/reservations'
794-
797+
795798
$reservations | Should -Be $null
796799
}
797800

@@ -817,7 +820,7 @@ Context 'Reservations' {
817820
$script:reservationC, $reservationCStatus = New-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/reservations' $bodyC
818821

819822
$reservations, $reservationsStatus = Get-ApiResource '/spaces/TestSpaceA/blocks/TestBlockA/reservations'
820-
823+
821824
$reservations.Count | Should -Be 3
822825

823826
$reservations[0].Space -eq "TestSpaceA" | Should -Be $true
@@ -898,7 +901,7 @@ Context 'Reservations' {
898901
It 'Get a Specific Reservation' {
899902

900903
$reservation, $reservationStatus = Get-ApiResource "/spaces/TestSpaceA/blocks/TestBlockA/reservations/$($script:reservationC.Id)"
901-
904+
902905
$reservation.Space -eq "TestSpaceA" | Should -Be $true
903906
$reservation.Block -eq "TestBlockA" | Should -Be $true
904907
$reservation.Desc -eq "Test Reservation C" | Should -Be $true
@@ -938,7 +941,7 @@ Context 'Tools' {
938941
New-ApiResource '/spaces' $toolsSpace
939942

940943
$spaces, $spacesStatus = Get-ApiResource '/spaces'
941-
944+
942945
$spaces.Count | Should -Be 2
943946
$spaces.Name -eq 'TestSpaceA' | Should -Be $true
944947
$spaces.Name -eq 'ToolsSpace' | Should -Be $true
@@ -954,7 +957,7 @@ Context 'Tools' {
954957
New-ApiResource '/spaces/ToolsSpace/blocks' $toolsBlock
955958

956959
$blocks, $blocksStatus = Get-ApiResource '/spaces/ToolsSpace/blocks'
957-
960+
958961
$blocks.Count | Should -Be 1
959962

960963
$blocks.Name -eq 'ToolsBlock' | Should -Be $true

0 commit comments

Comments
 (0)