Use raw string literals

justeattakeaway · Feb 19, 2024 · f9ab280 · f9ab280
1 parent e8aa7e3
commit f9ab280
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 56 deletions.
diff --git a/src/JustSaying/AwsTools/MessageHandling/SnsPolicyBuilder.cs b/src/JustSaying/AwsTools/MessageHandling/SnsPolicyBuilder.cs
@@ -12,41 +12,43 @@ 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"" : {JsonSerializer.Serialize(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" : {{JsonSerializer.Serialize(policyDetails.AccountIds)}}
+                             },
+                             "Action"    : "sns:Subscribe",
+                             "Resource"  : "{{policyDetails.SourceArn}}"
+                         }
+                     ]
+                 }
+                 """;
     }
 }
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/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()
                 };