fix cleanup

Author: GarrettBeatty

Libraries/src/Amazon.Lambda.Annotations.SourceGenerator/Writers/CloudFormationWriter.cs

@@ -224,15 +224,22 @@ private void ProcessLambdaFunctionEventAttributes(ILambdaFunctionSerializable la
                         break;
                     case AttributeModel<FunctionUrlAttribute> functionUrlAttributeModel:
                         ProcessFunctionUrlAttribute(lambdaFunction, functionUrlAttributeModel.Data);
+                        _templateWriter.SetToken($"Resources.{lambdaFunction.ResourceName}.Metadata.SyncedFunctionUrlConfig", true);
                         hasFunctionUrl = true;
                         break;
                 }
             }
 
-            // Remove FunctionUrlConfig if the attribute was removed
+            // Remove FunctionUrlConfig only if it was previously created by Annotations (tracked via metadata).
+            // This preserves any manually-added FunctionUrlConfig that was not created by the source generator.
             if (!hasFunctionUrl)
             {
-                _templateWriter.RemoveToken($"Resources.{lambdaFunction.ResourceName}.Properties.FunctionUrlConfig");
+                var syncedFunctionUrlConfigPath = $"Resources.{lambdaFunction.ResourceName}.Metadata.SyncedFunctionUrlConfig";
+                if (_templateWriter.GetToken<bool>(syncedFunctionUrlConfigPath, false))
+                {
+                    _templateWriter.RemoveToken($"Resources.{lambdaFunction.ResourceName}.Properties.FunctionUrlConfig");
+                    _templateWriter.RemoveToken(syncedFunctionUrlConfigPath);
+                }
             }
 
             SynchronizeEventsAndProperties(currentSyncedEvents, currentSyncedEventProperties, lambdaFunction);

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/Snapshots/ServerlessTemplates/functionUrlExample.template

@@ -6,7 +6,8 @@
     "TestServerlessAppFunctionUrlExampleGetItemsGenerated": {
       "Type": "AWS::Serverless::Function",
       "Metadata": {
-        "Tool": "Amazon.Lambda.Annotations"
+        "Tool": "Amazon.Lambda.Annotations",
+        "SyncedFunctionUrlConfig": true
       },
       "Properties": {
         "MemorySize": 512,

Libraries/test/Amazon.Lambda.Annotations.SourceGenerators.Tests/WriterTests/FunctionUrlTests.cs

@@ -282,6 +282,90 @@ public void FunctionUrlConfigRemovedWhenAttributeRemoved(CloudFormationTemplateF
             Assert.False(templateWriter.Exists("Resources.TestMethod.Properties.FunctionUrlConfig"));
         }
 
+        [Theory]
+        [InlineData(CloudFormationTemplateFormat.Json)]
+        [InlineData(CloudFormationTemplateFormat.Yaml)]
+        public void ManualFunctionUrlConfigPreservedWhenNoAttribute(CloudFormationTemplateFormat templateFormat)
+        {
+            // Simulate a template where FunctionUrlConfig was manually added (no SyncedFunctionUrlConfig metadata)
+            var content = templateFormat == CloudFormationTemplateFormat.Json
+                ? @"{
+                      'AWSTemplateFormatVersion': '2010-09-09',
+                      'Transform': 'AWS::Serverless-2016-10-31',
+                      'Resources': {
+                        'TestMethod': {
+                          'Type': 'AWS::Serverless::Function',
+                          'Metadata': {
+                            'Tool': 'Amazon.Lambda.Annotations'
+                          },
+                          'Properties': {
+                            'Runtime': 'dotnet8',
+                            'CodeUri': '',
+                            'MemorySize': 512,
+                            'Timeout': 30,
+                            'Policies': ['AWSLambdaBasicExecutionRole'],
+                            'PackageType': 'Image',
+                            'ImageUri': '.',
+                            'ImageConfig': { 'Command': ['MyAssembly::MyNamespace.MyType::Handler'] },
+                            'FunctionUrlConfig': {
+                              'AuthType': 'AWS_IAM'
+                            }
+                          }
+                        }
+                      }
+                    }"
+                : "AWSTemplateFormatVersion: '2010-09-09'\nTransform: AWS::Serverless-2016-10-31\nResources:\n  TestMethod:\n    Type: AWS::Serverless::Function\n    Metadata:\n      Tool: Amazon.Lambda.Annotations\n    Properties:\n      Runtime: dotnet8\n      CodeUri: ''\n      MemorySize: 512\n      Timeout: 30\n      Policies:\n        - AWSLambdaBasicExecutionRole\n      PackageType: Image\n      ImageUri: .\n      ImageConfig:\n        Command:\n          - 'MyAssembly::MyNamespace.MyType::Handler'\n      FunctionUrlConfig:\n        AuthType: AWS_IAM";
+
+            var mockFileManager = GetMockFileManager(content);
+            var lambdaFunctionModel = GetLambdaFunctionModel("MyAssembly::MyNamespace.MyType::Handler",
+                "TestMethod", 30, 512, null, null);
+            // No FunctionUrl attribute
+            lambdaFunctionModel.Attributes = new List<AttributeModel>();
+            var cloudFormationWriter = GetCloudFormationWriter(mockFileManager, _directoryManager, templateFormat, _diagnosticReporter);
+            var report = GetAnnotationReport(new List<ILambdaFunctionSerializable> { lambdaFunctionModel });
+            ITemplateWriter templateWriter = templateFormat == CloudFormationTemplateFormat.Json ? new JsonWriter() : new YamlWriter();
+
+            cloudFormationWriter.ApplyReport(report);
+
+            templateWriter.Parse(mockFileManager.ReadAllText(ServerlessTemplateFilePath));
+            // The manually-added FunctionUrlConfig should be preserved
+            Assert.True(templateWriter.Exists("Resources.TestMethod.Properties.FunctionUrlConfig"));
+            Assert.Equal("AWS_IAM", templateWriter.GetToken<string>("Resources.TestMethod.Properties.FunctionUrlConfig.AuthType"));
+        }
+
+        [Theory]
+        [InlineData(CloudFormationTemplateFormat.Json)]
+        [InlineData(CloudFormationTemplateFormat.Yaml)]
+        public void FunctionUrlMetadataTrackedAndCleanedUp(CloudFormationTemplateFormat templateFormat)
+        {
+            // First pass: create FunctionUrlConfig via attribute
+            var mockFileManager = GetMockFileManager(string.Empty);
+            var lambdaFunctionModel = GetLambdaFunctionModel("MyAssembly::MyNamespace.MyType::Handler",
+                "TestMethod", 30, 512, null, null);
+            lambdaFunctionModel.Attributes = new List<AttributeModel>
+            {
+                new AttributeModel<FunctionUrlAttribute> { Data = new FunctionUrlAttribute() }
+            };
+            var cloudFormationWriter = GetCloudFormationWriter(mockFileManager, _directoryManager, templateFormat, _diagnosticReporter);
+            ITemplateWriter templateWriter = templateFormat == CloudFormationTemplateFormat.Json ? new JsonWriter() : new YamlWriter();
+
+            cloudFormationWriter.ApplyReport(GetAnnotationReport(new List<ILambdaFunctionSerializable> { lambdaFunctionModel }));
+            templateWriter.Parse(mockFileManager.ReadAllText(ServerlessTemplateFilePath));
+
+            // Verify metadata is set
+            Assert.True(templateWriter.Exists("Resources.TestMethod.Properties.FunctionUrlConfig"));
+            Assert.True(templateWriter.GetToken<bool>("Resources.TestMethod.Metadata.SyncedFunctionUrlConfig"));
+
+            // Second pass: remove the attribute
+            lambdaFunctionModel.Attributes = new List<AttributeModel>();
+            cloudFormationWriter.ApplyReport(GetAnnotationReport(new List<ILambdaFunctionSerializable> { lambdaFunctionModel }));
+            templateWriter.Parse(mockFileManager.ReadAllText(ServerlessTemplateFilePath));
+
+            // Verify both FunctionUrlConfig and metadata are cleaned up
+            Assert.False(templateWriter.Exists("Resources.TestMethod.Properties.FunctionUrlConfig"));
+            Assert.False(templateWriter.Exists("Resources.TestMethod.Metadata.SyncedFunctionUrlConfig"));
+        }
+
         [Theory]
         [InlineData(CloudFormationTemplateFormat.Json)]
         [InlineData(CloudFormationTemplateFormat.Yaml)]

Libraries/test/TestServerlessApp/serverless.template

@@ -1343,7 +1343,8 @@
     "TestServerlessAppFunctionUrlExampleGetItemsGenerated": {
       "Type": "AWS::Serverless::Function",
       "Metadata": {
-        "Tool": "Amazon.Lambda.Annotations"
+        "Tool": "Amazon.Lambda.Annotations",
+        "SyncedFunctionUrlConfig": true
       },
       "Properties": {
         "MemorySize": 512,