Skip to content

Commit 90d7bfb

Browse files
ealsurealsur
committed
Adding connectionMode parsing
1 parent d74261d commit 90d7bfb

File tree

13 files changed

+62
-41
lines changed

13 files changed

+62
-41
lines changed

‎schemas/json/host.json‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -258,29 +258,41 @@
258258
},
259259

260260
"applicationInsights": {
261-
"description": "Configuration settings for Application Insights logging.",
262-
"type": "object",
263-
264-
"properties": {
265-
"sampling": {
266-
"description": "Configuration settings for Application Insights client-side adaptive sampling.",
267-
"type": "object",
261+
"description": "Configuration settings for Application Insights logging.",
262+
"type": "object",
263+
264+
"properties": {
265+
"sampling": {
266+
"description": "Configuration settings for Application Insights client-side adaptive sampling.",
267+
"type": "object",
268+
269+
"properties": {
270+
"isEnabled": {
271+
"description": "If true, client-side adaptive sampling is enabled.",
272+
"type": "boolean",
273+
"default": true
274+
},
268275

269-
"properties": {
270-
"isEnabled": {
271-
"description": "If true, client-side adaptive sampling is enabled.",
272-
"type": "boolean",
273-
"default": true
274-
},
275-
276-
"maxTelemetryItemsPerSecond": {
277-
"description": "The target rate that the adaptive algorithm aims for on each instance",
278-
"type": "integer",
279-
"default": 5
280-
}
281-
}
276+
"maxTelemetryItemsPerSecond": {
277+
"description": "The target rate that the adaptive algorithm aims for on each instance",
278+
"type": "integer",
279+
"default": 5
282280
}
281+
}
282+
}
283+
}
284+
},
285+
286+
"documentDB": {
287+
"description": "Configuration settings for Azure Cosmos DB bindings and triggers.",
288+
"type": "object",
289+
"properties": {
290+
"connectionMode": {
291+
"description": "ConnectionMode to be used on the DocumentClients.",
292+
"enum": [ "Gateway", "Direct" ],
293+
"default": "Gateway"
283294
}
295+
}
284296
}
285297
}
286298
}

‎src/WebJobs.Script.Host/WebJobs.Script.Host.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0-beta1-11288\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
109109
</Reference>
110110
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
111-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
111+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
112112
</Reference>
113113
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
114114
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta8\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
@@ -117,7 +117,7 @@
117117
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
118118
</Reference>
119119
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
120-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
120+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
121121
</Reference>
122122
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
123123
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10022\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>

‎src/WebJobs.Script.Host/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net471" />
2020
<package id="Microsoft.Azure.WebJobs" version="2.3.0-beta1-11288" targetFramework="net471" />
2121
<package id="Microsoft.Azure.WebJobs.Core" version="2.3.0-beta1-11288" targetFramework="net471" />
22-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.2.0" targetFramework="net471" />
22+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.3.0-beta1-10620" targetFramework="net471" />
2323
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta8" targetFramework="net471" />
2424
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
25-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.2.0" targetFramework="net471" />
25+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10620" targetFramework="net471" />
2626
<package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-beta3-10022" targetFramework="net471" />
2727
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.2.0" targetFramework="net471" />
2828
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.2.0" targetFramework="net471" />

‎src/WebJobs.Script.NuGet/WebJobs.Script.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" />
2424
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta8" />
2525
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" />
26-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.2.0" />
26+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10620" />
2727
<dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.1.0" />
2828
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.2.0" />
2929
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.2.0" />

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0-beta1-11288\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
182182
</Reference>
183183
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
184-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
184+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
185185
</Reference>
186186
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
187187
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta8\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
@@ -190,7 +190,7 @@
190190
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
191191
</Reference>
192192
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
193-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
193+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
194194
</Reference>
195195
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
196196
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10022\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>

‎src/WebJobs.Script.WebHost/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net471" />
4848
<package id="Microsoft.Azure.WebJobs" version="2.3.0-beta1-11288" targetFramework="net471" />
4949
<package id="Microsoft.Azure.WebJobs.Core" version="2.3.0-beta1-11288" targetFramework="net471" />
50-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.2.0" targetFramework="net471" />
50+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.3.0-beta1-10620" targetFramework="net471" />
5151
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta8" targetFramework="net471" />
5252
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
53-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.2.0" targetFramework="net471" />
53+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10620" targetFramework="net471" />
5454
<package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-beta3-10022" targetFramework="net471" />
5555
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.1.0" targetFramework="net471" />
5656
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.2.0" targetFramework="net471" />

‎src/WebJobs.Script/Binding/DocumentDBScriptBindingProvider.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ public override void Initialize()
5656
{
5757
documentDBConfiguration.LeaseOptions = leaseOptions.ToObject<ChangeFeedHostOptions>();
5858
}
59+
60+
JToken connectionMode = configSection["connectionMode"];
61+
if (connectionMode != null)
62+
{
63+
if (Enum.TryParse<ConnectionMode>(connectionMode.Value<string>(), out ConnectionMode connectionModeValue))
64+
{
65+
documentDBConfiguration.ConnectionMode = connectionModeValue;
66+
}
67+
}
5968
}
6069

6170
Config.UseDocumentDB(documentDBConfiguration);

‎src/WebJobs.Script/WebJobs.Script.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0-beta1-11288\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
115115
</Reference>
116116
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
117-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
117+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
118118
</Reference>
119119
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
120120
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta8\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
@@ -123,7 +123,7 @@
123123
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
124124
</Reference>
125125
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
126+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
127127
</Reference>
128128
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
129129
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10022\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>

‎src/WebJobs.Script/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net471" />
2424
<package id="Microsoft.Azure.WebJobs" version="2.3.0-beta1-11288" targetFramework="net471" />
2525
<package id="Microsoft.Azure.WebJobs.Core" version="2.3.0-beta1-11288" targetFramework="net471" />
26-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.2.0" targetFramework="net471" />
26+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.3.0-beta1-10620" targetFramework="net471" />
2727
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta8" targetFramework="net471" />
2828
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net471" />
29-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.2.0" targetFramework="net471" />
29+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.3.0-beta1-10620" targetFramework="net471" />
3030
<package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-beta3-10022" targetFramework="net471" />
3131
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.1.0" targetFramework="net471" />
3232
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.2.0" targetFramework="net471" />

‎test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.3.0-beta1-11288\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
131131
</Reference>
132132
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
133-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
133+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
134134
</Reference>
135135
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
136136
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta8\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
@@ -139,7 +139,7 @@
139139
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
140140
</Reference>
141141
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
142-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.2.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
142+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.3.0-beta1-10620\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
143143
</Reference>
144144
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
145145
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10022\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>

0 commit comments

Comments
 (0)