Particular · danielmarbach · Dec 19, 2018 · Dec 18, 2018 · Dec 19, 2018 · Dec 19, 2018
diff --git a/src/ServiceControl.AcceptanceTests/ConfigureEndpointSQSTransport.cs b/src/ServiceControl.AcceptanceTests/ConfigureEndpointSQSTransport.cs
@@ -1,7 +1,12 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
+using Amazon.Runtime;
+using Amazon.S3;
+using Amazon.SQS;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
 using ServiceBus.Management.AcceptanceTests;
+using ServiceControl.Transports.SQS;
 
 public class ConfigureEndpointSQSTransport : ITransportIntegration
 {
@@ -10,6 +15,15 @@ public Task Configure(string endpointName, EndpointConfiguration configuration,
         configuration.UseSerialization<NewtonsoftSerializer>();
 
         var transportConfig = configuration.UseTransport<SqsTransport>();
+        transportConfig.ClientFactory(CreateSQSClient);
+
+        S3BucketName = Environment.GetEnvironmentVariable(S3BucketEnvironmentVariableName);
+
+        if (!string.IsNullOrEmpty(S3BucketName))
+        {
+            var s3Configuration = transportConfig.S3(S3BucketName, S3Prefix);
+            s3Configuration.ClientFactory(CreateS3Client);
+        }
 
         var routing = transportConfig.Routing();
         foreach (var publisher in publisherMetadata.Publishers)
@@ -30,7 +44,24 @@ public Task Cleanup()
 
     public string Name => "SQS";
 
-    public string TypeName => $"{typeof(ServiceControl.Transports.SQS.SQSTransportCustomization).AssemblyQualifiedName}";
+    public string TypeName => $"{typeof(SQSTransportCustomization).AssemblyQualifiedName}";
 
     public string ConnectionString { get; set; }
+
+    static IAmazonSQS CreateSQSClient()
+    {
+        var credentials = new EnvironmentVariablesAWSCredentials();
+        return new AmazonSQSClient(credentials);
+    }
+
+    static IAmazonS3 CreateS3Client()
+    {
+        var credentials = new EnvironmentVariablesAWSCredentials();
+        return new AmazonS3Client(credentials);
+    }
+
+    const string S3Prefix = "test";
+
+    const string S3BucketEnvironmentVariableName = "NServiceBus_AmazonSQS_S3Bucket";
+    static string S3BucketName;
 }
diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
@@ -36,7 +36,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.SignalR.Client" Version="2.2.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.1.5" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.1.6" />
     <PackageReference Include="NServiceBus.Heartbeat" Version="3.0.0" />
     <PackageReference Include="NServiceBus.SagaAudit" Version="3.0.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />

diff --git a/src/ServiceControl.LoadTests.AuditGenerator/ServiceControl.LoadTests.AuditGenerator.csproj b/src/ServiceControl.LoadTests.AuditGenerator/ServiceControl.LoadTests.AuditGenerator.csproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\ServiceControl.Transports\ServiceControl.Transports.csproj" />
 
     <PackageReference Include="Metrics.NET" Version="0.5.5" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
+    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControl.Transports.ASB/ServiceControl.Transports.ASB.csproj b/src/ServiceControl.Transports.ASB/ServiceControl.Transports.ASB.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus" Version="9.0.3" />
     <PackageReference Include="NServiceBus.CustomChecks" Version="3.0.0" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
+    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/ServiceControl.Transports.ASBS/ServiceControl.Transports.ASBS.csproj b/src/ServiceControl.Transports.ASBS/ServiceControl.Transports.ASBS.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="NServiceBus.CustomChecks" Version="3.0.0" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="1.0.0-alpha0174" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="1.0.0" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/ServiceControl.Transports.ASQ/ServiceControl.Transports.ASQ.csproj b/src/ServiceControl.Transports.ASQ/ServiceControl.Transports.ASQ.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="NServiceBus.Azure.Transports.WindowsAzureStorageQueues" Version="8.1.0" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
+    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs b/src/ServiceControl.Transports.SQS/SQSTransportCustomization.cs
@@ -5,6 +5,8 @@
     using System.Linq;
     using System.Reflection;
     using Amazon;
+    using Amazon.Runtime;
+    using Amazon.SQS;
     using NServiceBus;
     using NServiceBus.Configuration.AdvancedExtensibility;
     using NServiceBus.Logging;
@@ -34,6 +36,9 @@ static void ConfigureTransport(TransportExtensions<SqsTransport> transport, Tran
             {
                 PromoteEnvironmentVariableFromConnectionString(builder, "AccessKeyId", "AWS_ACCESS_KEY_ID");
                 PromoteEnvironmentVariableFromConnectionString(builder, "SecretAccessKey", "AWS_SECRET_ACCESS_KEY");
+
+                // if the user provided the access key and secret access key they should always be loaded from environment credentials
+                transport.ClientFactory(() => new AmazonSQSClient(new EnvironmentVariablesAWSCredentials()));
             }
             else
             {

diff --git a/src/ServiceControl.Transports.SQS/ServiceControl.Transports.SQS.csproj b/src/ServiceControl.Transports.SQS/ServiceControl.Transports.SQS.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.AmazonSQS" Version="4.1.2" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
+    <PackageReference Include="NServiceBus.AmazonSQS" Version="4.2.0" />
+    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="NServiceBus.Testing" Version="7.0.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
-    <PackageReference Include="Particular.Approvals" Version="0.1.0" />
+    <PackageReference Include="Particular.Approvals" Version="0.2.0" />
     <PackageReference Include="PublicApiGenerator" Version="8.0.1" />
   </ItemGroup>
 

diff --git a/src/ServiceControl/Infrastructure/Nancy/JsonNetBodyDeserializer.cs b/src/ServiceControl/Infrastructure/Nancy/JsonNetBodyDeserializer.cs
@@ -10,6 +10,7 @@
     using global::Nancy.ModelBinding;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
+    using Newtonsoft.Json.Serialization;
     using ServiceControl.Infrastructure.SignalR;
 
     class JsonNetBodyDeserializer : IBodyDeserializer
@@ -24,8 +25,8 @@ public JsonNetBodyDeserializer()
                 ContractResolver = new UnderscoreMappingResolver(),
                 Converters =
                 {
-                    new IsoDateTimeConverter {DateTimeStyles = DateTimeStyles.RoundtripKind},
-                    new StringEnumConverter {CamelCaseText = true}
+                    new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.RoundtripKind },
+                    new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() }
                 }
             };
             serializer = JsonSerializer.Create(serializerSettings);

diff --git a/src/ServiceControl/Infrastructure/Nancy/JsonNetSerializer.cs b/src/ServiceControl/Infrastructure/Nancy/JsonNetSerializer.cs
@@ -8,6 +8,7 @@
     using global::Nancy.IO;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
+    using Newtonsoft.Json.Serialization;
     using ServiceControl.Infrastructure.SignalR;
 
     class JsonNetSerializer : ISerializer
@@ -93,7 +94,7 @@ public static JsonSerializerSettings CreateDefault()
                     },
                     new StringEnumConverter
                     {
-                        CamelCaseText = true
+                        NamingStrategy = new CamelCaseNamingStrategy()
                     }
                 }
             };

diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="NServiceBus" Version="7.1.6" />
     <PackageReference Include="NServiceBus.Autofac" Version="7.0.0" />
     <PackageReference Include="NServiceBus.CustomChecks" Version="3.0.0" />
-    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
+    <PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.2.0" />
     <PackageReference Include="NServiceBus.NLog" Version="3.0.0" />
     <PackageReference Include="NServiceBus.Raw" Version="3.0.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="3.0.1" />