Implemented Track 2 storage extensions

Azure · Jul 14, 2021 · 37d3f63 · 37d3f63
1 parent ceddf5e
commit 37d3f63
Show file tree

Hide file tree

Showing 19 changed files with 356 additions and 426 deletions.
diff --git a/DotNetWorker.sln b/DotNetWorker.sln
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -285,6 +285,12 @@ jobs:
       displayName: "Setup E2E tests"
       env:
         CORE_TOOLS_URL: $(CORE_TOOLS_URL)
+
+    - bash: |
+        sudo npm install -g azurite
+        sudo mkdir azurite
+        sudo azurite --silent --location azurite --debug azurite\debug.log &
+      displayName: 'Install and Run Azurite'
     
     - task: DotNetCoreCLI@2
       displayName: 'Run E2E tests'

diff --git a/...sions.Storage/Blobs/BlobInputAttribute.cs → ...sions.Storage.Blobs/BlobInputAttribute.cs b/...sions.Storage/Blobs/BlobInputAttribute.cs → ...sions.Storage.Blobs/BlobInputAttribute.cs
diff --git a/...ions.Storage/Blobs/BlobOutputAttribute.cs → ...ions.Storage.Blobs/BlobOutputAttribute.cs b/...ions.Storage/Blobs/BlobOutputAttribute.cs → ...ions.Storage.Blobs/BlobOutputAttribute.cs
diff --git a/...ons.Storage/Blobs/BlobTriggerAttribute.cs → ...ons.Storage.Blobs/BlobTriggerAttribute.cs b/...ons.Storage/Blobs/BlobTriggerAttribute.cs → ...ons.Storage.Blobs/BlobTriggerAttribute.cs
diff --git a/...nsions.Storage/Properties/AssemblyInfo.cs → ....Storage.Blobs/Properties/AssemblyInfo.cs b/...nsions.Storage/Properties/AssemblyInfo.cs → ....Storage.Blobs/Properties/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 
-[assembly: ExtensionInformation("Microsoft.Azure.WebJobs.Extensions.Storage", "4.0.4")]
+[assembly: ExtensionInformation("Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.0.0-beta.4")]
diff --git a/extensions/Worker.Extensions.Storage.Blobs/Worker.Extensions.Storage.Blobs.csproj b/extensions/Worker.Extensions.Storage.Blobs/Worker.Extensions.Storage.Blobs.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions.Storage.Blobs</AssemblyName>
+    <RootNamespace>Microsoft.Azure.Functions.Worker.Extensions.Storage.Blobs</RootNamespace>
+    <Description>Azure Blob Storage extensions for .NET isolated functions</Description>
+
+    <!--Version information-->
+    <VersionPrefix>5.0.0</VersionPrefix>
+    <VersionSuffix>-beta.4</VersionSuffix>
+
+    <!--Temporarily opting out of documentation. Pending documentation-->
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\Extensions.props" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\Worker.Extensions.Abstractions\Worker.Extensions.Abstractions.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/extensions/Worker.Extensions.Storage.Queues/Properties/AssemblyInfo.cs b/extensions/Worker.Extensions.Storage.Queues/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
+
+[assembly: ExtensionInformation("Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.0.0-beta.4")]
diff --git a/...ns.Storage/Queues/QueueOutputAttribute.cs → ...ns.Storage.Queues/QueueOutputAttribute.cs b/...ns.Storage/Queues/QueueOutputAttribute.cs → ...ns.Storage.Queues/QueueOutputAttribute.cs
diff --git a/...s.Storage/Queues/QueueTriggerAttribute.cs → ...s.Storage.Queues/QueueTriggerAttribute.cs b/...s.Storage/Queues/QueueTriggerAttribute.cs → ...s.Storage.Queues/QueueTriggerAttribute.cs
diff --git a/extensions/Worker.Extensions.Storage.Queues/Worker.Extensions.Storage.Queues.csproj b/extensions/Worker.Extensions.Storage.Queues/Worker.Extensions.Storage.Queues.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues</AssemblyName>
+    <RootNamespace>Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues</RootNamespace>
+    <Description>Azure Queue Storage extensions for .NET isolated functions</Description>
+
+    <!--Version information-->
+    <VersionPrefix>5.0.0</VersionPrefix>
+    <VersionSuffix>-beta.4</VersionSuffix>
+
+    <!--Temporarily opting out of documentation. Pending documentation-->
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\Extensions.props" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\Worker.Extensions.Abstractions\Worker.Extensions.Abstractions.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/extensions/Worker.Extensions.Storage/Tables/TableInputAttribute.cs b/extensions/Worker.Extensions.Storage/Tables/TableInputAttribute.cs
diff --git a/extensions/Worker.Extensions.Storage/Tables/TableOutputAttribute.cs b/extensions/Worker.Extensions.Storage/Tables/TableOutputAttribute.cs
diff --git a/extensions/Worker.Extensions.Storage/Worker.Extensions.Storage.csproj b/extensions/Worker.Extensions.Storage/Worker.Extensions.Storage.csproj
@@ -6,16 +6,20 @@
     <Description>Azure Storage extensions for .NET isolated functions</Description>
 
     <!--Version information-->
-    <VersionPrefix>4.0.4</VersionPrefix>
+    <VersionPrefix>5.0.0</VersionPrefix>
+    <VersionSuffix>-beta.4</VersionSuffix>
 
     <!--Temporarily opting out of documentation. Pending documentation-->
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
+
+    <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
   <Import Project="..\..\build\Extensions.props" />
 
   <ItemGroup>
-    <ProjectReference Include="..\Worker.Extensions.Abstractions\Worker.Extensions.Abstractions.csproj" />
+    <ProjectReference Include="..\Worker.Extensions.Storage.Blobs\Worker.Extensions.Storage.Blobs.csproj" />
+    <ProjectReference Include="..\Worker.Extensions.Storage.Queues\Worker.Extensions.Storage.Queues.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/release_notes.md b/release_notes.md
@@ -2,4 +2,4 @@
 <!-- Please add your release notes in the following format:
 - My change description (#PR/#issue)
 -->
-- Updated behavior of the HttpHeadersCollection implementation to avoid double validation of headers processed by the host.
+- Implementation of new (Track 2) Azure Storage SDK extensions (Blobs and Queues)
diff --git a/samples/FunctionApp/FunctionApp.csproj b/samples/FunctionApp/FunctionApp.csproj
@@ -14,7 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.3.0-local202106220952" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.0.3-local202106220952" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>

diff --git a/test/E2ETests/E2ETests/Fixtures/FunctionAppFixture.cs b/test/E2ETests/E2ETests/Fixtures/FunctionAppFixture.cs
@@ -94,7 +94,7 @@ await TestUtility.RetryAsync(async () =>
                         _logger.LogInformation($"  Current state: process starting");
                         return false;
                     }
-                });
+                }, userMessageCallback: ()=> "The host startup process failed." );
             }
         }
 

diff --git a/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs b/test/FunctionMetadataGeneratorTests/FunctionMetadataGeneratorTests.cs
@@ -160,7 +160,8 @@ public void StorageFunctions()
 
             AssertDictionary(extensions, new Dictionary<string, string>
             {
-                { "Microsoft.Azure.WebJobs.Extensions.Storage", "4.0.4" }
+                { "Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.0.0-beta.4" },
+                { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.0.0-beta.4" },
             });
 
             void ValidateQueueTrigger(ExpandoObject b)
@@ -263,7 +264,8 @@ public void MultiOutput_OnReturnType()
 
             AssertDictionary(extensions, new Dictionary<string, string>
             {
-                { "Microsoft.Azure.WebJobs.Extensions.Storage", "4.0.4" }
+                { "Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.0.0-beta.4" },
+                { "Microsoft.Azure.WebJobs.Extensions.Storage.Blobs", "5.0.0-beta.4" },
             });
 
             void ValidateQueueTrigger(ExpandoObject b)
@@ -325,7 +327,7 @@ public void MultiOutput_OnReturnType_WithHttp()
 
             AssertDictionary(extensions, new Dictionary<string, string>
             {
-                { "Microsoft.Azure.WebJobs.Extensions.Storage", "4.0.4" }
+                { "Microsoft.Azure.WebJobs.Extensions.Storage.Queues", "5.0.0-beta.4" }
             });
 
             void ValidateHttpTrigger(ExpandoObject b)

diff --git a/test/SdkE2ETests/PublishTests.cs b/test/SdkE2ETests/PublishTests.cs
@@ -77,9 +77,12 @@ private async Task RunPublishTest(string outputDir, string additionalParams = nu
                     new Extension("Startup",
                         "Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.Startup, Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader, Version=1.0.0.0, Culture=neutral, PublicKeyToken=551316b6919f366c",
                         @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.FunctionMetadataLoader.dll"),
-                    new Extension("AzureStorage",
-                        "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage, Version=4.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",
-                        @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.Storage.dll")
+                    new Extension("AzureStorageBlobs",
+                        "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageBlobsWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage.Blobs, Version=5.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8",
+                        @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs.dll"),
+                    new Extension("AzureStorageQueues",
+                        "Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageQueuesWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage.Queues, Version=5.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8",
+                        @"./.azurefunctions/Microsoft.Azure.WebJobs.Extensions.Storage.Queues.dll")
                 }
             });
             Assert.True(JToken.DeepEquals(extensionsJsonContents, expected), $"Actual: {extensionsJsonContents}{Environment.NewLine}Expected: {expected}");