Skip to content

Commit 31ec895

Browse files
authored
Merge pull request #110292 from ggailey777/revert
Revert vendor commits into wrong branch (master)
2 parents 68eb588 + 0387da9 commit 31ec895

16 files changed

+32
-35
lines changed

articles/azure-functions/functions-create-first-azure-function.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create your first function in the Azure portal
33
description: Learn how to create your first Azure Function for serverless execution using the Azure portal.
44
ms.assetid: 96cf87b9-8db6-41a8-863a-abb828e3d06d
55
ms.topic: quickstart
6-
ms.date: 03/26/2020
6+
ms.date: 03/06/2020
77
ms.custom: mvc, devcenter, cc996988-fb4f-47
88
---
99

@@ -29,37 +29,35 @@ Next, create a function in the new function app.
2929

3030
## <a name="create-function"></a>Create an HTTP triggered function
3131

32-
1. From the left menu of the **Functions** window, select **Functions**, then select **Add** from the top menu.
33-
34-
1. From the **New Function** window, select **Http trigger**.
32+
1. Expand your new function app, select the **+** button next to **Functions**, choose **In-portal**, and then select **Continue**.
3533

36-
![Choose HTTP trigger function](./media/functions-create-first-azure-function/function-app-select-http-trigger.png)
34+
![Functions quickstart for choosing a platform.](./media/functions-create-first-azure-function/function-app-quickstart-choose-portal.png)
3735

38-
1. In the **New Function** window, accept the default name for **New Function**, or enter a new name.
36+
1. Choose **WebHook + API**, and then select **Create**.
3937

40-
1. Choose **Anonymous** from the **Authorization level** drop-down list, and then select **Create Function**.
38+
![Functions quickstart in the Azure portal.](./media/functions-create-first-azure-function/function-app-quickstart-node-webhook.png)
4139

42-
Azure creates the HTTP trigger function. Now, you can run the new function by sending an HTTP request.
40+
A function is created using a language-specific template for an HTTP triggered function.
4341

44-
## Test the function
42+
Now, you can run the new function by sending an HTTP request.
4543

46-
1. In your new HTTP trigger function, select **Code + Test** from the left menu, then select **Get function URL** from the top menu.
44+
## Test the function
4745

48-
![Select Get function URL](./media/functions-create-first-azure-function/function-app-select-get-function-url.png)
46+
1. In your new function, select **</> Get function URL** at the top right.
4947

50-
1. In the **Get function URL** dialog box, select **default** from the drop-down list, and then select the **Copy to clipboard** icon.
48+
1. In the **Get function URL** dialog box, select **default (Function key)** from the drop-down list, and then select **Copy**.
5149

5250
![Copy the function URL from the Azure portal](./media/functions-create-first-azure-function/function-app-develop-tab-testing.png)
5351

54-
1. Paste the function URL into your browser's address bar. Add the query string value `?name=<your_name>` to the end of this URL and press Enter to run the request.
52+
1. Paste the function URL into your browser's address bar. Add the query string value `&name=<your_name>` to the end of this URL and press Enter to run the request.
5553

5654
The following example shows the response in the browser:
5755

5856
![Function response in the browser.](./media/functions-create-first-azure-function/function-app-browser-testing.png)
5957

6058
The request URL includes a key that is required, by default, to access your function over HTTP.
6159

62-
1. When your function runs, trace information is written to the logs. To see the trace output, return to the **Code + Test** page in the portal and expand the **Logs** arrow at the bottom of the page.
60+
1. When your function runs, trace information is written to the logs. To see the trace output from the previous execution, return to your function in the portal and select the arrow at the bottom of the screen to expand the **Logs**.
6361

6462
![Functions log viewer in the Azure portal.](./media/functions-create-first-azure-function/function-view-logs.png)
6563

articles/azure-functions/functions-create-your-first-function-visual-studio.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Quickstart: Create your first function in Azure using Visual Studio"
3-
description: In this quickstart, you learn how to create and publish an HTTP trigger Azure Function by using Visual Studio.
3+
description: In this quickstart, you learn how to create and publish an HTTP-triggered Azure Function by using Visual Studio.
44
ms.assetid: 82db1177-2295-4e39-bd42-763f6082e796
55
ms.topic: quickstart
66
ms.date: 03/06/2020
@@ -10,7 +10,7 @@ ms.custom: mvc, devcenter, vs-azure, 23113853-34f2-4f
1010

1111
Azure Functions lets you run your code in a serverless environment without having to first create a VM or publish a web application.
1212

13-
In this quickstart, you learn how to use Visual Studio 2019 to locally create and test a "hello world" HTTP trigger C# function app, which you then publish to Azure.
13+
In this quickstart, you learn how to use Visual Studio 2019 to locally create and test a "hello world" HTTP-triggered C# function app, which you then publish to Azure.
1414

1515
![Function localhost response in the browser](./media/functions-create-your-first-function-visual-studio/functions-create-your-first-function-visual-studio-browser-local-final.png)
1616

@@ -32,7 +32,7 @@ Visual Studio creates a project and class that contains boilerplate code for the
3232

3333
Expand the capabilities of your function with input and output bindings by applying the appropriate attributes to the method. For more information, see the [Triggers and bindings](functions-dotnet-class-library.md#triggers-and-bindings) section of the [Azure Functions C# developer reference](functions-dotnet-class-library.md).
3434

35-
Now that you've created your function project and an HTTP trigger function, you can test it on your local computer.
35+
Now that you've created your function project and an HTTP-triggered function, you can test it on your local computer.
3636

3737
## Run the function locally
3838

@@ -52,7 +52,7 @@ Before you can publish your project, you must have a function app in your Azure
5252

5353
1. Copy the base URL of the function app from the **Publish** profile page. Replace the `localhost:port` portion of the URL you used to test the function locally with the new base URL. Append the query string `?name=<YOUR_NAME>` to this URL and run the request.
5454

55-
The URL that calls your HTTP trigger function is in the following format:
55+
The URL that calls your HTTP triggered function is in the following format:
5656

5757
`http://<APP_NAME>.azurewebsites.net/api/<FUNCTION_NAME>?name=<YOUR_NAME>`
5858

@@ -66,7 +66,7 @@ Before you can publish your project, you must have a function app in your Azure
6666

6767
## Next steps
6868

69-
In this quickstart, you used Visual Studio to create and publish a C# function app in Azure with a simple HTTP trigger function.
69+
In this quickstart, you used Visual Studio to create and publish a C# function app in Azure with a simple HTTP triggered function.
7070

7171
Advance to the next article to learn how to add an Azure Storage queue binding to your function:
7272
> [!div class="nextstepaction"]

articles/azure-functions/functions-scale.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Even with Always On enabled, the execution timeout for individual functions is c
105105

106106
## Determine the hosting plan of an existing application
107107

108-
To determine the hosting plan used by your function app, see **App Service plan** in the **Overview** tab for the function app in the [Azure portal](https://portal.azure.com). To see the pricing tier, select the name of the **App Service Plan**, and then select **Properties** from the left pane.
108+
To determine the hosting plan used by your function app, see **App Service plan / pricing tier** in the **Overview** tab for the function app in the [Azure portal](https://portal.azure.com). For App Service plans, the pricing tier is also indicated.
109109

110110
![View scaling plan in the portal](./media/functions-scale/function-app-overview-portal.png)
111111

@@ -120,7 +120,7 @@ When the output from this command is `dynamic`, your function app is in the Cons
120120

121121
## Storage account requirements
122122

123-
On any plan, a function app requires a general Azure Storage account, which supports Azure Blob, Queue, Files, and Table storage. This is because Azure Functions relies on Azure Storage for operations such as managing triggers and logging function executions, but some storage accounts do not support queues and tables. These accounts, which include blob-only storage accounts (including premium storage) and general-purpose storage accounts with zone-redundant storage replication, are filtered-out from your existing **Storage Account** selections when you create a function app.
123+
On any plan, a function app requires a general Azure Storage account, which supports Azure Blob, Queue, Files, and Table storage. This is because Functions relies on Azure Storage for operations such as managing triggers and logging function executions, but some storage accounts do not support queues and tables. These accounts, which include blob-only storage accounts (including premium storage) and general-purpose storage accounts with zone-redundant storage replication, are filtered-out from your existing **Storage Account** selections when you create a function app.
124124

125125
The same storage account used by your function app can also be used by your triggers and bindings to store your application data. However, for storage-intensive operations, you should use a separate storage account.
126126

@@ -130,7 +130,7 @@ It's certainly possible for multiple function apps to share the same storage acc
130130

131131
To learn more about storage account types, see [Introducing the Azure Storage services](../storage/common/storage-introduction.md#azure-storage-services).
132132

133-
## How the Consumption and Premium plans work
133+
## How the consumption and premium plans work
134134

135135
In the Consumption and Premium plans, the Azure Functions infrastructure scales CPU and memory resources by adding additional instances of the Functions host, based on the number of events that its functions are triggered on. Each instance of the Functions host in the Consumption plan is limited to 1.5 GB of memory and one CPU. An instance of the host is the entire function app, meaning all functions within a function app share resource within an instance and scale at the same time. Function apps that share the same Consumption plan are scaled independently. In the Premium plan, your plan size will determine the available memory and CPU for all apps in that plan on that instance.
136136

@@ -158,7 +158,7 @@ Scaling can vary on a number of factors, and scale differently based on the trig
158158

159159
There are many aspects of a function app that will impact how well it will scale, including host configuration, runtime footprint, and resource efficiency. For more information, see the [scalability section of the performance considerations article](functions-best-practices.md#scalability-best-practices). You should also be aware of how connections behave as your function app scales. For more information, see [How to manage connections in Azure Functions](manage-connections.md).
160160

161-
For more information on scaling in Python and Node.js, see [Azure Functions Python developer guide - Scaling and concurrency](functions-reference-python.md#scaling-and-concurrency) and [Azure Functions Node.js developer guide - Scaling and concurrency](functions-reference-node.md#scaling-and-concurrency).
161+
For additional information on scaling in Python and Node.js, see [Azure Functions Python developer guide - Scaling and concurrency](functions-reference-python.md#scaling-and-concurrency) and [Azure Functions Node.js developer guide - Scaling and concurrency](functions-reference-node.md#scaling-and-concurrency).
162162

163163
### Billing model
164164

7.6 KB
Loading
8.7 KB
Loading
13.7 KB
Loading

includes/functions-vstools-create.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ services: functions
55
author: ggailey777
66
ms.service: azure-functions
77
ms.topic: include
8-
ms.date: 03/26/2020
8+
ms.date: 03/06/2020
99
ms.author: glenga
1010
ms.custom: include file
1111
---
1212

1313
The Azure Functions project template in Visual Studio creates a project that you can publish to a function app in Azure. You can use a function app to group functions as a logical unit for easier management, deployment, scaling, and sharing of resources.
1414

15-
1. From the Visual Studio menu, select **File** > **New** > **Project**.
15+
1. In Visual Studio, on the **File** menu, select **New** > **Project**.
1616

17-
1. In **Create a new project**, enter *functions* in the search box, choose the **Azure Functions** template, and then select **Next**.
17+
1. In **Create a new project**, enter *functions* in the search box, and then choose the **Azure Functions** template.
1818

1919
1. In **Configure your new project**, enter a **Project name** for your project, and then select **Create**. The function app name must be valid as a C# namespace, so don't use underscores, hyphens, or any other nonalphanumeric characters.
2020

21-
1. For the **Create a new Azure Function Application** settings, use the values in the following table:
21+
1. For the **New Project - &lt;your project name&gt;** settings, use the values in the following table:
2222

2323
| Setting | Value | Description |
2424
| ------------ | ------- |----------------------------------------- |
@@ -33,4 +33,4 @@ The Azure Functions project template in Visual Studio creates a project that you
3333

3434
Make sure you set the **Access rights** to **Anonymous**. If you choose the default level of **Function**, you're required to present the [function key](../articles/azure-functions/functions-bindings-http-webhook-trigger.md#authorization-keys) in requests to access your function endpoint.
3535

36-
1. Select **Create** to create the function project and HTTP trigger function.
36+
1. Select **OK** to create the function project and HTTP-triggered function.

0 commit comments

Comments
 (0)