Skip to content

Commit cc96420

Browse files
Francisco-GaminoFrancisco-Gamino
authored
[Az.Functions] Enable support for Flex Consumption apps (#28873)
1 parent 3a6e34c commit cc96420

File tree

68 files changed

+34915
-13280
lines changed

Some content is hidden

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

68 files changed

+34915
-13280
lines changed

‎src/Functions/Functions.Autorest/Properties/AssemblyInfo.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0 (the ""License"");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
// Unless required by applicable law or agreed to in writing, software
7+
// distributed under the License is distributed on an ""AS IS"" BASIS,
8+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
// See the License for the specific language governing permissions and
10+
// limitations under the License.
11+
// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
12+
// is regenerated.
13+
14+
using System;
15+
using System.Reflection;
16+
using System.Runtime.CompilerServices;
17+
using System.Runtime.InteropServices;
18+
19+
[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
20+
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
21+
[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
22+
[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Functions")]
23+
[assembly: System.Reflection.AssemblyFileVersionAttribute("4.2.1")]
24+
[assembly: System.Reflection.AssemblyVersionAttribute("4.2.1")]
25+
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
26+
[assembly: System.CLSCompliantAttribute(false)]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ metadata:
108108
functionsToExport:
109109
- Get-AzFunctionApp
110110
- Get-AzFunctionAppAvailableLocation
111+
- Get-AzFunctionAppFlexConsumptionRuntime
111112
- Get-AzFunctionAppPlan
112113
- Get-AzFunctionAppSetting
113114
- New-AzFunctionApp

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,34 @@
6363
</TableRowEntries>
6464
</TableControl>
6565
</View>
66+
<View>
67+
<Name>Az.Functions.FunctionAppFlexConsumptionRuntime.Display</Name>
68+
<ViewSelectedBy>
69+
<TypeName>Az.Functions.FunctionAppFlexConsumptionRuntime.Display</TypeName>
70+
</ViewSelectedBy>
71+
<TableControl>
72+
<TableHeaders>
73+
<TableColumnHeader><Label>Name</Label></TableColumnHeader>
74+
<TableColumnHeader><Label>Version</Label></TableColumnHeader>
75+
<TableColumnHeader><Label>IsDefault</Label></TableColumnHeader>
76+
<TableColumnHeader><Label>EndOfLifeDate</Label></TableColumnHeader>
77+
<TableColumnHeader><Label>Sku</Label></TableColumnHeader>
78+
</TableHeaders>
79+
<TableRowEntries>
80+
<TableRowEntry>
81+
<TableColumnItems>
82+
<TableColumnItem><PropertyName>Name</PropertyName></TableColumnItem>
83+
<TableColumnItem><PropertyName>Version</PropertyName></TableColumnItem>
84+
<TableColumnItem><PropertyName>IsDefault</PropertyName></TableColumnItem>
85+
<TableColumnItem>
86+
<PropertyName>EndOfLifeDate</PropertyName>
87+
<FormatString>{0:d}</FormatString>
88+
</TableColumnItem>
89+
<TableColumnItem><PropertyName>Sku</PropertyName></TableColumnItem>
90+
</TableColumnItems>
91+
</TableRowEntry>
92+
</TableRowEntries>
93+
</TableControl>
94+
</View>
6695
</ViewDefinitions>
6796
</Configuration>

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

Lines changed: 118 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,84 @@
88
"value": "dotnet",
99
"preferredOs": "windows",
1010
"majorVersions": [
11+
{
12+
"displayText": ".NET 10 Isolated",
13+
"value": "dotnet10isolated",
14+
"minorVersions": [
15+
{
16+
"displayText": ".NET 10 Isolated",
17+
"value": "10 (LTS), isolated worker model",
18+
"stackSettings": {
19+
"windowsRuntimeSettings": {
20+
"runtimeVersion": "v10.0",
21+
"isPreview": true,
22+
"isDefault": false,
23+
"isHidden": false,
24+
"remoteDebuggingSupported": false,
25+
"appInsightsSettings": {
26+
"isSupported": true
27+
},
28+
"gitHubActionSettings": {
29+
"isSupported": true,
30+
"supportedVersion": "10.0.x"
31+
},
32+
"appSettingsDictionary": {
33+
"FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
34+
"WEBSITE_USE_PLACEHOLDER_DOTNETISOLATED": "1"
35+
},
36+
"siteConfigPropertiesDictionary": {
37+
"use32BitWorkerProcess": false,
38+
"netFrameworkVersion": "v10.0"
39+
},
40+
"supportedFunctionsExtensionVersions": [
41+
"~4"
42+
],
43+
"supportedFunctionsExtensionVersionsInfo": [
44+
{
45+
"version": "~4",
46+
"isDeprecated": false,
47+
"isDefault": false
48+
}
49+
],
50+
"endOfLifeDate": "Fri Nov 10 2028 00:00:00 GMT+0000 (Coordinated Universal Time)"
51+
},
52+
"linuxRuntimeSettings": {
53+
"runtimeVersion": "DOTNET-ISOLATED|10.0",
54+
"isPreview": true,
55+
"isDefault": false,
56+
"isHidden": false,
57+
"remoteDebuggingSupported": false,
58+
"appInsightsSettings": {
59+
"isSupported": true
60+
},
61+
"gitHubActionSettings": {
62+
"isSupported": true,
63+
"supportedVersion": "10.0.x"
64+
},
65+
"appSettingsDictionary": {
66+
"FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
67+
"WEBSITE_USE_PLACEHOLDER_DOTNETISOLATED": "1"
68+
},
69+
"siteConfigPropertiesDictionary": {
70+
"use32BitWorkerProcess": false,
71+
"linuxFxVersion": "DOTNET-ISOLATED|10.0"
72+
},
73+
"supportedFunctionsExtensionVersions": [
74+
"~4"
75+
],
76+
"supportedFunctionsExtensionVersionsInfo": [
77+
{
78+
"version": "~4",
79+
"isDeprecated": false,
80+
"isDefault": false
81+
}
82+
],
83+
"endOfLifeDate": "Fri Nov 10 2028 00:00:00 GMT+0000 (Coordinated Universal Time)"
84+
}
85+
}
86+
}
87+
]
88+
},
1189
{
1290
"displayText": ".NET 9 Isolated",
1391
"value": "dotnet9isolated",
@@ -607,11 +685,11 @@
607685
"minorVersions": [
608686
{
609687
"displayText": "Node.js 22",
610-
"value": "22",
688+
"value": "22 LTS",
611689
"stackSettings": {
612690
"windowsRuntimeSettings": {
613691
"runtimeVersion": "~22",
614-
"isPreview": true,
692+
"isDefault": true,
615693
"remoteDebuggingSupported": false,
616694
"appInsightsSettings": {
617695
"isSupported": true
@@ -684,7 +762,6 @@
684762
"stackSettings": {
685763
"windowsRuntimeSettings": {
686764
"runtimeVersion": "~20",
687-
"isDefault": true,
688765
"remoteDebuggingSupported": false,
689766
"appInsightsSettings": {
690767
"isSupported": true
@@ -833,6 +910,44 @@
833910
"displayText": "Python 3",
834911
"value": "3",
835912
"minorVersions": [
913+
{
914+
"displayText": "Python 3.13",
915+
"value": "3.13",
916+
"stackSettings": {
917+
"linuxRuntimeSettings": {
918+
"runtimeVersion": "Python|3.13",
919+
"remoteDebuggingSupported": false,
920+
"isPreview": true,
921+
"isDefault": false,
922+
"isHidden": false,
923+
"appInsightsSettings": {
924+
"isSupported": true
925+
},
926+
"gitHubActionSettings": {
927+
"isSupported": true,
928+
"supportedVersion": "3.13"
929+
},
930+
"appSettingsDictionary": {
931+
"FUNCTIONS_WORKER_RUNTIME": "python"
932+
},
933+
"siteConfigPropertiesDictionary": {
934+
"use32BitWorkerProcess": false,
935+
"linuxFxVersion": "Python|3.13"
936+
},
937+
"supportedFunctionsExtensionVersions": [
938+
"~4"
939+
],
940+
"supportedFunctionsExtensionVersionsInfo": [
941+
{
942+
"version": "~4",
943+
"isDeprecated": false,
944+
"isDefault": true
945+
}
946+
],
947+
"endOfLifeDate": "Wed Oct 31 2029 00:00:00 GMT+0000 (Coordinated Universal Time)"
948+
}
949+
}
950+
},
836951
{
837952
"displayText": "Python 3.12",
838953
"value": "3.12",

‎src/Functions/Functions.Autorest/custom/FunctionsStackFlexData/EastAsia/custom.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"id": null,
3+
"name": "custom",
4+
"type": "Microsoft.Web/locations/functionAppStacks?stackOsType=All",
5+
"location": "eastasia",
6+
"properties": {
7+
"displayText": "Custom Handler",
8+
"value": "custom",
9+
"preferredOs": "windows",
10+
"majorVersions": [
11+
{
12+
"displayText": "Custom Handler",
13+
"value": "custom",
14+
"minorVersions": [
15+
{
16+
"displayText": "Custom Handler",
17+
"value": "custom",
18+
"stackSettings": {
19+
"linuxRuntimeSettings": {
20+
"runtimeVersion": "",
21+
"isPreview": false,
22+
"appInsightsSettings": {
23+
"isSupported": true
24+
},
25+
"remoteDebuggingSupported": false,
26+
"gitHubActionSettings": {
27+
"isSupported": false
28+
},
29+
"appSettingsDictionary": {
30+
"FUNCTIONS_WORKER_RUNTIME": "custom"
31+
},
32+
"siteConfigPropertiesDictionary": {
33+
"use32BitWorkerProcess": false,
34+
"linuxFxVersion": ""
35+
},
36+
"supportedFunctionsExtensionVersions": [
37+
"~4",
38+
"~3",
39+
"~2"
40+
],
41+
"supportedFunctionsExtensionVersionsInfo": [
42+
{
43+
"version": "~4",
44+
"isDeprecated": false,
45+
"isDefault": true
46+
},
47+
{
48+
"version": "~3",
49+
"isDeprecated": true,
50+
"isDefault": false
51+
},
52+
{
53+
"version": "~2",
54+
"isDeprecated": true,
55+
"isDefault": false
56+
}
57+
],
58+
"Sku": [
59+
{
60+
"skuCode": "Y1"
61+
},
62+
{
63+
"skuCode": "Dedicated"
64+
},
65+
{
66+
"skuCode": "ElasticPremium"
67+
},
68+
{
69+
"skuCode": "FC1",
70+
"instanceMemoryMB": [
71+
{
72+
"size": "512",
73+
"isDefault": false
74+
},
75+
{
76+
"size": "2048",
77+
"isDefault": true
78+
},
79+
{
80+
"size": "4096",
81+
"isDefault": false
82+
}
83+
],
84+
"maximumInstanceCount": {
85+
"lowestMaximumInstanceCount": 40,
86+
"highestMaximumInstanceCount": 1000,
87+
"defaultValue": 100
88+
},
89+
"functionAppConfigProperties": {
90+
"runtime": {
91+
"name": "custom",
92+
"version": "1.0"
93+
}
94+
}
95+
}
96+
]
97+
}
98+
}
99+
}
100+
]
101+
}
102+
]
103+
}
104+
}

0 commit comments

Comments
 (0)