Skip to content

Commit 4eb822a

Browse files
azure-powershell-botNoriZC
azure-powershell-bot
and
NoriZC
authored
Migrate Functions from generation to main (#25355)
* Move Functions to main * Update ChangeLog.md * Update ChangeLog.md * Update ChangeLog.md --------- Co-authored-by: NoriZC <[email protected]>
1 parent 2b2adaa commit 4eb822a

File tree

3,365 files changed

+347933
-130989
lines changed

Some content is hidden

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

3,365 files changed

+347933
-130989
lines changed

‎src/Functions/Functions.Autorest/Az.Functions.format.ps1xml

Lines changed: 12287 additions & 5299 deletions
Large diffs are not rendered by default.

‎src/Functions/Functions.Autorest/README.md

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,27 @@ directive:
6666
```
6767
6868
``` yaml
69-
commit: 78eac0bd58633028293cb1ec1709baa200bed9e2
69+
commit: d9f06f3de6cb00796a91b86b622dcf50340952a2
7070
require:
7171
- $(this-folder)/../../readme.azure.noprofile.md
7272
input-file:
73-
- $(repo)/specification/web/resource-manager/Microsoft.CertificateRegistration/stable/2019-08-01/AppServiceCertificateOrders.json
74-
- $(repo)/specification/web/resource-manager/Microsoft.CertificateRegistration/stable/2019-08-01/CertificateRegistrationProvider.json
75-
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2019-08-01/Domains.json
76-
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2019-08-01/TopLevelDomains.json
77-
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2019-08-01/DomainRegistrationProvider.json
78-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/Certificates.json
79-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/CommonDefinitions.json
80-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/DeletedWebApps.json
81-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/Diagnostics.json
82-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/Provider.json
83-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/Recommendations.json
84-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/ResourceProvider.json
85-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/WebApps.json
86-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/StaticSites.json
87-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/AppServiceEnvironments.json
88-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/AppServicePlans.json
89-
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2019-08-01/ResourceHealthMetadata.json
73+
- $(repo)/specification/web/resource-manager/Microsoft.CertificateRegistration/stable/2023-12-01/AppServiceCertificateOrders.json
74+
- $(repo)/specification/web/resource-manager/Microsoft.CertificateRegistration/stable/2023-12-01/CertificateRegistrationProvider.json
75+
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2023-12-01/Domains.json
76+
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2023-12-01/TopLevelDomains.json
77+
- $(repo)/specification/web/resource-manager/Microsoft.DomainRegistration/stable/2023-12-01/DomainRegistrationProvider.json
78+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/Certificates.json
79+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/CommonDefinitions.json
80+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/DeletedWebApps.json
81+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/Diagnostics.json
82+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/Provider.json
83+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/Recommendations.json
84+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/ResourceProvider.json
85+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/WebApps.json
86+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/StaticSites.json
87+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/AppServiceEnvironments.json
88+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/AppServicePlans.json
89+
- $(repo)/specification/web/resource-manager/Microsoft.Web/stable/2023-12-01/ResourceHealthMetadata.json
9090
module-version: 1.0.1
9191
title: Functions
9292
subject-prefix: ''
@@ -123,6 +123,9 @@ metadata:
123123
- Update-AzFunctionAppSetting
124124

125125
directive:
126+
- remove-operation: WebApps_GetProductionSiteDeploymentStatus
127+
- remove-operation: WebApps_GetSlotSiteDeploymentStatusSlot
128+
- remove-operation: Workflows_RegenerateAccessKey
126129
- from: WebApps.json
127130
where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/privateEndpointConnections/{privateEndpointConnectionName}"].delete.responses.200
128131
transform: delete $.schema
@@ -216,16 +219,16 @@ directive:
216219
subject: SystemAssignedIdentity(.*)
217220
hide: true
218221
- where:
219-
subject: WebAppBasicPublishingCredentialsPolicy
222+
subject: (.*)BasicPublishingCredentialsPolicy(.*)
220223
hide: true
221224
- where:
222225
subject: WebAppFunctionKey(.*)
223226
hide: true
224227
- where:
225-
subject: WebAppScmAllowed
228+
subject: (.*)ScmAllowed(.*)
226229
hide: true
227230
- where:
228-
subject: WebAppSettingKeyVaultReference
231+
subject: WebAppSettingKeyVaultReference(.*)
229232
hide: true
230233
- where:
231234
subject: WebAppSyncStatus(.*)
@@ -242,7 +245,7 @@ directive:
242245
hide: true
243246
# Cmdlets to remove
244247
- where:
245-
subject: WebAppFtpAllowed
248+
subject: (.*)WebAppFtpAllowed(.*)
246249
remove: true
247250
- where:
248251
subject: WebAppPremierAddOn(.*)
@@ -440,7 +443,7 @@ directive:
440443
subject: (.*)WebAppTriggered(.*)
441444
remove: true
442445
- where:
443-
subject: (.*)WebAppUsage(.*)
446+
subject: (.*)Usage(.*)
444447
remove: true
445448
- where:
446449
subject: (.*)AzWebAppWeb(.*)
@@ -458,7 +461,7 @@ directive:
458461
subject: (.*)Connection(.*)
459462
remove: true
460463
- where:
461-
subject: (.*)WebAppDeployment(.*)
464+
subject: (.*)OneDeploy(.*)
462465
remove: true
463466
- where:
464467
subject: (.*)WebAppHost(.*)
@@ -509,7 +512,7 @@ directive:
509512
subject: (.*)WebAppClone(.*)
510513
remove: true
511514
- where:
512-
subject: Move(.*)
515+
subject: (.*)Move(.*)
513516
remove: true
514517
- where:
515518
subject: (.*)WebAppRepository(.*)
@@ -535,6 +538,21 @@ directive:
535538
- where:
536539
subject: (.*)StaticSite(.*)
537540
remove: true
541+
- where:
542+
subject: (.*)Backup(.*)
543+
remove: true
544+
- where:
545+
subject: (.*)CustomName(.*)
546+
remove: true
547+
- where:
548+
subject: (.*)CustomHostName(.*)
549+
remove: true
550+
- where:
551+
subject: (.*)Workflow(.*)
552+
remove: true
553+
- where:
554+
subject: (.*)AseRegion(.*)
555+
remove: true
538556
- from: source-file-csharp
539557
where: $
540558
transform: $ = $.replace(/sb.AppendLine\(\$@\"\{Indent\}AliasesToExport = \{aliasesList\}\"\);/, '')

‎src/Functions/Functions.Autorest/build-module.ps1

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
1313
# is regenerated.
1414
# ----------------------------------------------------------------------------------
15-
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs)
15+
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [Switch]$DisableAfterBuildTasks)
1616
$ErrorActionPreference = 'Stop'
1717

1818
if($PSEdition -ne 'Core') {
@@ -169,4 +169,14 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
169169
. (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
170170
}
171171

172+
if (-not $DisableAfterBuildTasks){
173+
$afterBuildTasksPath = Join-Path $PSScriptRoot ''
174+
$afterBuildTasksArgs = ConvertFrom-Json 'true' -AsHashtable
175+
if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
176+
Write-Host -ForegroundColor Green 'Running after build tasks...'
177+
. $afterBuildTasksPath @afterBuildTasksArgs
178+
}
179+
}
180+
181+
172182
Write-Host -ForegroundColor Green '-------------Done-------------'

‎src/Functions/Functions.Autorest/custom/Api20190801/AppServicePlan.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Functions/Functions.Autorest/custom/Api20190801/Site.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/Functions/Functions.Autorest/custom/Api20231201/AppServicePlan.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201
2+
{
3+
public partial class AppServicePlan :
4+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.IAppServicePlan,
5+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.IAppServicePlanInternal,
6+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Runtime.IValidates
7+
{
8+
// This gets set via PowerShell. For more info, please see custom/HelperScripts/HelperFunctions.ps1
9+
/// <summary>The Service plan worker type.</summary>
10+
public string WorkerType { get; set; }
11+
}
12+
}

‎src/Functions/Functions.Autorest/custom/Api20231201/Site.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
namespace Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201
2+
{
3+
public partial class Site :
4+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.ISite,
5+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.ISiteInternal,
6+
Microsoft.Azure.PowerShell.Cmdlets.Functions.Runtime.IValidates
7+
{
8+
9+
// Function app settings. These gets set via PowerShell. For more info, please see custom/HelperScripts/HelperFunctions.ps1
10+
11+
public System.Collections.Hashtable ApplicationSettings { get; set; }
12+
13+
public System.Collections.Hashtable SiteConfig { get; set; }
14+
15+
public string Runtime { get; set; }
16+
17+
public string OSType { get; set; }
18+
19+
public string AppServicePlan { get; set; }
20+
21+
}
22+
}

‎src/Functions/Functions.Autorest/custom/Functions.format.ps1xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<View>
55
<Name>FunctionApp</Name>
66
<ViewSelectedBy>
7-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190801.Site</TypeName>
7+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.Site</TypeName>
88
</ViewSelectedBy>
99
<TableControl>
1010
<TableHeaders>
@@ -36,7 +36,7 @@
3636
<View>
3737
<Name>FunctionAppPlan</Name>
3838
<ViewSelectedBy>
39-
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190801.AppServicePlan</TypeName>
39+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.AppServicePlan</TypeName>
4040
</ViewSelectedBy>
4141
<TableControl>
4242
<TableHeaders>

‎src/Functions/Functions.Autorest/custom/Functions.types.ps1xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Types>
33
<Type>
4-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190801.Site</Name>
4+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.Site</Name>
55
<Members>
66
<AliasProperty>
77
<Name>Status</Name>
@@ -13,12 +13,21 @@
1313
</AliasProperty>
1414
<ScriptProperty>
1515
<Name>SubscriptionId</Name>
16-
<GetScriptBlock>($this.ServerFarmId -split "/")[2]</GetScriptBlock>
16+
<GetScriptBlock>
17+
if ($this.ManagedEnvironmentId)
18+
{
19+
($this.ManagedEnvironmentId -split "/")[2]
20+
}
21+
else
22+
{
23+
($this.ServerFarmId -split "/")[2]
24+
}
25+
</GetScriptBlock>
1726
</ScriptProperty>
1827
</Members>
1928
</Type>
2029
<Type>
21-
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20190801.AppServicePlan</Name>
30+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Functions.Models.Api20231201.AppServicePlan</Name>
2231
<Members>
2332
<AliasProperty>
2433
<Name>ResourceGroupName</Name>

‎src/Functions/Functions.Autorest/custom/FunctionsStack/functionAppStacks.json

Lines changed: 79 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,80 @@
268268
}
269269
]
270270
},
271+
{
272+
"displayText": ".NET 8 In-process",
273+
"value": "dotnet8",
274+
"minorVersions": [
275+
{
276+
"displayText": ".NET 8 (LTS) In-process",
277+
"value": "8 (LTS), in-process model",
278+
"stackSettings": {
279+
"windowsRuntimeSettings": {
280+
"isHidden": true,
281+
"runtimeVersion": "v8.0",
282+
"remoteDebuggingSupported": false,
283+
"appInsightsSettings": {
284+
"isSupported": true
285+
},
286+
"gitHubActionSettings": {
287+
"isSupported": true,
288+
"supportedVersion": "8.0.x"
289+
},
290+
"appSettingsDictionary": {
291+
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
292+
"FUNCTIONS_INPROC_NET8_ENABLED": "1"
293+
},
294+
"siteConfigPropertiesDictionary": {
295+
"use32BitWorkerProcess": true,
296+
"netFrameworkVersion": "v8.0"
297+
},
298+
"supportedFunctionsExtensionVersions": [
299+
"~4"
300+
],
301+
"supportedFunctionsExtensionVersionsInfo": [
302+
{
303+
"version": "~4",
304+
"isDeprecated": false,
305+
"isDefault": false
306+
}
307+
],
308+
"endOfLifeDate": "Tue Nov 10 2026 00:00:00 GMT+0000 (Coordinated Universal Time)"
309+
},
310+
"linuxRuntimeSettings": {
311+
"isHidden": true,
312+
"runtimeVersion": "DOTNET|8.0",
313+
"remoteDebuggingSupported": false,
314+
"appInsightsSettings": {
315+
"isSupported": true
316+
},
317+
"gitHubActionSettings": {
318+
"isSupported": true,
319+
"supportedVersion": "8.0.x"
320+
},
321+
"appSettingsDictionary": {
322+
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
323+
"FUNCTIONS_INPROC_NET8_ENABLED": "1"
324+
},
325+
"siteConfigPropertiesDictionary": {
326+
"use32BitWorkerProcess": true,
327+
"linuxFxVersion": "DOTNET|8.0"
328+
},
329+
"supportedFunctionsExtensionVersions": [
330+
"~4"
331+
],
332+
"supportedFunctionsExtensionVersionsInfo": [
333+
{
334+
"version": "~4",
335+
"isDeprecated": false,
336+
"isDefault": false
337+
}
338+
],
339+
"endOfLifeDate": "Tue Nov 10 2026 00:00:00 GMT+0000 (Coordinated Universal Time)"
340+
}
341+
}
342+
}
343+
]
344+
},
271345
{
272346
"displayText": ".NET 6 In-process",
273347
"value": "dotnet6",
@@ -1455,13 +1529,14 @@
14551529
"isDeprecated": false,
14561530
"isDefault": true
14571531
}
1458-
]
1532+
],
1533+
"endOfLifeDate": "Tue Nov 10 2026 00:00:00 GMT+0000 (Coordinated Universal Time)"
14591534
},
14601535
"linuxRuntimeSettings": {
14611536
"runtimeVersion": "PowerShell|7.4",
14621537
"isDefault": false,
14631538
"isPreview": true,
1464-
"isHidden": true,
1539+
"isHidden": false,
14651540
"remoteDebuggingSupported": false,
14661541
"appInsightsSettings": {
14671542
"isSupported": true
@@ -1485,7 +1560,8 @@
14851560
"isDeprecated": false,
14861561
"isDefault": true
14871562
}
1488-
]
1563+
],
1564+
"endOfLifeDate": "Tue Nov 10 2026 00:00:00 GMT+0000 (Coordinated Universal Time)"
14891565
}
14901566
}
14911567
},

0 commit comments

Comments
 (0)