Skip to content

Commit 8aacf4e

Browse files
authored
Merge pull request #97081 from ggailey777/cli-cleanup
Functions CLI scripts cleanup
2 parents ddfa1f0 + 9c212ef commit 8aacf4e

12 files changed

+130
-214
lines changed

articles/azure-functions/functions-cli-samples.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ The following table includes links to bash scripts for Azure Functions that use
1818
| Create app | Description |
1919
|---|---|
2020
| [Create a function app for serverless execution](scripts/functions-cli-create-serverless.md) | Creates a function app in a Consumption plan. |
21-
| [Create a function app in an App Service plan](scripts/functions-cli-create-app-service-plan.md) | Create a function app in a dedicated App Service plan. |
21+
| [Create a serverless Python function app](scripts/functions-cli-create-serverless-python.md) | Create a function app in a dedicated App Service plan. |
22+
| [Create a function app in a scalable Premium plan](scripts/functions-cli-create-premium-plan.md) | Create a function app in a dedicated App Service plan. |
23+
| [Create a function app in a dedicated (App Service) plan](scripts/functions-cli-create-app-service-plan.md) | Create a function app in a dedicated App Service plan. |
2224

2325
| Integrate | Description|
2426
|---|---|
@@ -29,15 +31,3 @@ The following table includes links to bash scripts for Azure Functions that use
2931
|---|---|
3032
| [Deploy from GitHub](scripts/functions-cli-create-function-app-github-continuous.md) | Create a function app that deploys from a GitHub repository. |
3133
| [Deploy from Azure DevOps](scripts/functions-cli-create-function-app-vsts-continuous.md) | Create a function app that deploys from an Azure DevOps repository. |
32-
33-
| Configure app | Description |
34-
|---|---|
35-
| [Map a custom domain to a function app](scripts/functions-cli-configure-custom-domain.md) | Define a custom domain for your functions. |
36-
| [Bind an SSL certificate to a function app](scripts/functions-cli-configure-ssl-certificate.md) | Upload SSL certificates for functions in a custom domain. |
37-
38-
<!---
39-
40-
|**Scale app**||
41-
42-
|**Connect app to resources**||
43-
-->

articles/azure-functions/functions-premium-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ az functionapp plan create --resource-group <RESOURCE_GROUP> --name <PLAN_NAME>
2525

2626
In this example, replace `<RESOURCE_GROUP>` with your resource group and `<PLAN_NAME>` with a name for your plan that is unique in the resource group. Specify a [supported `<REGION>`](#regions). To create a Premium plan that supports Linux, include the `--is-linux` option.
2727

28-
With the plan created, you can use [az functionapp create](/cli/azure/functionapp#az-functionapp-create) to create your function app. In the portal, both the plan and the app are created at the same time.
28+
With the plan created, you can use [az functionapp create](/cli/azure/functionapp#az-functionapp-create) to create your function app. In the portal, both the plan and the app are created at the same time. For an example of a complete Azure CLI script, see [Create a function app in a Premium plan](scripts/functions-cli-create-premium-plan.md).
2929

3030
## Features
3131

articles/azure-functions/scripts/functions-cli-configure-custom-domain.md

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

articles/azure-functions/scripts/functions-cli-configure-ssl-certificate.md

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

articles/azure-functions/scripts/functions-cli-create-app-service-plan.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
---
2-
title: Azure CLI Script Sample - Create a Function App in an App Service plan | Microsoft Docs
2+
title: Create a Function App in an App Service plan - Azure CLI
33
description: Azure CLI Script Sample - Create a Function App in an App Service plan
4-
services: functions
5-
documentationcenter: functions
6-
author: ggailey777
7-
manager: jeconnoc
8-
94
ms.assetid: 0e221db6-ee2d-4e16-9bf6-a456cd05b6e7
10-
ms.service: azure-functions
11-
ms.devlang: azurecli
125
ms.topic: sample
136
ms.date: 07/03/2018
14-
ms.author: glenga
157
ms.custom: mvc
168
---
179
# Create a Function App in an App Service plan
@@ -38,13 +30,13 @@ Each command in the table links to command specific documentation. This script u
3830

3931
| Command | Notes |
4032
|---|---|
41-
| [az group create](https://docs.microsoft.com/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
42-
| [az storage account create](https://docs.microsoft.com/cli/azure/storage/account#az-storage-account-create) | Creates an Azure Storage account. |
43-
| [az appservice plan create](https://docs.microsoft.com/cli/azure/appservice/plan#az-appservice-plan-create) | Creates an App Service plan. |
44-
| [az functionapp create](https://docs.microsoft.com/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the App Service plan. |
33+
| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
34+
| [az storage account create](/cli/azure/storage/account#az-storage-account-create) | Creates an Azure Storage account. |
35+
| [az functionapp plan create](/cli/azure/functionapp/plan#az-functionapp-plan-create) | Creates a Premium plan. |
36+
| [az functionapp create](/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the App Service plan. |
4537

4638
## Next steps
4739

48-
For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
40+
For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
4941

5042
Additional Azure Functions CLI script samples can be found in the [Azure Functions documentation](../functions-cli-samples.md).

articles/azure-functions/scripts/functions-cli-create-function-app-connect-to-cosmos-db.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
---
2-
title: Create an Azure Function that connects to an Azure Cosmos DB | Microsoft Docs
2+
title: Create a function app with Azure Cosmos DB - Azure CLI
33
description: Azure CLI Script Sample - Create an Azure Function that connects to an Azure Cosmos DB
4-
services: functions
5-
documentationcenter: functions
6-
author: ggailey777
7-
manager: jeconnoc
8-
ms.assetid:
9-
ms.service: azure-functions
10-
ms.devlang: azurecli
114
ms.topic: sample
125
ms.date: 07/03/2018
13-
ms.author: glenga
146
ms.custom: mvc
157
---
168
# Create an Azure Function that connects to an Azure Cosmos DB
@@ -37,14 +29,17 @@ This script uses the following commands: Each command in the table links to comm
3729

3830
| Command | Notes |
3931
|---|---|
40-
| [az group create](https://docs.microsoft.com/cli/azure/group#az-group-create) | Create a resource group with location |
41-
| [az storage accounts create](https://docs.microsoft.com/cli/azure/storage/account#az-storage-account-create) | Create a storage account |
42-
| [az functionapp create](https://docs.microsoft.com/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan). |
43-
| [az cosmosdb create](https://docs.microsoft.com/cli/azure/cosmosdb#az-cosmosdb-create) | Create an Azure Cosmos DB database. |
32+
| [az group create](/cli/azure/group#az-group-create) | Create a resource group with location |
33+
| [az storage accounts create](/cli/azure/storage/account#az-storage-account-create) | Create a storage account |
34+
| [az functionapp create](/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan). |
35+
| [az cosmosdb create](/cli/azure/cosmosdb#az-cosmosdb-create) | Create an Azure Cosmos DB database. |
36+
| [az cosmosdb show](/cli/azure/cosmosdb#az-cosmosdb-show)| Gets the database account connection. |
37+
| [az cosmosdb list-keys](/cli/azure/cosmosdb#az-cosmosdb-list-keys)| Gets the keys for the database. |
38+
| [az functionapp config appsettings set](/cli/azure/functionapp/config/appsettings#az-functionapp-config-appsettings-set) | Sets the connection string as an app setting in the function app. |
4439

4540
## Next steps
4641

47-
For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
42+
For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
4843

4944
Additional Azure Functions CLI script samples can be found in the [Azure Functions documentation](../functions-cli-samples.md).
5045

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
---
2-
title: Create an Azure Function that connects to an Azure Storage | Microsoft Docs
2+
title: Create a function app with connected storage - Azure CLI
33
description: Azure CLI Script Sample - Create an Azure Function that connects to an Azure Storage
4-
services: functions
5-
documentationcenter: functions
6-
author: ggailey777
7-
manager: jeconnoc
8-
ms.assetid:
9-
ms.service: azure-functions
10-
ms.devlang: azurecli
114
ms.topic: sample
125
ms.date: 04/20/2017
13-
ms.author: glenga
146
ms.custom: mvc
157
---
16-
# Create a function app that connects to an Azure Storage account
8+
# Create a function app with a named Storage account connection
179

1810
This Azure Functions sample script creates a function app and connects the function to an Azure Storage account. The created app setting that contains the connection can be used with a [storage trigger or binding](../functions-bindings-storage-blob.md).
1911

20-
[!INCLUDE [upgrade runtime](../../../includes/functions-cli-version-note.md)]
21-
2212
[!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
2313

2414
[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
@@ -31,11 +21,6 @@ This sample creates an Azure Function app and adds the storage connection string
3121

3222
[!code-azurecli-interactive[main](../../../cli_scripts/azure-functions/create-function-app-connect-to-storage/create-function-app-connect-to-storage-account.sh "Integrate Function App into Azure Storage Account")]
3323

34-
35-
## Clean up deployment
36-
37-
After the script sample has been run, run the following command to remove the resource group and all related resources:
38-
3924
[!INCLUDE [cli-script-clean-up](../../../includes/cli-script-clean-up.md)]
4025

4126
## Script explanation
@@ -44,12 +29,14 @@ This script uses the following commands. Each command in the table links to comm
4429

4530
| Command | Notes |
4631
|---|---|
47-
| [az group create](https://docs.microsoft.com/cli/azure/group#az-group-create) | Create a resource group with location. |
48-
| [az storage account create](https://docs.microsoft.com/cli/azure/storage/account#az-storage-account-create) | Create a storage account. |
49-
| [az functionapp create](https://docs.microsoft.com/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan). |
32+
| [az group create](/cli/azure/group#az-group-create) | Create a resource group with location. |
33+
| [az storage account create](/cli/azure/storage/account#az-storage-account-create) | Create a storage account. |
34+
| [az functionapp create](/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan). |
35+
| [az storage account show-connection-string](/cli/azure/storage/account#az-storage-account-show-connection-string) | Gets the connection string for the account. |
36+
| [az functionapp config appsettings set](/cli/azure/functionapp/config/appsettings#az-functionapp-config-appsettings-set) | Sets the connection string as an app setting in the function app. |
5037

5138
## Next steps
5239

53-
For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
40+
For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
5441

5542
Additional Azure Functions CLI script samples can be found in the [Azure Functions documentation](../functions-cli-samples.md).

articles/azure-functions/scripts/functions-cli-create-function-app-github-continuous.md

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
---
2-
title: Create a function in Azure that is deployed from GitHub | Microsoft Docs
2+
title: Create a function app with GitHub deployment - Azure CLI
33
description: Create a function app and deploy function code from a GitHub repository using Azure Functions.
4-
services: functions
5-
ms.service: azure-functions
6-
keywords:
7-
ms.devlang: azurecli
8-
9-
author: ggailey777
10-
ms.author: glenga
114
ms.date: 07/03/2018
125
ms.topic: sample
136
ms.custom: mvc
@@ -16,8 +9,6 @@ ms.custom: mvc
169

1710
This Azure Functions sample script creates a function app using the [consumption plan](../functions-scale.md#consumption-plan), along with its related resources. The script also configures your function code for continuous deployment from a GitHub repository.
1811

19-
[!INCLUDE [upgrade runtime](../../../includes/functions-cli-version-note.md)]
20-
2112
In this sample, you need:
2213

2314
* A GitHub repository with functions code, that you have administrative permissions for.
@@ -43,12 +34,12 @@ Each command in the table links to command specific documentation. This script u
4334

4435
| Command | Notes |
4536
|---|---|
46-
| [az group create](https://docs.microsoft.com/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
47-
| [az storage account create](https://docs.microsoft.com/cli/azure/storage/account#az-storage-account-create) | Creates the storage account required by the function app. |
48-
| [az functionapp create](https://docs.microsoft.com/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan) and associates it with a Git or Mercurial repository. |
37+
| [az group create](/cli/azure/group#az-group-create) | Creates a resource group in which all resources are stored. |
38+
| [az storage account create](/cli/azure/storage/account#az-storage-account-create) | Creates the storage account required by the function app. |
39+
| [az functionapp create](/cli/azure/functionapp#az-functionapp-create) | Creates a function app in the serverless [consumption plan](../functions-scale.md#consumption-plan) and associates it with a Git or Mercurial repository. |
4940

5041
## Next steps
5142

52-
For more information on the Azure CLI, see [Azure CLI documentation](https://docs.microsoft.com/cli/azure).
43+
For more information on the Azure CLI, see [Azure CLI documentation](/cli/azure).
5344

5445
Additional Azure Functions CLI script samples can be found in the [Azure Functions documentation](../functions-cli-samples.md).

0 commit comments

Comments
 (0)