This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f17e45d187eb259ac6cdd1107b904ad2992b936 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Dec 18 14:05:27 2020 +0100 CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String, fixed test --- .../component/aws2/sqs/integration/SqsComponentIntegrationTest.java | 4 +--- .../component/aws2/sqs/localstack/SqsComponentLocalstackTest.java | 4 +--- .../src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java index 6ca4578..d38d2ab 100644 --- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java +++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java @@ -111,9 +111,7 @@ public class SqsComponentIntegrationTest extends CamelTestSupport { credentials.accessKeyId(), credentials.secretAccessKey(), "1209600", "65536", "60", - "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyNewCamelQueue%2FSQSDefaultPolicy%22%2C%22" - + "Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22*%22%7D%2C%22" - + "Action%22%3A%22SQS%3AReceiveMessage%22%2C%22Resource%22%3A%22%2F195004372649%2FMyNewCamelQueue%22%7D%5D%7D", + "file:src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt", "#class:" + TestSqsConfiguration.class.getName()); return new RouteBuilder() { diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java index eebb2e4..d6ed735 100644 --- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java +++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java @@ -91,9 +91,7 @@ public class SqsComponentLocalstackTest extends Aws2SQSBaseTest { .format("aws2-sqs://%s?messageRetentionPeriod=%s&maximumMessageSize=%s&visibilityTimeout=%s&policy=%s", sharedNameGenerator.getName(), "1209600", "65536", "60", - "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyNewCamelQueue%2FSQSDefaultPolicy%22%2C%22" - + "Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22*%22%7D%2C%22" - + "Action%22%3A%22SQS%3AReceiveMessage%22%2C%22Resource%22%3A%22%2F195004372649%2FMyNewCamelQueue%22%7D%5D%7D"); + "file:src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt"); return new RouteBuilder() { @Override diff --git a/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt b/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt new file mode 100644 index 0000000..135a933 --- /dev/null +++ b/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt @@ -0,0 +1 @@ +{"Version":"2008-10-17","Id":"/195004372649/MyNewCamelQueue/SQSDefaultPolicy","Statement":[{"Sid":"Queue1ReceiveMessage","Effect":"Allow","Principal":{"AWS":"*"},"Action":"SQS:ReceiveMessage","Resource":"/195004372649/MyNewCamelQueue"}]}