Merge remote-tracking branch 'origin/main' into remove-hardcoded-content

.changeset/cyan-dolls-reply.md

@@ -0,0 +1,5 @@
+---
+"strapi-cms": patch
+---
+
+Refactor move ACTIVE_CAMPAIGN_INTEGRATION_ENABLED env var in getter function

.changeset/eighty-seals-worry.md

@@ -0,0 +1,5 @@
+---
+"infrastructure": patch
+---
+
+Change ac sync lambda handler to index.sqsQueue

.changeset/modern-hairs-train.md

@@ -0,0 +1,5 @@
+---
+"active-campaign-client": minor
+---
+
+Add SSM client to mange secrets

.changeset/plenty-buses-hope.md

@@ -0,0 +1,5 @@
+---
+"infrastructure": patch
+---
+
+Added environment variables that allow strapi to integrate with active campaign

.changeset/pretty-gorillas-bow.md

@@ -0,0 +1,5 @@
+---
+"strapi-cms": minor
+---
+
+Fix webinar validateSlug on update

.changeset/weak-monkeys-grab.md

@@ -0,0 +1,5 @@
+---
+"strapi-cms": minor
+---
+
+Add Active Campaign integration to create and delete lists when creating and deleting webinars

apps/infrastructure/src/env/dev/terraform.tfvars

@@ -29,4 +29,5 @@ dns_domain_name_cms = {
   }
 }
 
-create_chatbot = true
+create_chatbot            = true
+ac_integration_is_enabled = true

apps/infrastructure/src/env/prod/terraform.tfvars

@@ -32,4 +32,5 @@ dns_domain_name_cms = {
   }
 }
 
-create_chatbot = true
+create_chatbot            = true
+ac_integration_is_enabled = false

apps/infrastructure/src/main.tf

@@ -101,9 +101,12 @@ module "cms" {
   github_repository = var.github_repository
   tags              = var.tags
 
-  dns_domain_name     = var.dns_domain_name
-  dns_domain_name_cms = var.dns_domain_name_cms
-  hosted_zone_id      = module.core.hosted_zone_id
+  dns_domain_name           = var.dns_domain_name
+  dns_domain_name_cms       = var.dns_domain_name_cms
+  hosted_zone_id            = module.core.hosted_zone_id
+  ac_integration_is_enabled = var.ac_integration_is_enabled
+  ac_base_url_param         = var.ac_integration_is_enabled ? module.active_campaign[0].base_url_param : null
+  ac_api_key_param          = var.ac_integration_is_enabled ? module.active_campaign[0].api_key_param : null
 }
 
 module "chatbot" {
@@ -148,11 +151,12 @@ module "cicd" {
 }
 
 module "active_campaign" {
+  count  = var.ac_integration_is_enabled ? 1 : 0
   source = "./modules/active_campaign"
 
   environment = var.environment
   tags        = var.tags
 
   cognito_user_pool                    = module.website.cognito_user_pool
   webinar_subscriptions_ddb_stream_arn = module.website.webinar_subscriptions_ddb_stream_arn
-}
+}

apps/infrastructure/src/modules/active_campaign/lambda.tf

@@ -14,13 +14,14 @@ module "lambda_sync" {
   runtime       = "nodejs20.x"
   architectures = ["x86_64"]
 
-  handler                                 = "index.handler"
+  handler                                 = "index.sqsQueue"
   source_path                             = "${path.module}/functions"
   ignore_source_code_hash                 = true
   create_current_version_allowed_triggers = false
 
-  timeout     = 15
-  memory_size = 256
+  timeout                = 15
+  memory_size            = 256
+  maximum_retry_attempts = 0
 
   event_source_mapping = {
     sqs = {

apps/infrastructure/src/modules/active_campaign/output.tf

@@ -0,0 +1,7 @@
+output "base_url_param" {
+  value = module.active_campaign_base_url.ssm_parameter_arn
+}
+
+output "api_key_param" {
+  value = module.active_campaign_api_key.ssm_parameter_arn
+}

apps/infrastructure/src/modules/cms/ecs.tf

@@ -47,6 +47,10 @@ resource "aws_ecs_task_definition" "cms_task_def" {
       google_oauth_client_id     = module.secret_cms_google_oauth_client_id.ssm_parameter_arn
       google_oauth_client_secret = module.secret_cms_google_oauth_client_secret.ssm_parameter_arn
       google_oauth_redirect_uri  = format("https://cms.%s/strapi-plugin-sso/google/callback", var.dns_domain_name)
+      ac_integration_is_enabled  = var.ac_integration_is_enabled ? "True" : "False"
+      ac_base_url                = var.ac_integration_is_enabled ? var.ac_base_url_param : module.secret_cms_transfer_token_salt.ssm_parameter_arn
+      ac_api_key                 = var.ac_integration_is_enabled ? var.ac_api_key_param : module.secret_cms_transfer_token_salt.ssm_parameter_arn
+      ac_sender_url              = "https://${var.dns_domain_name}"
   })
 }
 

apps/infrastructure/src/modules/cms/iam_policy.tf

@@ -82,7 +82,7 @@ data "aws_iam_policy_document" "ecs_task_execution" {
     actions = [
       "ssm:GetParameters"
     ]
-    resources = [
+    resources = concat([
       module.secret_cms_database_password.ssm_parameter_arn,
       module.secret_cms_admin_jwt_secret.ssm_parameter_arn,
       module.secret_cms_app_keys.ssm_parameter_arn,
@@ -95,7 +95,9 @@ data "aws_iam_policy_document" "ecs_task_execution" {
       module.secret_cms_google_gsuite_hd.ssm_parameter_arn,
       module.secret_cms_google_oauth_client_id.ssm_parameter_arn,
       module.secret_cms_google_oauth_client_secret.ssm_parameter_arn,
-    ]
+      ],
+      (var.ac_integration_is_enabled ? [var.ac_base_url_param, var.ac_api_key_param] : [])
+    )
   }
 
   statement {

apps/infrastructure/src/modules/cms/task-definitions/cms_app.json.tpl

@@ -91,6 +91,14 @@
       {
         "name": "DEPLOY_WEBSITE_TARGET_BRANCH",
         "value": "${target_branch}"
+      },
+      {
+        "name": "ACTIVE_CAMPAIGN_INTEGRATION_IS_ENABLED",
+        "value": "${ac_integration_is_enabled}"
+      },
+      {
+        "name": "SENDER_URL",
+        "value": "${ac_sender_url}"
       }
     ],
     "secrets" : [
@@ -141,7 +149,15 @@
       {
         "name": "GOOGLE_OAUTH_CLIENT_SECRET",
         "valueFrom": "${google_oauth_client_secret}"
-      }
+      },
+      {
+        "name": "AC_BASE_URL",
+        "valueFrom": "${ac_base_url}"
+      },
+      {
+        "name": "AC_API_KEY",
+        "valueFrom": "${ac_api_key}"
+      }        
     ]
   }
 ]

apps/infrastructure/src/modules/cms/variables.tf

@@ -54,4 +54,23 @@ variable "dns_domain_name_cms" {
 variable "hosted_zone_id" {
   type        = string
   description = "The ID of the hosted zone to create the public DNS records in"
+}
+
+## Active Campaign configuration for Strapi
+variable "ac_integration_is_enabled" {
+  type        = bool
+  description = "Enable Active Campaign integration for Strapi"
+  default     = false
+}
+
+variable "ac_base_url_param" {
+  type        = string
+  description = "Active Campaign base URL SSM parameter ARN"
+  default     = null
+}
+
+variable "ac_api_key_param" {
+  type        = string
+  description = "Active Campaign API key SSM parameter ARN"
+  default     = null
 }

apps/infrastructure/src/variables.tf

@@ -138,4 +138,13 @@ variable "chatbot_ecs_monitoring" {
     image_uri = "ghcr.io/langfuse/langfuse:sha-9375250"
     port      = 3000
   }
+}
+
+################################################################################
+# Active Campaign integration
+################################################################################
+variable "ac_integration_is_enabled" {
+  type        = bool
+  description = "Defines if Active Campaign integration should be enabled"
+  default     = false
 }

apps/strapi-cms/.env.default

@@ -55,3 +55,9 @@ GOOGLE_OAUTH_CLIENT_ID=
 GOOGLE_OAUTH_CLIENT_SECRET=
 GOOGLE_OAUTH_REDIRECT_URI=
 GOOGLE_GSUITE_HD=
+
+# ACTIVE CAMPAIGN
+ACTIVE_CAMPAIGN_INTEGRATION_IS_ENABLED=True
+AC_BASE_URL=https://<your_username>.activehosted.com
+AC_API_KEY=your_api_key
+SENDER_URL=your_server_url

apps/strapi-cms/package.json

@@ -20,6 +20,7 @@
     "@strapi/plugin-users-permissions": "4.24.2",
     "@strapi/provider-upload-aws-s3": "^4.24.2",
     "@strapi/strapi": "4.24.2",
+    "axios": "^1.7.8",
     "better-sqlite3": "8.6.0",
     "pg": "^8.11.5",
     "react": "^18.2.0",