Skip to content

Commit 9d1c5ca

Browse files
justinyoojustinyoo
committed
Merge branch 'v2' into release/v2.0.0-preview1
2 parents 69ef6cc + b55647c commit 9d1c5ca

File tree

26 files changed

+315
-550
lines changed

26 files changed

+315
-550
lines changed

‎samples/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc.Ping/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc.Ping.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- Uncomment this block if you want to use NuGet package from https://nuget.org -->
1313
<!--<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.OpenApi" Version="1.4.0" />
14+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.OpenApi" Version="1.5.0" />
1515
</ItemGroup>-->
1616
<!-- Uncomment this block if you want to use NuGet package from https://nuget.org -->
1717

‎samples/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc.Ping/PingHttpTrigger.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Microsoft.Azure.Functions.Worker.Http;
22
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
3+
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
34
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
45
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
56
using Microsoft.Extensions.Logging;
@@ -11,11 +12,13 @@ namespace Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfP
1112
{
1213
public class PingHttpTrigger
1314
{
14-
private readonly ILogger<PingHttpTrigger> _logger;
15+
private readonly ILogger _logger;
16+
private readonly OpenApiSettings _openapi;
1517

16-
public PingHttpTrigger(ILogger<PingHttpTrigger> log)
18+
public PingHttpTrigger(ILoggerFactory loggerFactory, OpenApiSettings openapi)
1719
{
18-
this._logger = log.ThrowIfNullOrDefault();
20+
this._logger = loggerFactory.ThrowIfNullOrDefault().CreateLogger<PingHttpTrigger>();
21+
this._openapi = openapi.ThrowIfNullOrDefault();
1922
}
2023

2124
[Function(nameof(PingHttpTrigger.Ping))]
@@ -24,6 +27,8 @@ public PingHttpTrigger(ILogger<PingHttpTrigger> log)
2427
public async Task<HttpResponseData> Ping(
2528
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "ping")] HttpRequestData req)
2629
{
30+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
31+
2732
var response = req.CreateResponse(HttpStatusCode.OK);
2833
response.Headers.Add("Content-Type", "text/plain; charset=utf-8");
2934

‎samples/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc/PetHttpTrigger.cs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc.SecurityFlows;
1111
using Microsoft.Azure.Functions.Worker.Http;
1212
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
13+
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
1314
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
1415
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
1516
using Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models;
@@ -21,11 +22,13 @@ namespace Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfP
2122
public class PetHttpTrigger
2223
{
2324
private readonly ILogger _logger;
25+
private readonly OpenApiSettings _openapi;
2426
private readonly Fixture _fixture;
2527

26-
public PetHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
28+
public PetHttpTrigger(ILoggerFactory loggerFactory, OpenApiSettings openapi, Fixture fixture)
2729
{
2830
this._logger = loggerFactory.ThrowIfNullOrDefault().CreateLogger<PetHttpTrigger>();
31+
this._openapi = openapi.ThrowIfNullOrDefault();
2932
this._fixture = fixture.ThrowIfNullOrDefault();
3033
}
3134

@@ -40,6 +43,8 @@ public PetHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
4043
public async Task<HttpResponseData> UpdatePet(
4144
[HttpTrigger(AuthorizationLevel.Anonymous, "PUT", Route = "pet")] HttpRequestData req)
4245
{
46+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
47+
4348
var response = req.CreateResponse(HttpStatusCode.OK);
4449

4550
await response.WriteAsJsonAsync(this._fixture.Create<Pet>()).ConfigureAwait(false);
@@ -56,6 +61,8 @@ public async Task<HttpResponseData> UpdatePet(
5661
public async Task<HttpResponseData> AddPet(
5762
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet")] HttpRequestData req)
5863
{
64+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
65+
5966
var response = req.CreateResponse(HttpStatusCode.OK);
6067

6168
await response.WriteAsJsonAsync(this._fixture.Create<Pet>()).ConfigureAwait(false);
@@ -72,6 +79,8 @@ public async Task<HttpResponseData> AddPet(
7279
public async Task<HttpResponseData> FindByStatus(
7380
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/findByStatus")] HttpRequestData req)
7481
{
82+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
83+
7584
var response = req.CreateResponse(HttpStatusCode.OK);
7685

7786
var status = req.Query("status")
@@ -97,6 +106,8 @@ public async Task<HttpResponseData> FindByStatus(
97106
public async Task<HttpResponseData> FindByTags(
98107
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/findByTags")] HttpRequestData req)
99108
{
109+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
110+
100111
var response = req.CreateResponse(HttpStatusCode.OK);
101112

102113
var tags = req.Query("tags")
@@ -128,6 +139,8 @@ public async Task<HttpResponseData> FindByTags(
128139
public async Task<HttpResponseData> GetPetById(
129140
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/{petId}")] HttpRequestData req, long petId)
130141
{
142+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
143+
131144
var response = req.CreateResponse(HttpStatusCode.OK);
132145

133146
var pet = this._fixture.Build<Pet>().With(p => p.Id, petId).Create();
@@ -147,6 +160,8 @@ public async Task<HttpResponseData> GetPetById(
147160
public async Task<HttpResponseData> UpdatePetWithForm(
148161
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet/{petId}")] HttpRequestData req, long petId)
149162
{
163+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
164+
150165
var response = req.CreateResponse(HttpStatusCode.OK);
151166

152167
var pet = this._fixture.Build<Pet>().With(p => p.Id, petId).Create();
@@ -167,6 +182,8 @@ public async Task<HttpResponseData> UpdatePetWithForm(
167182
public async Task<HttpResponseData> DeletePet(
168183
[HttpTrigger(AuthorizationLevel.Anonymous, "DELETE", Route = "pet/{petId}")] HttpRequestData req, long petId)
169184
{
185+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
186+
170187
var response = req.CreateResponse(HttpStatusCode.OK);
171188

172189
return await Task.FromResult(response).ConfigureAwait(false);
@@ -181,6 +198,8 @@ public async Task<HttpResponseData> DeletePet(
181198
public async Task<HttpResponseData> UploadFile(
182199
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet/{petId}/uploadImage")] HttpRequestData req, long petId)
183200
{
201+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
202+
184203
var response = req.CreateResponse(HttpStatusCode.OK);
185204

186205
await response.WriteAsJsonAsync(this._fixture.Create<ApiResponse>()).ConfigureAwait(false);

‎samples/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc/StoreHttpTrigger.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
using Microsoft.Azure.Functions.Worker.Http;
88
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
9+
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
910
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
1011
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
1112
using Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models;
@@ -17,11 +18,13 @@ namespace Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfP
1718
public class StoreHttpTrigger
1819
{
1920
private readonly ILogger _logger;
21+
private readonly OpenApiSettings _openapi;
2022
private readonly Fixture _fixture;
2123

22-
public StoreHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
24+
public StoreHttpTrigger(ILoggerFactory loggerFactory, OpenApiSettings openapi, Fixture fixture)
2325
{
2426
this._logger = loggerFactory.ThrowIfNullOrDefault().CreateLogger<PetHttpTrigger>();
27+
this._openapi = openapi.ThrowIfNullOrDefault();
2528
this._fixture = fixture.ThrowIfNullOrDefault();
2629
}
2730

@@ -32,6 +35,8 @@ public StoreHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
3235
public async Task<HttpResponseData> GetInventory(
3336
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "store/inventory")] HttpRequestData req)
3437
{
38+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
39+
3540
var response = req.CreateResponse(HttpStatusCode.OK);
3641

3742
var result = this._fixture.Create<Dictionary<string, int>>();
@@ -49,6 +54,8 @@ public async Task<HttpResponseData> GetInventory(
4954
public async Task<HttpResponseData> PlaceOrder(
5055
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "store/order")] HttpRequestData req)
5156
{
57+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
58+
5259
var response = req.CreateResponse(HttpStatusCode.OK);
5360

5461
await response.WriteAsJsonAsync(this._fixture.Create<Order>()).ConfigureAwait(false);
@@ -65,6 +72,8 @@ public async Task<HttpResponseData> PlaceOrder(
6572
public async Task<HttpResponseData> GetOrderById(
6673
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "store/order/{orderId}")] HttpRequestData req, long orderId)
6774
{
75+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
76+
6877
var response = req.CreateResponse(HttpStatusCode.OK);
6978

7079
var order = this._fixture.Build<Order>().With(p => p.Id, orderId).Create();
@@ -82,6 +91,8 @@ public async Task<HttpResponseData> GetOrderById(
8291
public async Task<HttpResponseData> DeleteOrder(
8392
[HttpTrigger(AuthorizationLevel.Anonymous, "DELETE", Route = "store/order/{orderId}")] HttpRequestData req, long orderId)
8493
{
94+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
95+
8596
var response = req.CreateResponse(HttpStatusCode.OK);
8697

8798
return await Task.FromResult(response).ConfigureAwait(false);

‎samples/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc/UserHttpTrigger.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfProc.Headers;
99
using Microsoft.Azure.Functions.Worker.Http;
1010
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
11+
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
1112
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
1213
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
1314
using Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.Models;
@@ -19,11 +20,13 @@ namespace Microsoft.Azure.Functions.Worker.Extensions.OpenApi.FunctionApp.OutOfP
1920
public class UserHttpTrigger
2021
{
2122
private readonly ILogger _logger;
23+
private readonly OpenApiSettings _openapi;
2224
private readonly Fixture _fixture;
2325

24-
public UserHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
26+
public UserHttpTrigger(ILoggerFactory loggerFactory, OpenApiSettings openapi, Fixture fixture)
2527
{
2628
this._logger = loggerFactory.ThrowIfNullOrDefault().CreateLogger<PetHttpTrigger>();
29+
this._openapi = openapi.ThrowIfNullOrDefault();
2730
this._fixture = fixture.ThrowIfNullOrDefault();
2831
}
2932

@@ -34,6 +37,8 @@ public UserHttpTrigger(ILoggerFactory loggerFactory, Fixture fixture)
3437
public async Task<HttpResponseData> CreateUser(
3538
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "user")] HttpRequestData req)
3639
{
40+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
41+
3742
var response = req.CreateResponse(HttpStatusCode.OK);
3843

3944
await response.WriteAsJsonAsync(this._fixture.Create<User>()).ConfigureAwait(false);
@@ -48,6 +53,8 @@ public async Task<HttpResponseData> CreateUser(
4853
public async Task<HttpResponseData> CreateUsersWithArrayInput(
4954
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "user/createWithArray")] HttpRequestData req)
5055
{
56+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
57+
5158
var response = req.CreateResponse(HttpStatusCode.OK);
5259

5360
await response.WriteAsJsonAsync(this._fixture.Create<List<User>>()).ConfigureAwait(false);
@@ -62,6 +69,8 @@ public async Task<HttpResponseData> CreateUsersWithArrayInput(
6269
public async Task<HttpResponseData> CreateUsersWithListInput(
6370
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "user/createWithList")] HttpRequestData req)
6471
{
72+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
73+
6574
var response = req.CreateResponse(HttpStatusCode.OK);
6675

6776
await response.WriteAsJsonAsync(this._fixture.Create<List<User>>()).ConfigureAwait(false);
@@ -77,6 +86,8 @@ public async Task<HttpResponseData> CreateUsersWithListInput(
7786
public async Task<HttpResponseData> LoginUser(
7887
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "user/login")] HttpRequestData req)
7988
{
89+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
90+
8091
var response = req.CreateResponse(HttpStatusCode.OK);
8192
response.Headers.Add("Content-Type", "text/plain; charset=utf-8");
8293
response.Headers.Add("X-Rate-Limit", this._fixture.Create<int>().ToString());
@@ -93,6 +104,8 @@ public async Task<HttpResponseData> LoginUser(
93104
public async Task<HttpResponseData> LogoutUser(
94105
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "user/logout")] HttpRequestData req)
95106
{
107+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
108+
96109
var response = req.CreateResponse(HttpStatusCode.OK);
97110

98111
return await Task.FromResult(response).ConfigureAwait(false);
@@ -107,6 +120,8 @@ public async Task<HttpResponseData> LogoutUser(
107120
public async Task<HttpResponseData> GetUserByName(
108121
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "user/{username:regex((?!^login$)(^.+$))}")] HttpRequestData req, string username)
109122
{
123+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
124+
110125
var response = req.CreateResponse(HttpStatusCode.OK);
111126

112127
var user = this._fixture.Build<User>().With(p => p.Username, username).Create();

‎samples/Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.InProc/PetHttpTrigger.cs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.AspNetCore.Mvc;
1111
using Microsoft.Azure.WebJobs.Extensions.Http;
1212
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
13+
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
1314
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
1415
using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
1516
using Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.InProc.SecurityFlows;
@@ -22,11 +23,13 @@ namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.FunctionApp.InProc
2223
public class PetHttpTrigger
2324
{
2425
private readonly ILogger<PetHttpTrigger> _logger;
26+
private readonly OpenApiSettings _openapi;
2527
private readonly Fixture _fixture;
2628

27-
public PetHttpTrigger(ILogger<PetHttpTrigger> log, Fixture fixture)
29+
public PetHttpTrigger(ILogger<PetHttpTrigger> log, OpenApiSettings openapi, Fixture fixture)
2830
{
2931
this._logger = log.ThrowIfNullOrDefault();
32+
this._openapi = openapi.ThrowIfNullOrDefault();
3033
this._fixture = fixture.ThrowIfNullOrDefault();
3134
}
3235

@@ -41,6 +44,8 @@ public PetHttpTrigger(ILogger<PetHttpTrigger> log, Fixture fixture)
4144
public async Task<IActionResult> UpdatePet(
4245
[HttpTrigger(AuthorizationLevel.Anonymous, "PUT", Route = "pet")] HttpRequest req)
4346
{
47+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
48+
4449
return await Task.FromResult(new OkObjectResult(this._fixture.Create<Pet>())).ConfigureAwait(false);
4550
}
4651

@@ -53,6 +58,8 @@ public async Task<IActionResult> UpdatePet(
5358
public async Task<IActionResult> AddPet(
5459
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet")] HttpRequest req)
5560
{
61+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
62+
5663
return await Task.FromResult(new OkObjectResult(this._fixture.Create<Pet>())).ConfigureAwait(false);
5764
}
5865

@@ -65,6 +72,8 @@ public async Task<IActionResult> AddPet(
6572
public async Task<IActionResult> FindByStatus(
6673
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/findByStatus")] HttpRequest req)
6774
{
75+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
76+
6877
var status = req.Query["status"]
6978
.Select(p =>
7079
{
@@ -86,6 +95,8 @@ public async Task<IActionResult> FindByStatus(
8695
public async Task<IActionResult> FindByTags(
8796
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/findByTags")] HttpRequest req)
8897
{
98+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
99+
89100
var tags = req.Query["tags"]
90101
.Select(p =>
91102
{
@@ -113,6 +124,8 @@ public async Task<IActionResult> FindByTags(
113124
public async Task<IActionResult> GetPetById(
114125
[HttpTrigger(AuthorizationLevel.Anonymous, "GET", Route = "pet/{petId}")] HttpRequest req, long petId)
115126
{
127+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
128+
116129
var pet = this._fixture.Build<Pet>().With(p => p.Id, petId).Create();
117130

118131
return await Task.FromResult(new OkObjectResult(pet)).ConfigureAwait(false);
@@ -128,6 +141,8 @@ public async Task<IActionResult> GetPetById(
128141
public async Task<IActionResult> UpdatePetWithForm(
129142
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet/{petId}")] HttpRequest req, long petId)
130143
{
144+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
145+
131146
var pet = this._fixture.Build<Pet>().With(p => p.Id, petId).Create();
132147

133148
return await Task.FromResult(new OkObjectResult(pet)).ConfigureAwait(false);
@@ -144,6 +159,8 @@ public async Task<IActionResult> UpdatePetWithForm(
144159
public async Task<IActionResult> DeletePet(
145160
[HttpTrigger(AuthorizationLevel.Anonymous, "DELETE", Route = "pet/{petId}")] HttpRequest req, long petId)
146161
{
162+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
163+
147164
return await Task.FromResult(new OkResult()).ConfigureAwait(false);
148165
}
149166

@@ -156,6 +173,8 @@ public async Task<IActionResult> DeletePet(
156173
public async Task<IActionResult> UploadFile(
157174
[HttpTrigger(AuthorizationLevel.Anonymous, "POST", Route = "pet/{petId}/uploadImage")] HttpRequest req, long petId)
158175
{
176+
this._logger.LogInformation($"document title: {this._openapi.DocTitle}");
177+
159178
return await Task.FromResult(new OkObjectResult(this._fixture.Create<ApiResponse>())).ConfigureAwait(false);
160179
}
161180
}

0 commit comments

Comments
 (0)