Blob binding ReadWrite support

fabiocav · fabiocav · commit 7cdf784f93fb · 2016-05-03T13:55:32.000-07:00
diff --git a/src/WebJobs.Script/Binding/ApiHubBinding.cs b/src/WebJobs.Script/Binding/ApiHubBinding.cs
@@ -37,7 +37,7 @@ public ApiHubBinding(ScriptHostConfiguration config, ApiHubBindingMetadata apiHu
 
         public string Path { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();
 
diff --git a/src/WebJobs.Script/Binding/BlobBinding.cs b/src/WebJobs.Script/Binding/BlobBinding.cs
@@ -9,6 +9,7 @@
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
 using Microsoft.Azure.WebJobs.Host.Bindings.Runtime;
 using Microsoft.Azure.WebJobs.Script.Description;
+using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
@@ -53,12 +54,14 @@ public override async Task BindAsync(BindingContext context)
             await BindStreamAsync(context.Value, Access, context.Binder, runtimeContext);
         }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();
 
+            FileAccess access = GetAttributeAccess(parameterType);
+
             var constructorTypes = new Type[] { typeof(string), typeof(FileAccess) };
-            var constructorArguments = new object[] { Path, Access };
+            var constructorArguments = new object[] { Path, access };
             var attribute = new CustomAttributeBuilder(typeof(BlobAttribute).GetConstructor(constructorTypes), constructorArguments);
 
             attributes.Add(attribute);
@@ -70,5 +73,18 @@ public override Collection<CustomAttributeBuilder> GetCustomAttributes()
 
             return attributes;
         }
+
+        private FileAccess GetAttributeAccess(Type parameterType)
+        {
+            // The types bellow only support Read/Write access.
+            // When using them we ignore the acces and always assume ReadWrite
+            if (parameterType == typeof(ICloudBlob) || parameterType == typeof(CloudBlockBlob) ||
+               parameterType == typeof(CloudPageBlob) || parameterType == typeof(CloudBlobDirectory))
+            {
+                return FileAccess.ReadWrite;
+            }
+
+            return Access;
+        }
     }
 }
diff --git a/src/WebJobs.Script/Binding/DocumentDBBinding.cs b/src/WebJobs.Script/Binding/DocumentDBBinding.cs
@@ -46,7 +46,7 @@ public DocumentDBBinding(ScriptHostConfiguration config, DocumentDBBindingMetada
 
         public int CollectionThroughput { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Type attributeType = typeof(DocumentDBAttribute);
 
diff --git a/src/WebJobs.Script/Binding/EventHubBinding.cs b/src/WebJobs.Script/Binding/EventHubBinding.cs
@@ -30,7 +30,7 @@ public EventHubBinding(ScriptHostConfiguration config, EventHubBindingMetadata m
 
         public string EventHubName { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             var constructorTypes = new Type[] { typeof(string) };
             var constructorArguments = new object[] { EventHubName };
diff --git a/src/WebJobs.Script/Binding/FunctionBinding.cs b/src/WebJobs.Script/Binding/FunctionBinding.cs
@@ -32,7 +32,7 @@ protected FunctionBinding(ScriptHostConfiguration config, BindingMetadata metada
 
         public abstract Task BindAsync(BindingContext context);
 
-        public abstract Collection<CustomAttributeBuilder> GetCustomAttributes();
+        public abstract Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType);
 
         internal static Collection<FunctionBinding> GetBindings(ScriptHostConfiguration config, IEnumerable<BindingMetadata> bindingMetadatas, FileAccess fileAccess)
         {
diff --git a/src/WebJobs.Script/Binding/HttpBinding.cs b/src/WebJobs.Script/Binding/HttpBinding.cs
@@ -25,7 +25,7 @@ public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, Fil
         {
         }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             return null;
         }
diff --git a/src/WebJobs.Script/Binding/MobileTableBinding.cs b/src/WebJobs.Script/Binding/MobileTableBinding.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Reflection;
@@ -36,7 +37,7 @@ public MobileTableBinding(ScriptHostConfiguration config, MobileTableBindingMeta
 
         public string ApiKey { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             PropertyInfo[] props = new[]
             {
diff --git a/src/WebJobs.Script/Binding/NotificationHubBinding.cs b/src/WebJobs.Script/Binding/NotificationHubBinding.cs
@@ -32,7 +32,7 @@ public NotificationHubBinding(ScriptHostConfiguration config, NotificationHubBin
 
         public string HubName { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Type attributeType = typeof(NotificationHubAttribute);
             PropertyInfo[] props = new[]
diff --git a/src/WebJobs.Script/Binding/QueueBinding.cs b/src/WebJobs.Script/Binding/QueueBinding.cs
@@ -30,7 +30,7 @@ public QueueBinding(ScriptHostConfiguration config, QueueBindingMetadata metadat
 
         public string QueueName { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();
 
diff --git a/src/WebJobs.Script/Binding/ServiceBusBinding.cs b/src/WebJobs.Script/Binding/ServiceBusBinding.cs
@@ -31,7 +31,7 @@ public ServiceBusBinding(ScriptHostConfiguration config, ServiceBusBindingMetada
 
         public string QueueOrTopicName { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             var constructorTypes = new Type[] { typeof(string) };
             var constructorArguments = new object[] { QueueOrTopicName };
diff --git a/src/WebJobs.Script/Binding/TableBinding.cs b/src/WebJobs.Script/Binding/TableBinding.cs
@@ -60,7 +60,7 @@ public TableBinding(ScriptHostConfiguration config, TableBindingMetadata metadat
         public int Take { get; private set; }
         public string Filter { get; private set; }
 
-        public override Collection<CustomAttributeBuilder> GetCustomAttributes()
+        public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)
         {
             Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();
 
diff --git a/src/WebJobs.Script/Description/CSharp/CSharpFunctionDescriptionProvider.cs b/src/WebJobs.Script/Description/CSharp/CSharpFunctionDescriptionProvider.cs
@@ -120,7 +120,7 @@ protected override Collection<ParameterDescriptor> GetFunctionParameters(IFuncti
                         var binding = bindings.FirstOrDefault(b => string.Compare(b.Metadata.Name, parameter.Name, StringComparison.Ordinal) == 0);
                         if (binding != null)
                         {
-                            Collection<CustomAttributeBuilder> customAttributes = binding.GetCustomAttributes();
+                            Collection<CustomAttributeBuilder> customAttributes = binding.GetCustomAttributes(parameter.ParameterType);
                             if (customAttributes != null)
                             {
                                 foreach (var customAttribute in customAttributes)
diff --git a/test/WebJobs.Script.Tests/Binding/BlobBindingTests.cs b/test/WebJobs.Script.Tests/Binding/BlobBindingTests.cs
@@ -0,0 +1,73 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs.Script.Binding;
+using Microsoft.Azure.WebJobs.Script.Description;
+using Microsoft.WindowsAzure.Storage.Blob;
+using Xunit;
+
+namespace Microsoft.Azure.WebJobs.Script.Tests.Binding
+{
+    public class BlobBindingTests
+    {
+        [Theory]
+        [InlineData(typeof(ICloudBlob), FileAccess.Read, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudBlockBlob), FileAccess.Read, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudPageBlob), FileAccess.Read, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudBlobDirectory), FileAccess.Read, FileAccess.ReadWrite)]
+        [InlineData(typeof(ICloudBlob), FileAccess.Write, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudBlockBlob), FileAccess.Write, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudPageBlob), FileAccess.Write, FileAccess.ReadWrite)]
+        [InlineData(typeof(CloudBlobDirectory), FileAccess.Write, FileAccess.ReadWrite)]
+        [InlineData(typeof(Stream), FileAccess.Write, FileAccess.Write)]
+        [InlineData(typeof(Stream), FileAccess.Read, FileAccess.Read)]
+        [InlineData(typeof(Stream), FileAccess.Write, FileAccess.Write)]
+        [InlineData(typeof(TextReader), FileAccess.Read, FileAccess.Read)]
+        [InlineData(typeof(TextWriter), FileAccess.Write, FileAccess.Write)]
+        [InlineData(typeof(string), FileAccess.Read, FileAccess.Read)]
+        public void GetCustomAttributes_WithReadWriteTypes_AppliesReadWriteAccess(Type parameterType, FileAccess metadataAccess, FileAccess expectedAccess)
+        {
+            var metadata = new BlobBindingMetadata()
+            {
+                Path = "my/blob"
+            };
+            var binding = new BlobBinding(new ScriptHostConfiguration(), metadata, metadataAccess);
+
+            Collection<CustomAttributeBuilder> attributeBuilders = binding.GetCustomAttributes(parameterType);
+
+            // Get blob attribute
+            var builder = attributeBuilders.FirstOrDefault(b =>
+            string.CompareOrdinal(GetCustomAttributeBuilderFieldValue<ConstructorInfo>("m_con", b).DeclaringType.FullName,
+            "Microsoft.Azure.WebJobs.BlobAttribute") == 0);
+
+            Assert.NotNull(builder);
+
+            var attributeParameters = GetCustomAttributeBuilderFieldValue<object[]>("m_constructorArgs", builder);
+
+            Assert.Equal(2, attributeParameters.Length);
+            Assert.IsType(typeof(FileAccess), attributeParameters[1]);
+
+            FileAccess access = (FileAccess)attributeParameters[1];
+
+            Assert.Equal(expectedAccess, access);
+        }
+
+        private T GetCustomAttributeBuilderFieldValue<T>(string fieldName, object instance)
+        {
+            object result = typeof(CustomAttributeBuilder)
+                .GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
+                .GetValue(instance);
+
+            return result != null ? (T)result : default(T);
+        }
+    }
+}
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -249,6 +249,7 @@
     <Compile Include="AdminControllerTests.cs" />
     <Compile Include="AuthorizationLevelAttributeTests.cs" />
     <Compile Include="BashEndToEndTests.cs" />
+    <Compile Include="Binding\BlobBindingTests.cs" />
     <Compile Include="CompositeTraceWriterTests.cs" />
     <Compile Include="CSharpEndToEndTests.cs" />
     <Compile Include="CSharpFunctionSignatureTests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public ApiHubBinding(ScriptHostConfiguration config, ApiHubBindingMetadata apiHu`
`37`	`37`
`38`	`38`	`public string Path { get; private set; }`
`39`	`39`
`40`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`40`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`41`	`41`	`{`
`42`	`42`	`Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public DocumentDBBinding(ScriptHostConfiguration config, DocumentDBBindingMetada`
`46`	`46`
`47`	`47`	`public int CollectionThroughput { get; private set; }`
`48`	`48`
`49`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`49`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`50`	`50`	`{`
`51`	`51`	`Type attributeType = typeof(DocumentDBAttribute);`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public EventHubBinding(ScriptHostConfiguration config, EventHubBindingMetadata m`
`30`	`30`
`31`	`31`	`public string EventHubName { get; private set; }`
`32`	`32`
`33`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`33`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`34`	`34`	`{`
`35`	`35`	`var constructorTypes = new Type[] { typeof(string) };`
`36`	`36`	`var constructorArguments = new object[] { EventHubName };`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected FunctionBinding(ScriptHostConfiguration config, BindingMetadata metada`
`32`	`32`
`33`	`33`	`public abstract Task BindAsync(BindingContext context);`
`34`	`34`
`35`		`- public abstract Collection<CustomAttributeBuilder> GetCustomAttributes();`
	`35`	`+ public abstract Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType);`
`36`	`36`
`37`	`37`	`internal static Collection<FunctionBinding> GetBindings(ScriptHostConfiguration config, IEnumerable<BindingMetadata> bindingMetadatas, FileAccess fileAccess)`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, Fil`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
`28`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`28`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`29`	`29`	`{`
`30`	`30`	`return null;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
	`4`	`+using System;`
`4`	`5`	`using System.Collections.ObjectModel;`
`5`	`6`	`using System.IO;`
`6`	`7`	`using System.Reflection;`
`@@ -36,7 +37,7 @@ public MobileTableBinding(ScriptHostConfiguration config, MobileTableBindingMeta`
`36`	`37`
`37`	`38`	`public string ApiKey { get; private set; }`
`38`	`39`
`39`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`40`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`40`	`41`	`{`
`41`	`42`	`PropertyInfo[] props = new[]`
`42`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public NotificationHubBinding(ScriptHostConfiguration config, NotificationHubBin`
`32`	`32`
`33`	`33`	`public string HubName { get; private set; }`
`34`	`34`
`35`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`35`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`36`	`36`	`{`
`37`	`37`	`Type attributeType = typeof(NotificationHubAttribute);`
`38`	`38`	`PropertyInfo[] props = new[]`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public QueueBinding(ScriptHostConfiguration config, QueueBindingMetadata metadat`
`30`	`30`
`31`	`31`	`public string QueueName { get; private set; }`
`32`	`32`
`33`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`33`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`34`	`34`	`{`
`35`	`35`	`Collection<CustomAttributeBuilder> attributes = new Collection<CustomAttributeBuilder>();`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public ServiceBusBinding(ScriptHostConfiguration config, ServiceBusBindingMetada`
`31`	`31`
`32`	`32`	`public string QueueOrTopicName { get; private set; }`
`33`	`33`
`34`		`- public override Collection<CustomAttributeBuilder> GetCustomAttributes()`
	`34`	`+ public override Collection<CustomAttributeBuilder> GetCustomAttributes(Type parameterType)`
`35`	`35`	`{`
`36`	`36`	`var constructorTypes = new Type[] { typeof(string) };`
`37`	`37`	`var constructorArguments = new object[] { QueueOrTopicName };`