Merge pull request #335 from dgrebb/release/2.3.1

Release/2.3.1

.cz.json

@@ -1,7 +1,7 @@
 {
   "commitizen": {
     "name": "cz_conventional_commits",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "tag_format": "$major.$minor.$patch$prerelease",
     "version_type": "semver",
     "bump_message": "release $current_version \u2192 $new_version"

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.3.1] - 2023-06-27
+
+### 🐛 Bug Fixes
+
+- ***(front)*** Fixes a silly leftover test
+- ***(front)*** Adjusts logic for external link detection
+- ***(terraform)*** Applies unique names to security and management resources
+
 ## [2.3.0] - 2023-06-26
 
 ### 💡 Features

_tf/modules/containers/containers.tf

@@ -45,7 +45,7 @@ resource "aws_ecs_service" "strapi" {
   network_configuration {
     subnets          = [for subnet in var.subnets : subnet.id]
     assign_public_ip = true
-    security_groups  = [var.service_sg.id]
+    security_groups  = [var.db_sg.id]
   }
 
   depends_on = [var.strapi_alb_tg]

_tf/modules/containers/inputs.tf

@@ -4,5 +4,5 @@ variable "dashed_cmsdomain" {}
 variable "strapi_instance_count" {}
 variable "subnets" {}
 variable "strapi_alb_tg" {}
-variable "service_sg" {}
+variable "db_sg" {}
 variable "force_delete" {}

_tf/modules/database/database.tf

@@ -2,7 +2,7 @@
 # CMS Database
 # ------------------------------------------------------------------------------
 resource "aws_db_instance" "this" {
-  depends_on                = [var.service_sg]
+  depends_on                = [var.db_sg]
   identifier                = var.dashed_cmsdomain
   allocated_storage         = 5
   engine                    = "postgres"
@@ -14,7 +14,7 @@ resource "aws_db_instance" "this" {
   password                  = var.db_password
   publicly_accessible       = var.public_access
   storage_encrypted         = false
-  vpc_security_group_ids    = ["${var.service_sg.id}"]
+  vpc_security_group_ids    = ["${var.db_sg.id}"]
   db_subnet_group_name      = var.db_subnet_group.id
   skip_final_snapshot       = var.skip_final_snapshot
   final_snapshot_identifier = var.dashed_cmsdomain

_tf/modules/database/inputs.tf

@@ -1,5 +1,5 @@
 variable "dashed_cmsdomain" {}
-variable "service_sg" {}
+variable "db_sg" {}
 variable "db_subnet_group" {}
 variable "instance_class" {}
 variable "skip_final_snapshot" {}

_tf/modules/management/management.tf

@@ -11,7 +11,7 @@ resource "aws_cloudwatch_log_group" "this" {
 }
 
 resource "aws_cloudwatch_event_rule" "this" {
-  name        = "container-stopped"
+  name        = "container-stopped_${var.dashed_cmsdomain}"
   description = "Notification for containers with exit code of 1 (error)."
 
   event_pattern = <<PATTERN

_tf/modules/security/inputs.tf

@@ -1 +1,2 @@
+variable "dashed_cmsdomain" {}
 variable "pub" {}

_tf/modules/security/outputs.tf

@@ -1,5 +1,5 @@
-output "service_sg" {
-  value = aws_security_group.svc
+output "db_sg" {
+  value = aws_security_group.db
 }
 output "lb_sg" {
   value = aws_security_group.lb

_tf/modules/security/security.tf

@@ -6,7 +6,13 @@ data "external" "ip" {
   program = ["/bin/bash" , "${path.module}/../../_scripts/ip.sh"]
 }
 
-resource "aws_security_group" "svc" {
+resource "aws_security_group" "db" {
+  name_prefix = var.dashed_cmsdomain
+
+  lifecycle {
+    create_before_destroy = true
+  }
+
   ingress {
     from_port       = 0
     to_port         = 0

_tf/prd/main.tf

@@ -28,12 +28,12 @@ module "containers" {
   strapi_instance_count = 1
   subnets               = module.network.subnets
   strapi_alb_tg         = module.scaling.strapi_alb_tg
-  service_sg            = module.security.service_sg
+  db_sg                 = module.security.db_sg
 }
 
 module "database" {
   source              = "../modules/database"
-  service_sg          = module.security.service_sg
+  db_sg               = module.security.db_sg
   db_subnet_group     = module.network.db_subnet_group
   dashed_cmsdomain    = var.dashed_cmsdomain
   db_password         = var.db_password
@@ -79,8 +79,9 @@ module "scaling" {
 }
 
 module "security" {
-  source = "../modules/security"
-  pub    = false
+  source           = "../modules/security"
+  dashed_cmsdomain = var.dashed_cmsdomain
+  pub              = false
 }
 
 module "state" {

_tf/stg/main.tf

@@ -37,12 +37,12 @@ module "containers" {
   strapi_instance_count = 1
   subnets               = module.network.subnets
   strapi_alb_tg         = module.scaling.strapi_alb_tg
-  service_sg            = module.security.service_sg
+  db_sg            = module.security.db_sg
 }
 
 module "database" {
   source              = "../modules/database"
-  service_sg          = module.security.service_sg
+  db_sg               = module.security.db_sg
   db_subnet_group     = module.network.db_subnet_group
   dashed_cmsdomain    = local.dashed_cmsdomain
   db_password         = var.db_password
@@ -88,8 +88,9 @@ module "scaling" {
 }
 
 module "security" {
-  source = "../modules/security"
-  pub    = true
+  source           = "../modules/security"
+  dashed_cmsdomain = local.dashed_cmsdomain
+  pub              = false
 }
 
 module "state" {

front/src/components/markdown/Link.svelte

@@ -4,11 +4,12 @@
   export let href = "";
   export let text = "";
   export let title = undefined;
+  const internalPattern = /\/|\#|m|t/g;
   let external;
 
   onMount(() => {
-    external = (href.charAt(0) === "/" || "#" || "m" || "t" ? false :
-    (new URL(href).origin !== location.origin ? true : false));
+    external = href.charAt(0).match(internalPattern) ? false :
+      new URL(href).origin !== location.origin ? true : false;
   });
 </script>