Merge pull request #28 from cythral/LAMBJ-37

LAMBJ-37 v0.3.0-beta3
LAMBJ-36 Client Factories RoleArn Fix

Author: talenfisher

.github/releases/v0.3.0-beta3.md

@@ -0,0 +1,3 @@
+This release introduces the following:
+
+- Fixes an issue where client factories would attempt to do an sts:AssumeRole if no role arn was given.

src/Generator/LambdaGenerator.cs

@@ -373,7 +373,7 @@ MemberDeclarationSyntax GenerateCreateMethod()
 
                 IEnumerable<StatementSyntax> GenerateBody()
                 {
-                    yield return IfStatement(ParseExpression("roleArn == null"),
+                    yield return IfStatement(ParseExpression("roleArn != null"),
                         Block(
                             ParseStatement("var request = new AssumeRoleRequest { RoleArn = roleArn, RoleSessionName = \"lambdajection-assume-role\" };"),
                             ParseStatement("var response = await stsClient.AssumeRoleAsync(request);"),

tests/WithFactories/IntegrationTests.cs

@@ -1,7 +1,11 @@
+using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Amazon.Lambda.Core;
 using Amazon.S3;
+using Amazon.SecurityToken;
+using Amazon.SecurityToken.Model;
 
 using FluentAssertions;
 
@@ -12,8 +16,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-using NUnit.Framework;
+using NSubstitute;
 
+using NUnit.Framework;
 namespace Lambdajection.Tests
 {
     [Lambda(Startup = typeof(Startup))]
@@ -86,5 +91,33 @@ public async Task TestExampleLambdaRun()
 
             result.Should().BeEquivalentTo("foo bar");
         }
+
+        [Test]
+        public async Task TestFactoriesDoNotPerformAssumeRoleIfNoRoleArnGiven()
+        {
+            var client = Substitute.For<IAmazonSecurityTokenService>();
+            var configuratorType = typeof(ExampleLambda).GetNestedType("LambdajectionConfigurator", BindingFlags.NonPublic)!;
+            var s3FactoryType = configuratorType.GetNestedType("S3Factory", BindingFlags.NonPublic)!;
+            var factory = Activator.CreateInstance(s3FactoryType, new object[] { client });
+            var createMethod = s3FactoryType.GetMethod("Create")!;
+            createMethod.Invoke(factory, new object[] { null! });
+
+            await client.DidNotReceive().AssumeRoleAsync(Arg.Any<AssumeRoleRequest>());
+        }
+
+        [Test]
+        public async Task TestFactoriesPerformAssumeRoleIfRoleArnGiven()
+        {
+            var client = Substitute.For<IAmazonSecurityTokenService>();
+            var configuratorType = typeof(ExampleLambda).GetNestedType("LambdajectionConfigurator", BindingFlags.NonPublic)!;
+            var s3FactoryType = configuratorType.GetNestedType("S3Factory", BindingFlags.NonPublic)!;
+            var factory = Activator.CreateInstance(s3FactoryType, new object[] { client });
+            var createMethod = s3FactoryType.GetMethod("Create")!;
+            var roleArn = "rolearn";
+
+            createMethod.Invoke(factory, new object[] { roleArn });
+
+            await client.Received().AssumeRoleAsync(Arg.Is<AssumeRoleRequest>(req => req.RoleArn == roleArn));
+        }
     }
 }

version.json

@@ -1,5 +1,5 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.3.0-beta2",
+  "version": "0.3.0-beta3",
   "publicReleaseRefSpec": ["^refs/heads/master$", "^refs/tags/v\\d\\.\\d"]
 }