Skip to content

Commit 5e94a7f

Browse files
dolauliwyunchi-ms
andauthored
Update Az.Functions module (#13260)
* Update functions module * Remove useless help * Update Az.Functions.psd1 * Update Az.Functions.psd1 * Update ChangeLog.md Co-authored-by: Yunchi Wang <[email protected]>
1 parent 3c2a9c2 commit 5e94a7f

File tree

1,366 files changed

+20317
-19261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,366 files changed

+20317
-19261
lines changed

src/Functions/Az.Functions.format.ps1xml

Lines changed: 56 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
<TableColumnHeader>
6969
<Label>HostingEnvironmentName</Label>
7070
</TableColumnHeader>
71+
<TableColumnHeader>
72+
<Label>Id1</Label>
73+
</TableColumnHeader>
7174
<TableColumnHeader>
7275
<Label>ImmutabilityPolicyName</Label>
7376
</TableColumnHeader>
@@ -234,6 +237,9 @@
234237
<TableColumnItem>
235238
<PropertyName>HostingEnvironmentName</PropertyName>
236239
</TableColumnItem>
240+
<TableColumnItem>
241+
<PropertyName>Id1</PropertyName>
242+
</TableColumnItem>
237243
<TableColumnItem>
238244
<PropertyName>ImmutabilityPolicyName</PropertyName>
239245
</TableColumnItem>
@@ -542,9 +548,9 @@
542548
</TableControl>
543549
</View>
544550
<View>
545-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.BlobServiceProperties1</Name>
551+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.BlobServicePropertiesAutoGenerated</Name>
546552
<ViewSelectedBy>
547-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.BlobServiceProperties1</TypeName>
553+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.BlobServicePropertiesAutoGenerated</TypeName>
548554
</ViewSelectedBy>
549555
<TableControl>
550556
<TableHeaders>
@@ -852,9 +858,9 @@
852858
</TableControl>
853859
</View>
854860
<View>
855-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Dimension</Name>
861+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.DimensionAutoGenerated</Name>
856862
<ViewSelectedBy>
857-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Dimension</TypeName>
863+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.DimensionAutoGenerated</TypeName>
858864
</ViewSelectedBy>
859865
<TableControl>
860866
<TableHeaders>
@@ -1538,9 +1544,9 @@
15381544
</TableControl>
15391545
</View>
15401546
<View>
1541-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.MetricSpecification</Name>
1547+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.MetricSpecificationAutoGenerated</Name>
15421548
<ViewSelectedBy>
1543-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.MetricSpecification</TypeName>
1549+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.MetricSpecificationAutoGenerated</TypeName>
15441550
</ViewSelectedBy>
15451551
<TableControl>
15461552
<TableHeaders>
@@ -1630,9 +1636,9 @@
16301636
</TableControl>
16311637
</View>
16321638
<View>
1633-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Operation</Name>
1639+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.OperationAutoGenerated</Name>
16341640
<ViewSelectedBy>
1635-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Operation</TypeName>
1641+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.OperationAutoGenerated</TypeName>
16361642
</ViewSelectedBy>
16371643
<TableControl>
16381644
<TableHeaders>
@@ -2430,9 +2436,9 @@
24302436
</TableControl>
24312437
</View>
24322438
<View>
2433-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Usage</Name>
2439+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.UsageAutoGenerated</Name>
24342440
<ViewSelectedBy>
2435-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.Usage</TypeName>
2441+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190401.UsageAutoGenerated</TypeName>
24362442
</ViewSelectedBy>
24372443
<TableControl>
24382444
<TableHeaders>
@@ -2560,9 +2566,9 @@
25602566
</TableControl>
25612567
</View>
25622568
<View>
2563-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.Identity</Name>
2569+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.IdentityAutoGenerated</Name>
25642570
<ViewSelectedBy>
2565-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.Identity</TypeName>
2571+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.IdentityAutoGenerated</TypeName>
25662572
</ViewSelectedBy>
25672573
<TableControl>
25682574
<TableHeaders>
@@ -2650,9 +2656,9 @@
26502656
</TableControl>
26512657
</View>
26522658
<View>
2653-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.Operation</Name>
2659+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationAutoGenerated2</Name>
26542660
<ViewSelectedBy>
2655-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.Operation</TypeName>
2661+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationAutoGenerated2</TypeName>
26562662
</ViewSelectedBy>
26572663
<TableControl>
26582664
<TableHeaders>
@@ -2672,9 +2678,9 @@
26722678
</TableControl>
26732679
</View>
26742680
<View>
2675-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationDisplay</Name>
2681+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationDisplayAutoGenerated</Name>
26762682
<ViewSelectedBy>
2677-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationDisplay</TypeName>
2683+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationDisplayAutoGenerated</TypeName>
26782684
</ViewSelectedBy>
26792685
<TableControl>
26802686
<TableHeaders>
@@ -2712,9 +2718,9 @@
27122718
</TableControl>
27132719
</View>
27142720
<View>
2715-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationListResult</Name>
2721+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationListResultAutoGenerated</Name>
27162722
<ViewSelectedBy>
2717-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationListResult</TypeName>
2723+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20181130.OperationListResultAutoGenerated</TypeName>
27182724
</ViewSelectedBy>
27192725
<TableControl>
27202726
<TableHeaders>
@@ -3138,9 +3144,9 @@
31383144
</TableControl>
31393145
</View>
31403146
<View>
3141-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20150501.ComponentPurgeBodyFilters1</Name>
3147+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20150501.ComponentPurgeBodyFilters</Name>
31423148
<ViewSelectedBy>
3143-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20150501.ComponentPurgeBodyFilters1</TypeName>
3149+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20150501.ComponentPurgeBodyFilters</TypeName>
31443150
</ViewSelectedBy>
31453151
<TableControl>
31463152
<TableHeaders>
@@ -3362,9 +3368,9 @@
33623368
</TableControl>
33633369
</View>
33643370
<View>
3365-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api10.Resource</Name>
3371+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api10.ResourceAutoGenerated</Name>
33663372
<ViewSelectedBy>
3367-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api10.Resource</TypeName>
3373+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api10.ResourceAutoGenerated</TypeName>
33683374
</ViewSelectedBy>
33693375
<TableControl>
33703376
<TableHeaders>
@@ -8270,10 +8276,10 @@
82708276
<Label>DisplayName</Label>
82718277
</TableColumnHeader>
82728278
<TableColumnHeader>
8273-
<Label>Name</Label>
8279+
<Label>InternalName</Label>
82748280
</TableColumnHeader>
82758281
<TableColumnHeader>
8276-
<Label>InternalName</Label>
8282+
<Label>Name</Label>
82778283
</TableColumnHeader>
82788284
<TableColumnHeader>
82798285
<Label>ToBeExportedForShoebox</Label>
@@ -8286,10 +8292,10 @@
82868292
<PropertyName>DisplayName</PropertyName>
82878293
</TableColumnItem>
82888294
<TableColumnItem>
8289-
<PropertyName>Name</PropertyName>
8295+
<PropertyName>InternalName</PropertyName>
82908296
</TableColumnItem>
82918297
<TableColumnItem>
8292-
<PropertyName>InternalName</PropertyName>
8298+
<PropertyName>Name</PropertyName>
82938299
</TableColumnItem>
82948300
<TableColumnItem>
82958301
<PropertyName>ToBeExportedForShoebox</PropertyName>
@@ -13411,32 +13417,32 @@
1341113417
<TableControl>
1341213418
<TableHeaders>
1341313419
<TableColumnHeader>
13414-
<Label>Name</Label>
13420+
<Label>Kind</Label>
1341513421
</TableColumnHeader>
1341613422
<TableColumnHeader>
13417-
<Label>Type</Label>
13423+
<Label>Location</Label>
1341813424
</TableColumnHeader>
1341913425
<TableColumnHeader>
13420-
<Label>Kind</Label>
13426+
<Label>Name</Label>
1342113427
</TableColumnHeader>
1342213428
<TableColumnHeader>
13423-
<Label>Location</Label>
13429+
<Label>Type</Label>
1342413430
</TableColumnHeader>
1342513431
</TableHeaders>
1342613432
<TableRowEntries>
1342713433
<TableRowEntry>
1342813434
<TableColumnItems>
1342913435
<TableColumnItem>
13430-
<PropertyName>Name</PropertyName>
13436+
<PropertyName>Kind</PropertyName>
1343113437
</TableColumnItem>
1343213438
<TableColumnItem>
13433-
<PropertyName>Type</PropertyName>
13439+
<PropertyName>Location</PropertyName>
1343413440
</TableColumnItem>
1343513441
<TableColumnItem>
13436-
<PropertyName>Kind</PropertyName>
13442+
<PropertyName>Name</PropertyName>
1343713443
</TableColumnItem>
1343813444
<TableColumnItem>
13439-
<PropertyName>Location</PropertyName>
13445+
<PropertyName>Type</PropertyName>
1344013446
</TableColumnItem>
1344113447
</TableColumnItems>
1344213448
</TableRowEntry>
@@ -13647,26 +13653,14 @@
1364713653
<TableControl>
1364813654
<TableHeaders>
1364913655
<TableColumnHeader>
13650-
<Label>PrimaryAggregationType</Label>
13651-
</TableColumnHeader>
13652-
<TableColumnHeader>
13653-
<Label>ResourceUri</Label>
13654-
</TableColumnHeader>
13655-
<TableColumnHeader>
13656-
<Label>Unit</Label>
13656+
<Label>Item</Label>
1365713657
</TableColumnHeader>
1365813658
</TableHeaders>
1365913659
<TableRowEntries>
1366013660
<TableRowEntry>
1366113661
<TableColumnItems>
1366213662
<TableColumnItem>
13663-
<PropertyName>PrimaryAggregationType</PropertyName>
13664-
</TableColumnItem>
13665-
<TableColumnItem>
13666-
<PropertyName>ResourceUri</PropertyName>
13667-
</TableColumnItem>
13668-
<TableColumnItem>
13669-
<PropertyName>Unit</PropertyName>
13663+
<PropertyName>Item</PropertyName>
1367013664
</TableColumnItem>
1367113665
</TableColumnItems>
1367213666
</TableRowEntry>
@@ -13681,14 +13675,26 @@
1368113675
<TableControl>
1368213676
<TableHeaders>
1368313677
<TableColumnHeader>
13684-
<Label>Item</Label>
13678+
<Label>PrimaryAggregationType</Label>
13679+
</TableColumnHeader>
13680+
<TableColumnHeader>
13681+
<Label>ResourceUri</Label>
13682+
</TableColumnHeader>
13683+
<TableColumnHeader>
13684+
<Label>Unit</Label>
1368513685
</TableColumnHeader>
1368613686
</TableHeaders>
1368713687
<TableRowEntries>
1368813688
<TableRowEntry>
1368913689
<TableColumnItems>
1369013690
<TableColumnItem>
13691-
<PropertyName>Item</PropertyName>
13691+
<PropertyName>PrimaryAggregationType</PropertyName>
13692+
</TableColumnItem>
13693+
<TableColumnItem>
13694+
<PropertyName>ResourceUri</PropertyName>
13695+
</TableColumnItem>
13696+
<TableColumnItem>
13697+
<PropertyName>Unit</PropertyName>
1369213698
</TableColumnItem>
1369313699
</TableColumnItems>
1369413700
</TableRowEntry>

src/Functions/Az.Functions.psd1

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 9/15/2020
6+
# Generated on: 10/19/2020
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
RootModule = './Az.Functions.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.0.2'
15+
ModuleVersion = '2.0.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -47,7 +47,7 @@ PowerShellVersion = '5.1'
4747
DotNetFrameworkVersion = '4.7.2'
4848

4949
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
50-
# CLRVersion = ''
50+
# ClrVersion = ''
5151

5252
# Processor architecture (None, X86, Amd64) required by this module
5353
# ProcessorArchitecture = ''
@@ -56,16 +56,16 @@ DotNetFrameworkVersion = '4.7.2'
5656
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.9.5'; })
5757

5858
# Assemblies that must be loaded prior to importing this module
59-
RequiredAssemblies = './bin/Az.Functions.private.dll'
59+
RequiredAssemblies = 'bin\Az.Functions.private.dll'
6060

6161
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
62-
ScriptsToProcess = './custom/HelperFunctions.ps1'
62+
ScriptsToProcess = 'custom\HelperFunctions.ps1'
6363

6464
# Type files (.ps1xml) to be loaded when importing this module
65-
TypesToProcess = './custom/Functions.types.ps1xml'
65+
TypesToProcess = 'custom\Functions.types.ps1xml'
6666

6767
# Format files (.ps1xml) to be loaded when importing this module
68-
FormatsToProcess = './Az.Functions.format.ps1xml', './custom/Functions.format.ps1xml'
68+
FormatsToProcess = 'Az.Functions.format.ps1xml', 'custom\Functions.format.ps1xml'
6969

7070
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
7171
# NestedModules = @()
@@ -115,8 +115,7 @@ PrivateData = @{
115115
# IconUri = ''
116116

117117
# ReleaseNotes of this module
118-
ReleaseNotes = '* Removed the ability to create v2 Functions in regions that do not support it.
119-
* Deprecated PowerShell 6.2. Added a warning for when a user creates a PowerShell 6.2 function app that advises them to create a PowerShell 7.0 function app instead.'
118+
ReleaseNotes = 'Implemented Functions Stacks API which describes what runtimes and runtime versions are available for function app creation'
120119

121120
# Prerelease string of this module
122121
# Prerelease = ''

src/Functions/Az.Functions.psm1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
}
2525
}
2626
if(-not $accountsModule) {
27-
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
27+
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
2828
if($hasAdequateVersion) {
29-
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
29+
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
3030
}
3131
}
3232
}
3333

3434
if(-not $accountsModule) {
35-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36-
} elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
37-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
35+
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36+
} elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
37+
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
3838
}
3939
Write-Information "Loaded Module '$($accountsModule.Name)'"
4040

src/Functions/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
-->
2020
## Upcoming Release
2121

22+
## Version 2.0.0
23+
* Implemented Functions Stacks API which describes what runtimes and runtime versions are available for function app creation
24+
* Bug fixing
25+
2226
## Version 1.0.2
2327
* Removed the ability to create v2 Functions in regions that do not support it.
2428
* Deprecated PowerShell 6.2. Added a warning for when a user creates a PowerShell 6.2 function app that advises them to create a PowerShell 7.0 function app instead.

src/Functions/check-dependencies.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(Test-Path -Path $localModulesPath) {
4646
$env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
4747
}
4848

49-
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.7.4'
49+
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
5050
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
5151

5252
$tools = Join-Path $PSScriptRoot 'tools'

0 commit comments

Comments
 (0)