pr comments

Author: GarrettBeatty

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Validation/LambdaFunctionValidator.cs

@@ -555,14 +555,15 @@ private static void ValidateScheduleEvents(LambdaFunctionModel lambdaFunctionMod
                 validationErrors.ForEach(errorMessage => diagnostics.Add(Diagnostic.Create(DiagnosticDescriptors.InvalidScheduleEventAttribute, methodLocation, errorMessage)));
             }
 
-            // Validate method parameters
+            // Validate method parameters - When using ScheduleEventAttribute, the method signature must be (ScheduledEvent evnt) or (ScheduledEvent evnt, ILambdaContext context)
             var parameters = lambdaFunctionModel.LambdaMethod.Parameters;
-            if (parameters.Count > 2 ||
-                (parameters.Count >= 1 && parameters[0].Type.FullName != TypeFullNames.ScheduledEvent) ||
-                (parameters.Count == 2 && parameters[1].Type.FullName != TypeFullNames.ILambdaContext))
+            if (parameters.Count == 0 ||
+                parameters.Count > 2 ||
+                (parameters.Count == 1 && parameters[0].Type.FullName != TypeFullNames.ScheduledEvent) ||
+                (parameters.Count == 2 && (parameters[0].Type.FullName != TypeFullNames.ScheduledEvent || parameters[1].Type.FullName != TypeFullNames.ILambdaContext)))
             {
                 var errorMessage = $"When using the {nameof(ScheduleEventAttribute)}, the Lambda method can accept at most 2 parameters. " +
-                    $"The first parameter must be of type {TypeFullNames.ScheduledEvent}. " +
+                    $"The first parameter is required and must be of type {TypeFullNames.ScheduledEvent}. " +
                     $"The second parameter is optional and must be of type {TypeFullNames.ILambdaContext}.";
                 diagnostics.Add(Diagnostic.Create(DiagnosticDescriptors.InvalidLambdaMethodSignature, methodLocation, errorMessage));
             }

Libraries/src/Amazon.Lambda.Annotations/Schedule/ScheduleEventAttribute.cs

@@ -34,7 +34,7 @@ public string ResourceName
                     return resourceName;
                 }
                 // Generate a default resource name from the schedule expression
-                var sanitized = string.Join(string.Empty, Schedule.Where(char.IsLetterOrDigit));
+                var sanitized = string.Join(string.Empty, (Schedule ?? string.Empty).Where(char.IsLetterOrDigit));
                 return sanitized.Length > 0 ? sanitized : "ScheduleEvent";
             }
             set => resourceName = value;
@@ -60,7 +60,7 @@ public string ResourceName
         /// </summary>
         public bool Enabled
         {
-            get => enabled.GetValueOrDefault();
+            get => enabled.GetValueOrDefault(true);
             set => enabled = value;
         }
         private bool? enabled { get; set; }

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/ScheduleEventAttributeTests.cs

@@ -221,6 +221,25 @@ public void Validate_MultipleErrors_ReturnsAll()
             Assert.Equal(2, errors.Count);
         }
 
+        [Fact]
+        public void Enabled_DefaultValueIsTrue_WhenNotExplicitlySet()
+        {
+            var attr = new ScheduleEventAttribute("rate(5 minutes)");
+
+            Assert.False(attr.IsEnabledSet);
+            Assert.True(attr.Enabled);
+        }
+
+        [Fact]
+        public void ResourceName_NullSchedule_DoesNotThrow()
+        {
+            var attr = new ScheduleEventAttribute(null);
+
+            // Should not throw NullReferenceException
+            var resourceName = attr.ResourceName;
+            Assert.Equal("ScheduleEvent", resourceName);
+        }
+
         [Fact]
         public void Validate_AllValidWithOptionals_ReturnsNoErrors()
         {

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/SourceGeneratorTests.cs

@@ -1681,7 +1681,7 @@ public async Task VerifyInvalidScheduleEvents_ThrowsCompilationErrors()
                         DiagnosticResult.CompilerError("AWSLambda0117")
                             .WithSpan($"TestServerlessApp{Path.DirectorySeparatorChar}ScheduleEventExamples{Path.DirectorySeparatorChar}InvalidScheduleEvents.cs", 24, 9, 29, 10)
                             .WithArguments("When using the ScheduleEventAttribute, the Lambda method can accept at most 2 parameters. " +
-                            "The first parameter must be of type Amazon.Lambda.CloudWatchEvents.ScheduledEvents.ScheduledEvent. " +
+                            "The first parameter is required and must be of type Amazon.Lambda.CloudWatchEvents.ScheduledEvents.ScheduledEvent. " +
                             "The second parameter is optional and must be of type Amazon.Lambda.Core.ILambdaContext."),
 
                         // ProcessMessageWithInvalidReturnType: returns bool

Libraries/test/TestServerlessApp.IntegrationTests/ScheduleEventRule.cs

@@ -25,13 +25,43 @@ public async Task VerifyScheduleEventRuleConfiguration()
             var lambdaFunctionName = _fixture.LambdaFunctions.FirstOrDefault(x => string.Equals(x.LogicalId, "ScheduledHandler"))?.Name;
             Assert.NotNull(lambdaFunctionName);
 
-            // SAM creates EventBridge rules with names derived from the stack
             var eventsClient = new AmazonCloudWatchEventsClient(Amazon.RegionEndpoint.USWest2);
-            var rulesResponse = await eventsClient.ListRulesAsync(new ListRulesRequest());
 
-            // Find the rule targeting our function
-            var matchingRule = rulesResponse.Rules.FirstOrDefault(r =>
-                r.Name.Contains("FiveMinuteSchedule") || r.Name.Contains("ScheduledHandler"));
+            // Paginate through all rules and verify the rule targets the correct Lambda function
+            Rule matchingRule = null;
+            string nextToken = null;
+
+            do
+            {
+                var rulesResponse = await eventsClient.ListRulesAsync(new ListRulesRequest
+                {
+                    NextToken = nextToken
+                });
+
+                foreach (var rule in rulesResponse.Rules.Where(r =>
+                    string.Equals(r.ScheduleExpression, "rate(5 minutes)") &&
+                    string.Equals(r.Description, "Runs every 5 minutes")))
+                {
+                    var targetsResponse = await eventsClient.ListTargetsByRuleAsync(new ListTargetsByRuleRequest
+                    {
+                        Rule = rule.Name
+                    });
+
+                    if (targetsResponse.Targets.Any(t => t.Arn != null && t.Arn.Contains($":function:{lambdaFunctionName}")))
+                    {
+                        matchingRule = rule;
+                        break;
+                    }
+                }
+
+                if (matchingRule != null)
+                {
+                    break;
+                }
+
+                nextToken = rulesResponse.NextToken;
+            }
+            while (!string.IsNullOrEmpty(nextToken));
 
             Assert.NotNull(matchingRule);
             Assert.Equal("rate(5 minutes)", matchingRule.ScheduleExpression);

Libraries/test/TestServerlessApp.IntegrationTests/TestServerlessApp.IntegrationTests.csproj

@@ -10,7 +10,7 @@
         <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.99" />
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.513.1" />
         <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.502.58" />
-        <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.*" />
+        <PackageReference Include="AWSSDK.CloudWatchEvents" Version="3.7.1.99" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.4.1" />