Merge branch 'main' into hwoodiwiss-native-aot

justeattakeaway · Feb 20, 2024 · 067b3a9 · 067b3a9
2 parents 68d150e + 54551ab
commit 067b3a9
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 74 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,6 +17,6 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Review dependencies
-        uses: actions/dependency-review-action@80f10bf419f34980065523f5efca7ebed17576aa # v4.1.0
+        uses: actions/dependency-review-action@be8bc500ee15e96754d2a6f2d34be14e945a46f3 # v4.1.2
         with:
           allow-licenses: 'Apache-2.0,BSD-2-Clause,BSD-3-Clause,MIT'
diff --git a/src/JustSaying.Extensions.Aws/JustSaying.Extensions.Aws.csproj b/src/JustSaying.Extensions.Aws/JustSaying.Extensions.Aws.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsShipping>true</IsShipping>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/JustSaying.Extensions.Aws/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/JustSaying.Extensions.Aws/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1,3 @@
+Microsoft.Extensions.DependencyInjection.IServiceCollectionExtensions
+static Microsoft.Extensions.DependencyInjection.IServiceCollectionExtensions.AddJustSayingWithAwsConfig(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfiguration configuration, System.Action<JustSaying.MessagingBusBuilder, System.IServiceProvider> builderConfig) -> void
+static Microsoft.Extensions.DependencyInjection.IServiceCollectionExtensions.AddJustSayingWithAwsConfig(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfiguration configuration, System.Action<JustSaying.MessagingBusBuilder> builderConfig) -> void
diff --git a/src/JustSaying.Extensions.Aws/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/JustSaying.Extensions.Aws/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/...dencyInjection.StructureMap/JustSaying.Extensions.DependencyInjection.StructureMap.csproj b/...dencyInjection.StructureMap/JustSaying.Extensions.DependencyInjection.StructureMap.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>StructureMap</RootNamespace>
     <!-- StructureMap is not strong-named, so this assembly also cannot be -->
     <SignAssembly>false</SignAssembly>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\JustSaying\JustSaying.csproj" />

diff --git a/...Saying.Extensions.DependencyInjection.StructureMap/PublicAPI/net8.0/PublicAPI.Shipped.txt b/...Saying.Extensions.DependencyInjection.StructureMap/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -0,0 +1,7 @@
+static StructureMap.ConfigurationExpressionExtensions.AddJustSaying(this StructureMap.ConfigurationExpression registry) -> void
+static StructureMap.ConfigurationExpressionExtensions.AddJustSaying(this StructureMap.ConfigurationExpression registry, string region) -> void
+static StructureMap.ConfigurationExpressionExtensions.AddJustSaying(this StructureMap.ConfigurationExpression registry, System.Action<JustSaying.MessagingBusBuilder, StructureMap.IContext> configure) -> void
+static StructureMap.ConfigurationExpressionExtensions.AddJustSaying(this StructureMap.ConfigurationExpression registry, System.Action<JustSaying.MessagingBusBuilder> configure) -> void
+static StructureMap.RegistryExtensions.AddJustSayingHandler<TMessage, THandler>(this StructureMap.Registry registry) -> void
+StructureMap.ConfigurationExpressionExtensions
+StructureMap.RegistryExtensions
diff --git a/...ying.Extensions.DependencyInjection.StructureMap/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/...ying.Extensions.DependencyInjection.StructureMap/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/src/JustSaying/AwsTools/MessageHandling/PublishException.cs b/src/JustSaying/AwsTools/MessageHandling/PublishException.cs
@@ -1,8 +1,12 @@
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace JustSaying.AwsTools.MessageHandling;
 
+#if !NET8_0_OR_GREATER
 [Serializable]
+#endif
 public class PublishException : Exception
 {
     public PublishException() : base("Failed to publish message")

diff --git a/src/JustSaying/AwsTools/MessageHandling/SnsPolicyBuilder.cs b/src/JustSaying/AwsTools/MessageHandling/SnsPolicyBuilder.cs
@@ -13,42 +13,44 @@ internal static string BuildPolicyJson(SnsPolicyDetails policyDetails)
             throw new ArgumentException("Must be a valid ARN.", nameof(policyDetails));
         }
         var accountId = arn.AccountId;
-        return $@"{{
-    ""Version"" : ""2012-10-17"",
-    ""Statement"" : [
-        {{
-            ""Sid"" : ""{Guid.NewGuid().ToString().Replace("-", "")}"",
-            ""Effect"" : ""Allow"",
-            ""Principal"" : {{
-                ""AWS"" : ""*""
-            }},
-            ""Action""    : [
-                ""sns:GetTopicAttributes"",
-                ""sns:SetTopicAttributes"",
-                ""sns:AddPermission"",
-                ""sns:RemovePermission"",
-                ""sns:DeleteTopic"",
-                ""sns:Subscribe"",
-                ""sns:Publish""
-            ],
-            ""Resource""  : ""{policyDetails.SourceArn}"",
-            ""Condition"" : {{
-                ""StringEquals"" : {{
-                    ""AWS:SourceOwner"" : ""{accountId}""
-                }}
-            }}
-        }},
-        {{
-            ""Sid"" : ""{Guid.NewGuid().ToString().Replace("-", "")}"",
-            ""Effect"" : ""Allow"",
-            ""Principal"" : {{
-                ""AWS"" : {SerializeAccountIds(policyDetails.AccountIds)}
-            }},
-            ""Action""    : ""sns:Subscribe"",
-            ""Resource""  : ""{policyDetails.SourceArn}""
-        }}
-    ]
-}}";
+        return $$"""
+                 {
+                     "Version" : "2012-10-17",
+                     "Statement" : [
+                         {
+                             "Sid" : "{{Guid.NewGuid().ToString().Replace("-", "")}}",
+                             "Effect" : "Allow",
+                             "Principal" : {
+                                 "AWS" : "*"
+                             },
+                             "Action"    : [
+                                 "sns:GetTopicAttributes",
+                                 "sns:SetTopicAttributes",
+                                 "sns:AddPermission",
+                                 "sns:RemovePermission",
+                                 "sns:DeleteTopic",
+                                 "sns:Subscribe",
+                                 "sns:Publish"
+                             ],
+                             "Resource"  : "{{policyDetails.SourceArn}}",
+                             "Condition" : {
+                                 "StringEquals" : {
+                                     "AWS:SourceOwner" : "{{accountId}}"
+                                 }
+                             }
+                         },
+                         {
+                             "Sid" : "{{Guid.NewGuid().ToString().Replace("-", "")}}",
+                             "Effect" : "Allow",
+                             "Principal" : {
+                                 "AWS" : {{SerializeAccountIds(policyDetails.AccountIds)}}
+                             },
+                             "Action"    : "sns:Subscribe",
+                             "Resource"  : "{{policyDetails.SourceArn}}"
+                         }
+                     ]
+                 }
+                 """;
     }
 
     private static string SerializeAccountIds(IReadOnlyCollection<string> accountIds)

diff --git a/src/JustSaying/AwsTools/MessageHandling/SqsPolicyBuilder.cs b/src/JustSaying/AwsTools/MessageHandling/SqsPolicyBuilder.cs
@@ -14,25 +14,27 @@ public static string BuildPolicyJson(SqsPolicyDetails policyDetails)
             ? "*"
             : CreateTopicArnWildcard(policyDetails.SourceArn);
 
-        var policyJson = $@"{{
-    ""Version"" : ""2012-10-17"",
-    ""Statement"" : [
-        {{
-            ""Sid"" : ""{sid}"",
-            ""Effect"" : ""Allow"",
-            ""Principal"" : {{
-                ""AWS"" : ""*""
-            }},
-            ""Action""    : ""sqs:SendMessage"",
-            ""Resource""  : ""{resource}"",
-            ""Condition"" : {{
-                ""ArnLike"" : {{
-                    ""aws:SourceArn"" : ""{topicArnWildcard}""
-                }}
-            }}
-        }}
-    ]
-}}";
+        var policyJson = $$"""
+                           {
+                               "Version" : "2012-10-17",
+                               "Statement" : [
+                                   {
+                                       "Sid" : "{{sid}}",
+                                       "Effect" : "Allow",
+                                       "Principal" : {
+                                           "AWS" : "*"
+                                       },
+                                       "Action"    : "sqs:SendMessage",
+                                       "Resource"  : "{{resource}}",
+                                       "Condition" : {
+                                           "ArnLike" : {
+                                               "aws:SourceArn" : "{{topicArnWildcard}}"
+                                           }
+                                       }
+                                   }
+                               ]
+                           }
+                           """;
         return policyJson;
     }
 

diff --git a/src/JustSaying/AwsTools/QueueCreation/ConfigurationErrorsException.cs b/src/JustSaying/AwsTools/QueueCreation/ConfigurationErrorsException.cs
@@ -1,8 +1,12 @@
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace JustSaying.AwsTools.QueueCreation;
 
+#if !NET8_0_OR_GREATER
 [Serializable]
+#endif
 public class ConfigurationErrorsException : Exception
 {
     public ConfigurationErrorsException() : base("Invalid configuration")

diff --git a/src/JustSaying/HandlerNotRegisteredWithContainerException.cs b/src/JustSaying/HandlerNotRegisteredWithContainerException.cs
@@ -1,8 +1,12 @@
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace JustSaying;
 
+#if !NET8_0_OR_GREATER
 [Serializable]
+#endif
 public class HandlerNotRegisteredWithContainerException : Exception
 {
     public HandlerNotRegisteredWithContainerException() : base("Handler not registered with container")

diff --git a/src/JustSaying/Messaging/MessageSerialization/MessageFormatNotSupportedException.cs b/src/JustSaying/Messaging/MessageSerialization/MessageFormatNotSupportedException.cs
@@ -1,8 +1,12 @@
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace JustSaying.Messaging.MessageSerialization;
 
+#if !NET8_0_OR_GREATER
 [Serializable]
+#endif
 public class MessageFormatNotSupportedException : Exception
 {
     public MessageFormatNotSupportedException() : base("Message format not supported")
@@ -18,6 +22,7 @@ public MessageFormatNotSupportedException(string message, Exception innerExcepti
     }
 #if !NET8_0_OR_GREATER
 
+#if !NET8_0_OR_GREATER
     protected MessageFormatNotSupportedException(SerializationInfo info, StreamingContext context) : base(info, context)
     {
     }

diff --git a/src/JustSaying/Messaging/MessageSerialization/SystemTextJsonSerializer.cs b/src/JustSaying/Messaging/MessageSerialization/SystemTextJsonSerializer.cs
@@ -14,6 +14,19 @@ namespace JustSaying.Messaging.MessageSerialization;
 #endif
 public partial class SystemTextJsonSerializer : IMessageSerializer
 {
+    private static readonly JsonSerializerOptions DefaultJsonSerializerOptions = new()
+    {
+#if NET8_0_OR_GREATER
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+#else
+        IgnoreNullValues = true,
+#endif
+        Converters =
+        {
+            new JsonStringEnumConverter(),
+        },
+    };
+
     private readonly JsonSerializerOptions _options;
 
     /// <summary>
@@ -30,21 +43,7 @@ public SystemTextJsonSerializer()
     /// <param name="options">The optional <see cref="JsonSerializerOptions"/> to use.</param>
     public SystemTextJsonSerializer(JsonSerializerOptions options)
     {
-        if (options == null)
-        {
-            options = new JsonSerializerOptions
-            {
-#if NET8_0_OR_GREATER
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-#else
-                IgnoreNullValues = true,
-#endif
-            };
-
-            options.Converters.Add(new JsonStringEnumConverter());
-        }
-
-        _options = options;
+        _options = options ?? DefaultJsonSerializerOptions;
     }
 
     /// <inheritdoc />

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUsingABasicThrottle.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUsingABasicThrottle.cs
@@ -72,7 +72,7 @@ public async Task Messages_Are_Throttled_But_Still_Delivered(int throttleMessage
             {
                 var batchEntry = new SendMessageBatchRequestEntry
                 {
-                    MessageBody = $"{{\"Subject\":\"SimpleMessage\", \"Message\": {{ \"Content\": \"{entriesAdded}\"}}}}",
+                    MessageBody = $$"""{"Subject":"SimpleMessage", "Message": { "Content": "{{entriesAdded}}"} }""",
                     Id = Guid.NewGuid().ToString()
                 };