Skip to content

Commit 23e4df1

Browse files
authored
Merge pull request #302715 from ggailey777/fixup
[Functions]Flex][IaC] Fixup missing snippet references that were removed
2 parents 56eb45a + 15ccfd4 commit 23e4df1

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

articles/azure-functions/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@
491491
items:
492492
- name: Infrastructure as code
493493
href: functions-infrastructure-as-code.md
494-
displayName: bicep, ARM template, create function app
494+
displayName: bicep, ARM template, create function app, IaC
495495
- name: Azure portal
496496
href: functions-create-function-app-portal.md
497497
displayName: create function app

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ When using this article, keep these considerations in mind:
4444
+ Examples are shown as individual sections for specific resources. For a broad set of complete Bicep file and ARM template examples, see [these function app deployment examples](/samples/browse/?expanded=azure&terms=%22azure%20functions%22&products=azure-resource-manager).
4545
::: zone-end
4646
::: zone pivot="flex-consumption-plan"
47-
+ Examples are shown as individual sections for specific resources. For a broad set of complete Bicep file and ARM template examples, see [these Flex Consumption app deployment examples](/samples/browse/?expanded=azure&terms=%22azure%20functions%20flex%22&products=azure-resource-manager).
47+
+ Examples are shown as individual sections for specific resources. For Bicep, [Azure Verified Modules (AVM)](https://azure.github.io/Azure-Verified-Modules/) are shown, when available. For a broad set of complete Bicep file and ARM template examples, see [these Flex Consumption app deployment examples](/samples/browse/?expanded=azure&terms=%22azure%20functions%20flex%22&products=azure-resource-manager).
4848
::: zone-end
4949
::: zone pivot="container-apps,azure-arc"
5050
+ Examples are shown as individual sections for specific resources.
@@ -177,15 +177,15 @@ This example shows how to create a container in the storage account:
177177

178178
### [Bicep](#tab/bicep)
179179

180-
<! :::code language="bicep" source="~/function-flex-consumption/IaC/bicep/core/storage/storage-account.bicep" range="46-57" ::: >
180+
:::code language="bicep" source="~/function-flex-consumption/IaC/bicep/main.bicep" range="133-153" :::
181181

182-
For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/core/storage/storage-account.bicep#L46).
182+
This example shows how to use the [AVM for storage accounts](https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/storage/storage-account) to create the blob storage container along with the storage account. For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/main.bicep#L133).
183183

184184
### [ARM template](#tab/json)
185185

186-
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="117-135" :::
186+
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="121-139" :::
187187

188-
For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L117).
188+
For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L121).
189189

190190
---
191191

@@ -316,19 +316,19 @@ Flex Consumption is a Linux-based hosting plan that builds on the Consumption _p
316316

317317
A Flex Consumption plan is a special type of `serverfarm` resource. You can specify it by using `FC1` for the `Name` property value in the `sku` property with a `tier` value of `FlexConsumption`.
318318

319-
This example section creates Flex Consumption plan:
319+
This example section creates a Flex Consumption plan:
320320

321321
### [Bicep](#tab/bicep)
322322

323-
<! :::code language="bicep" source="~/function-flex-consumption/IaC/bicep/core/host/function.bicep" range="21-33" ::: >
323+
:::code language="bicep" source="~/function-flex-consumption/IaC/bicep/main.bicep" range="156-170" :::
324324

325-
For more context, see the complete [function.bicep](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/core/host/function.bicep#L21) file in the Flex Consumption plan sample repository.
325+
This example uses the [AVM for App Service plans](https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/web/serverfarm). For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/main.bicep#L156).
326326

327327
### [ARM template](#tab/json)
328328

329-
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="136-149" :::
329+
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="140-154" :::
330330

331-
For more context, see the complete [azuredeploy.json](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L136) file in the templates repository.
331+
For more context, see the complete [azuredeploy.json](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L140) file in the templates repository.
332332

333333
---
334334

@@ -795,15 +795,15 @@ Flex Consumption replaces many of the standard application settings and site con
795795

796796
### [Bicep](#tab/bicep)
797797

798-
<! :::code language="bicep" source="~/function-flex-consumption/IaC/bicep/core/host/function.bicep" range="35-77" ::: >
798+
:::code language="bicep" source="~/function-flex-consumption/IaC/bicep/main.bicep" range="173-215" :::
799799

800-
For more context, see the complete [function.bicep](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/core/host/function.bicep#L35) file in the Flex Consumption plan sample repository.
800+
This example uses the [AVM for function apps](https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/web/serverfarm). For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/main.bicep#L173).
801801

802802
### [ARM template](#tab/json)
803803

804-
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="143-191" :::
804+
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="155-203" :::
805805

806-
For more context, see the complete [azuredeploy.json](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L144) file in the templates repository.
806+
For more context, see the complete [azuredeploy.json](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json#L155) file in the templates repository.
807807

808808
---
809809
::: zone-end
@@ -1214,7 +1214,7 @@ Your Bicep file or ARM template can optionally also define a deployment for your
12141214
::: zone pivot="flex-consumption-plan"
12151215
The Flex Consumption plan maintains your project code in zip-compressed package file in a blob storage container known as the _deployment container_. You can configure both the storage account and container used for deployment. For more information, see [Deployment](flex-consumption-plan.md#deployment).
12161216

1217-
You must use _[one deploy](functions-deployment-technologies.md#one-deploy)_ to publish your code package to the deployment container. During an ARM or Bicep deployment, you can do this by [defining a package source](#deployment-package) that uses the `/onedeploy` extension. If you choose to instead directly upload your package to the container, the package doesn't get automatically deployed.
1217+
You must use _[one deploy](functions-deployment-technologies.md#one-deploy)_ to publish your code package to the deployment container. During an ARM template or Bicep deployment, you can do this by [defining a package source](#deployment-package) that uses the `/onedeploy` extension. If you choose to instead directly upload your package to the container, the package doesn't get automatically deployed.
12181218

12191219
### Deployment container
12201220

@@ -1224,25 +1224,27 @@ This example uses a system assigned managed identity to access the specified blo
12241224

12251225
### [Bicep](#tab/bicep)
12261226

1227-
<! :::code language="bicep" source="~/function-flex-consumption/IaC/bicep/core/host/function.bicep" range="58-66" ::: >
1227+
:::code language="bicep" source="~/function-flex-consumption/IaC/bicep/main.bicep" range="185-194" :::
1228+
1229+
This example uses the [AVM for function apps](https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/web/site). For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/main.bicep#L185).
12281230

12291231
### [ARM template](#tab/json)
12301232

1231-
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="162-170" :::
1233+
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="166-174" :::
12321234

12331235
---
12341236

12351237
When using managed identities, you must also enable the function app to access the storage account using the identity, as shown in this example:
12361238

12371239
### [Bicep](#tab/bicep)
12381240

1239-
<! :::code language="bicep" source="~/function-flex-consumption/IaC/bicep/core/host/function.bicep" range="81-90" ::: >
1241+
:::code language="bicep" source="~/function-flex-consumption/IaC/bicep/rbac.bicep" range="45-55" :::
12401242

1241-
For a complete reference example, see [this Bicep file](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/core/host/function.bicep).
1243+
This example uses the [AVM for resource-scoped role assignment](https://github.com/Azure/bicep-registry-modules/tree/main/avm/ptn/authorization/resource-role-assignment). For the snippet in context, see [this deployment example](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/bicep/rbac.bicep#L45).
12421244

12431245
### [ARM template](#tab/json)
12441246

1245-
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="199-212" :::
1247+
:::code language="json" source="~/function-flex-consumption/IaC/armtemplate/azuredeploy.json" range="204-218" :::
12461248

12471249
For a complete reference example, see [this ARM template](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/blob/main/IaC/armtemplate/azuredeploy.json).
12481250

@@ -1420,7 +1422,7 @@ Keep the following things in mind when including zip deployment resources in you
14201422

14211423
+ Make sure to always set all required application settings in the `appSettings` collection when adding or updating settings. Existing settings not explicitly set are removed by the update. For more information, see [Application configuration](#application-configuration).
14221424

1423-
+ Functions doesn't support Web Deploy (msdeploy) for package deployments. You must instead use zip deployment in your deployment pipelines and automation. For more information, see [Zip deployment for Azure Functions](deployment-zip-push.md).
1425+
+ Functions doesn't support Web Deploy (`msdeploy`) for package deployments. You must instead use zip deployment in your deployment pipelines and automation. For more information, see [Zip deployment for Azure Functions](deployment-zip-push.md).
14241426

14251427
## Remote builds
14261428

0 commit comments

Comments
 (0)