Skip to content

Commit 94cacd7

Browse files
committed
Change Output Format to support filtering & JSON
1 parent f90c8a4 commit 94cacd7

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

Infrastructure/AzureStack.Infra.psm1

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Function Get-AzSScaleUnit{
6161
$subscription, $headers = (Get-AzureStackAdminSubTokenHeader -TenantId $tenantId -AzureStackCredentials $azureStackCredentials -EnvironmentName $EnvironmentName)
6262
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/ScaleUnits?api-version=2016-05-01"
6363
$Cluster=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
64-
$Cluster.value |select name,location |fl
64+
$Cluster.value |select name,location,properties |fl
6565

6666
}
6767
export-modulemember -function Get-AzSScaleUnit
@@ -94,7 +94,7 @@ Function Get-AzSScaleUnitNode{
9494
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/scaleunitnodes?api-version=2016-05-01"
9595
$nodes=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
9696
$nodesprop=$nodes.value
97-
$nodesprop.name
97+
$nodesprop|select name,location,properties
9898
}
9999

100100
export-modulemember -function Get-AzSScaleUnitNode
@@ -130,7 +130,7 @@ Function Get-AzSStorageCapacity{
130130
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/storagesubSystems?api-version=2016-05-01"
131131
$Storage=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
132132
$Storageprop=$storage.value
133-
$storageprop.properties|select totalcapacityGB|fl
133+
$storageprop|select name,location,properties
134134

135135
}
136136
export-modulemember -function Get-AzSStorageCapacity
@@ -163,8 +163,7 @@ Function Get-AzSInfraRole{
163163
$subscription, $headers = (Get-AzureStackAdminSubTokenHeader -TenantId $tenantId -AzureStackCredentials $azureStackCredentials -EnvironmentName $EnvironmentName)
164164
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/InfraRoles?api-version=2016-05-01"
165165
$Roles=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
166-
$Roleprop=$roles.value
167-
$Roleprop.Name|fl
166+
$roles.value
168167

169168
}
170169
export-modulemember -function Get-AzSInfraRole
@@ -198,7 +197,7 @@ Function Get-AzSInfraRoleInstance{
198197
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/infraRoleInstances?api-version=2016-05-01"
199198
$VMs=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
200199
$VMprop=$VMs.value
201-
$VMprop|ft name
200+
$VMprop|select name,properties
202201

203202
}
204203
export-modulemember -function Get-AzSInfraRoleInstance
@@ -231,7 +230,7 @@ Function Get-AzSStorageShare{
231230
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/fileShares?api-version=2016-05-01"
232231
$Shares=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
233232
$Shareprop=$Shares.value
234-
$Shareprop.properties|select uncPath|fl
233+
$Shareprop|select name,location,properties
235234

236235
}
237236
export-modulemember -function Get-AzSStorageShare
@@ -264,7 +263,7 @@ Function Get-AzSLogicalNetwork{
264263
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/logicalNetworks?api-version=2016-05-01"
265264
$LNetworks=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
266265
$LNetworkprop=$LNetworks.value
267-
$LNetworkprop|ft name
266+
$LNetworkprop|select name,location,properties
268267

269268
}
270269
export-modulemember -function Get-AzSLogicalNetwork
@@ -297,7 +296,7 @@ Function Get-AzSUpdateSummary{
297296
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Update.Admin/updatelocations/$region/regionUpdateStatus?api-version=2016-05-01"
298297
$USummary=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
299298
$USummaryprop=$USummary.value
300-
$USummaryprop.properties|select locationName,currentversion,lastUpdated,lastChecked,state|fl
299+
$USummaryprop.properties|select locationName,currentversion,lastUpdated,lastChecked,state
301300

302301
}
303302
export-modulemember -function Get-AzSUpdateSummary
@@ -331,7 +330,7 @@ Function Get-AzSUpdate{
331330
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Update.Admin/updatelocations/$region/updates?api-version=2016-05-01"
332331
$Updates=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
333332
$Updateprop=$Updates.value
334-
$Updateprop.properties|select updateName,version,isApplicable,description,state,isDownloaded,packageSizeInMb,kblink|fl
333+
$Updateprop.properties|select updateName,version,isApplicable,description,state,isDownloaded,packageSizeInMb,kblink
335334

336335
}
337336
export-modulemember -function Get-AzSUpdate
@@ -369,7 +368,7 @@ Function Get-AzSUpdateRun{
369368
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Update.Admin/updatelocations/$region/updates/$vupdate/updateRuns?api-version=2016-05-01"
370369
$UpdateRuns=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
371370
$Updaterunprop=$UpdateRuns.value
372-
$Updaterunprop.properties|select updateLocation,updateversion,state,timeStarted,duration|fl
371+
$Updaterunprop.properties|select updateLocation,updateversion,state,timeStarted,duration
373372

374373
}
375374
export-modulemember -function Get-AzSUpdateRun
@@ -491,7 +490,7 @@ Function Get-AzSIPPool{
491490
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/IPPools?api-version=2016-05-01"
492491
$IPPools=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
493492
$IPPoolprop=$IPPools.value
494-
$IPPoolprop.properties|select startIpAddress,endIpAddress,numberOfIpAddresses,numberOfAllocatedIpAddresses |fl
493+
$IPPoolprop.properties|select startIpAddress,endIpAddress,numberOfIpAddresses,numberOfAllocatedIpAddresses
495494
}
496495
export-modulemember -function Get-AzSIPPool
497496

@@ -525,7 +524,7 @@ Function Get-AzSMaCPool{
525524
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/MacAddressPools?api-version=2016-05-01"
526525
$MACPools=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
527526
$MaCPoolsprop=$MaCPools.value
528-
$MaCPoolsprop.properties|select startmacAddress,endmacAddress,numberOfmacAddresses,numberOfAllocatedmacAddresses |fl
527+
$MaCPoolsprop.properties|select startmacAddress,endmacAddress,numberOfmacAddresses,numberOfAllocatedmacAddresses
529528
}
530529
export-modulemember -function Get-AzSMaCPool
531530

@@ -559,7 +558,7 @@ Function Get-AzSGatewayPool{
559558
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/edgeGatewayPools?api-version=2016-05-01"
560559
$GatewayPools=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
561560
$MGatewaysprop=$GatewayPools.value
562-
$MGatewaysprop.properties|select Gatewaytype,numberofgateways,redundantGatewayCount,gatewayCapacityKiloBitsPerSecond,publicIpAddress |fl
561+
$MGatewaysprop.properties|select Gatewaytype,numberofgateways,redundantGatewayCount,gatewayCapacityKiloBitsPerSecond,publicIpAddress
563562
}
564563
export-modulemember -function Get-AzSGatewayPool
565564

@@ -594,7 +593,7 @@ Function Get-AzSSLBMUX{
594593
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/SlbMuxInstances?api-version=2016-05-01"
595594
$SLBMUX=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
596595
$SLBMUXprop=$SLBMUX.value
597-
$SLBMUXprop.properties|select VirtualServer,ConfigurationState |fl
596+
$SLBMUXprop.properties|select VirtualServer,ConfigurationState
598597
}
599598
export-modulemember -function Get-AzSSLBMUX
600599

@@ -628,7 +627,7 @@ Function Get-AzSGateway{
628627
$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/edgegateways?api-version=2016-05-01"
629628
$Gateways=Invoke-RestMethod -Method GET -Uri $uri -ContentType 'application/json' -Headers $Headers
630629
$Gatewaysprop=$Gateways.value
631-
$Gatewaysprop.properties|select state, numberofconnections,totalcapacity,availablecapacity |fl
630+
$Gatewaysprop.properties|select state, numberofconnections,totalcapacity,availablecapacity
632631
}
633632
export-modulemember -function Get-AzSGateway
634633

0 commit comments

Comments
 (0)