fix: AWS provisioning - SQS queue

Author: ErikZigo

azure-pipelines.yml

@@ -47,6 +47,7 @@ stages:
               TEST_AWS_ACCESS_KEY_ID: $(TEST_AWS_ACCESS_KEY_ID)
               TEST_AWS_SECRET_ACCESS_KEY: $(TEST_AWS_SECRET_ACCESS_KEY)
               HOSTNAME_SUFFIX: $(HOSTNAME_SUFFIX)
+              AWS_SQS_QUEUE_URL: $(AWS_SQS_QUEUE_URL)
 
   - stage: tests
     dependsOn: prepare

provisioning/aws.json

@@ -3,19 +3,10 @@
     "Description": "Resources for Notification Tests",
     "Parameters": {},
     "Resources": {
-        "NotificationS3LogsBucket": {
-            "Type": "AWS::S3::Bucket",
+        "NotificationQueue": {
+            "Type": "AWS::SQS::Queue",
             "Properties": {
-                "LifecycleConfiguration": {
-                    "Rules": [
-                        {
-                            "Id": "Delete debug files",
-                            "Prefix": "debug-files/",
-                            "ExpirationInDays": 7,
-                            "Status": "Enabled"
-                        }
-                    ]
-                },
+                "VisibilityTimeout": 30,
                 "Tags": [
                     {
                         "Key": "KeboolaStack",
@@ -33,37 +24,23 @@
                 "Path": "/",
                 "Policies": [
                     {
-                        "PolicyName": "UseS3BucketPolicy",
+                        "PolicyName": "UseSQSQueuePolicy",
                         "PolicyDocument": {
                             "Statement": [
                                 {
-                                    "Sid": "UseS3Bucket",
+                                    "Sid": "UseSQSQueue",
                                     "Effect": "Allow",
                                     "Action": [
-                                        "s3:PutObject",
-                                        "s3:GetObject",
-                                        "s3:ListBucket",
-                                        "s3:DeleteObject"
+                                        "sqs:GetQueueAttributes",
+                                        "sqs:SendMessage",
+                                        "sqs:ReceiveMessage",
+                                        "sqs:DeleteMessage",
+                                        "sqs:ChangeMessageVisibility"
                                     ],
                                     "Resource": [
-                                        {
-                                            "Fn::Join": [
-                                                "",
-                                                [
-                                                    "",
-                                                    {
-                                                        "Fn::GetAtt": [
-                                                            "NotificationS3LogsBucket",
-                                                            "Arn"
-                                                        ]
-                                                    },
-                                                    "/*"
-                                                ]
-                                            ]
-                                        },
                                         {
                                             "Fn::GetAtt": [
-                                                "NotificationS3LogsBucket",
+                                                "NotificationQueue",
                                                 "Arn"
                                             ]
                                         }
@@ -75,7 +52,7 @@
                 ]
             },
             "DependsOn": [
-                "NotificationS3LogsBucket"
+                "NotificationQueue"
             ]
         }
     },
@@ -90,9 +67,17 @@
                 "Ref": "AWS::Region"
             }
         },
-        "S3LogsBucket": {
+        "SQSQueueUrl": {
             "Value": {
-                "Ref": "NotificationS3LogsBucket"
+                "Ref": "NotificationQueue"
+            }
+        },
+        "SQSQueueArn": {
+            "Value": {
+                "Fn::GetAtt": [
+                    "NotificationQueue",
+                    "Arn"
+                ]
             }
         }
     }

provisioning/ci-setup-cluster.sh

@@ -28,6 +28,8 @@ export DATABASE_URL_BASE64
 export DATABASE_PASSWORD_BASE64
 export TEST_AWS_SECRET_ACCESS_KEY_BASE64
 
+export MESSENGER_TRANSPORT_DSN="${AWS_SQS_QUEUE_URL}?auto_setup=false"
+
 envsubst < ./provisioning/environments.yaml.template > ./provisioning/environments.yaml
 kubectl apply -f ./provisioning/environments.yaml
 kubectl apply -f ./provisioning/notification.yaml

provisioning/environments.yaml.template

@@ -29,6 +29,6 @@ data:
   azureClientId: '$TEST_AZURE_CLIENT_ID'
   azureTenantId: '$TEST_AZURE_TENANT_ID'
   databaseSslVerifyEnabled: '0'
-  messengerTransportDsn: 'doctrine://default'
+  messengerTransportDsn: '$MESSENGER_TRANSPORT_DSN'
   mailerDsn: 'null://null'
   hostnameSufix: '$HOSTNAME_SUFFIX'

set-env.template.sh

@@ -4,6 +4,7 @@ export DATABASE_URL=mysql://root:root@dev-mysql-service:3310/notifications?serve
 export DATABASE_PASSWORD=root
 
 export AWS_REGION=us-east-1
+export MESSENGER_TRANSPORT_DSN="${AWS_SQS_QUEUE_URL}?auto_setup=false"
 
 export TEST_AWS_ACCESS_KEY_ID=
 export TEST_AWS_SECRET_ACCESS_KEY=