Nodejs upgrade, npm modules upgrade, and 5 enhancements on 2024

.github/workflows/aws-deploy.yml

@@ -46,7 +46,7 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v3
  with:
- ref: FEATURE/aws
+ ref: ${{ github.event.workflow_run.head_branch }}
 
  - name: Configure AWS Credentials
  uses: aws-actions/configure-aws-credentials@v2
@@ -144,10 +144,10 @@ jobs:
  with:
  ref: ${{ github.event.workflow_run.head_branch }}
 
- - name: Use Node.js 14
+ - name: Use Node.js 22
  uses: actions/setup-node@v3
  with:
- node-version: 14
+ node-version: 22
 
  - name: Build project shared components
  run: |
@@ -186,9 +186,9 @@ jobs:
 
  - name: Build project data portal frontend
  run: |
- cd packages/bcer-data-portal/app
- npm install
- npm run build
+  cd packages/bcer-data-portal/app
+  npm install
+  npm run build
 
  - name: Upload to S3 bucket data portal
  run: |

.github/workflows/e2etest-aws.yml

@@ -22,7 +22,7 @@ jobs:
  - name: Setup Node
  uses: actions/setup-node@v2
  with:
- node-version: '17'
+ node-version: '22'
 
  - name: Install deps
  run: npm install

.github/workflows/e2etest.yml

@@ -22,7 +22,7 @@ jobs:
  - name: Setup Node
  uses: actions/setup-node@v2
  with:
- node-version: '17'
+ node-version: '22.0.0'
 
  - name: Install deps
  run: npm install
@@ -37,8 +37,8 @@ jobs:
  uses: cypress-io/github-action@v2
  with:
  wait-on-timeout: 200
- wait-on: 'http://localhost:3000/retailer, http://localhost:3000/portal'
+ wait-on: 'http://localhost:3000/retailer, http://localhost:3001/portal'
  record: true
  env:
- CYPRESS_RECORD_KEY: 'd6703994-08d4-4421-b52f-d7f02ee5cff0'
+ CYPRESS_RECORD_KEY: '11b57a63-2d0d-42ab-95f4-a6f9cbfc5a8e'
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
  - uses: actions/checkout@v2
  - uses: actions/setup-node@v2
  with:
- node-version: '14.17.6'
+ node-version: '22.0.0'
  - name: Package App
  run: VERSION=${{ github.event.inputs.version }} ENVIRONMENT=${{ github.event.inputs.environment }} make package-build
  - name: Create Github Release

.gitignore

@@ -36,6 +36,8 @@ cypress/videos/
 # .tfstate files
 *.tfstate
 *.tfstate.*
+.terraform.lock.hcl
+**/.terragrunt-cache/**
 
 # Crash log files
 crash.log

.nginx/default.conf

@@ -3,10 +3,9 @@ upstream retailer {
 }
 
 upstream portal {
- server data-portal:3000;
+  server data-portal:3000;
 }
 
-
 server {
  listen 80;
 
@@ -19,4 +18,8 @@ server {
  rewrite /portal/(.*) /$1 break;
  proxy_pass http://portal;
  }
+ location / {
+ root /usr/share/nginx/html;
+ try_files $uri $uri/ /index.html;
+ }
 }

Database Scripts/aurora_create_db.sql

@@ -0,0 +1,11 @@
+--As Postgres User
+CREATE USER bcer_proxy WITH PASSWORD 'bcer';
+--RDS handles the CREATE DATABASE bcer step
+--CREATE DATABASE bcer WITH OWNER = bcer ENCODING = 'UTF8' CONNECTION LIMIT = -1 IS_TEMPLATE = False;
+GRANT ALL PRIVILEGES on database bcer to bcer_proxy;
+
+--Switch to bcer_proxy user
+--Use the BCER database
+CREATE SCHEMA bcer;
+GRANT ALL ON ALL TABLES IN SCHEMA bcer TO bcer_proxy;
+GRANT ALL ON SCHEMA bcer TO bcer_proxy;

Infrastructure/alb.tf

@@ -13,18 +13,17 @@ data "aws_alb_listener" "front_end" {
 }
 
 resource "aws_alb_target_group" "app" {
- name = "bcer-dev-target-group"
+ name = "${var.application}-${var.target_env}-target-group"
  port = var.app_port
  protocol = "HTTP"
  vpc_id = data.aws_vpc.main.id
  target_type = "ip"
  deregistration_delay = 30
  lifecycle {
- create_before_destroy = true
+ ignore_changes = [name]
  }
  stickiness {
  type = "lb_cookie"
-
  }
 
  health_check {
@@ -37,7 +36,7 @@ resource "aws_alb_target_group" "app" {
  unhealthy_threshold = "2"
  }
 
-  tags = local.common_tags
+ tags = local.common_tags
 }
 
 resource "aws_lb_listener_rule" "host_based_weighted_routing" {
@@ -49,10 +48,9 @@ resource "aws_lb_listener_rule" "host_based_weighted_routing" {
  type = "forward"
  target_group_arn = aws_alb_target_group.app.arn
  }
- #figure out what to place here
  condition {
  path_pattern {
  values = ["/*"]
  }
  }
-}
+}

Infrastructure/api-gateway.tf

@@ -0,0 +1,41 @@
+data "aws_acm_certificate" "bcer_api_certificate" {
+ domain = var.api_url
+ statuses = ["ISSUED"]
+ most_recent = true
+}
+
+module "api_gateway" {
+ source = "terraform-aws-modules/apigateway-v2/aws"
+ version = "2.2.2"
+
+ name = "${var.application}-http-api"
+ description = "HTTP API Gateway"
+ protocol_type = "HTTP"
+ create_api_domain_name = false
+
+ domain_name = var.api_url
+ domain_name_certificate_arn = data.aws_acm_certificate.bcer_api_certificate.arn
+
+ integrations = {
+ "ANY /{proxy+}" = {
+ connection_type = "VPC_LINK"
+ vpc_link = "bcer-vpc"
+ integration_uri = data.aws_alb_listener.front_end.arn
+ integration_type = "HTTP_PROXY"
+ integration_method = "ANY"
+
+ request_parameters = {
+ "append:header.SourceIp" = "$request.header.X-Forwarded-For"
+ "append:header.clientSourceIP" = "$context.identity.sourceIp"
+ }
+ }
+ }
+
+ vpc_links = {
+ bcer-vpc = {
+ name = "${var.application}-vpc-link"
+ security_group_ids = [data.aws_security_group.web.id]
+ subnet_ids = data.aws_subnets.web.ids
+ }
+ }
+}

Infrastructure/aurora-v2.tf

@@ -3,7 +3,6 @@ resource "random_pet" "bcer_subnet_group_name" {
  length = 2
 }
 
-
 resource "random_password" "bcer_master_password" {
  length = 16
  special = true
@@ -30,24 +29,19 @@ resource "aws_db_subnet_group" "bcer_subnet_group" {
  tags = {
  managed-by = "terraform"
  }
-
  tags_all = {
  managed-by = "terraform"
  }
 }
 
-data "aws_rds_engine_version" "postgresql" {
- engine = "aurora-postgresql"
- version = "13.8"
-}
-
 module "aurora_postgresql_v2" {
- source = "terraform-aws-modules/rds-aurora/aws"
+ source = "terraform-aws-modules/rds-aurora/aws"
+ version = "7.7.1"
 
  name = "${var.bcer_cluster_name}-${var.target_env}"
- engine = data.aws_rds_engine_version.postgresql.engine
+ engine = "aurora-postgresql"
  engine_mode = "provisioned"
- engine_version = data.aws_rds_engine_version.postgresql.version
+ engine_version = "13.12"
  storage_encrypted = true
  database_name = var.bcer_database_name
 
@@ -71,8 +65,8 @@ module "aurora_postgresql_v2" {
  db_cluster_parameter_group_name = aws_rds_cluster_parameter_group.bcer_postgresql13.id
 
  serverlessv2_scaling_configuration = {
- min_capacity = 0.5
- max_capacity = 1
+ min_capacity = var.aurora_acu_min
+ max_capacity = var.aurora_acu_max
  }
 
  instance_class = "db.serverless"
@@ -104,6 +98,15 @@ resource "aws_rds_cluster_parameter_group" "bcer_postgresql13" {
  tags = {
  managed-by = "terraform"
  }
+ parameter {
+ name = "timezone"
+ value = var.timezone
+ }
+ parameter {
+ apply_method = "pending-reboot"
+ name = "shared_preload_libraries"
+ value = "pg_stat_statements,pg_cron"
+ }
 }
 
 resource "random_pet" "master_creds_secret_name" {
@@ -113,7 +116,6 @@ resource "random_pet" "master_creds_secret_name" {
 
 resource "aws_secretsmanager_secret" "bcer_mastercreds_secret" {
  name = random_pet.master_creds_secret_name.id
-
  tags = {
  managed-by = "terraform"
  }
@@ -127,6 +129,9 @@ resource "aws_secretsmanager_secret_version" "bcer_mastercreds_secret_version" {
  "password": "${random_password.bcer_master_password.result}"
  }
 EOF
+ lifecycle {
+ ignore_changes = [secret_string]
+ }
 }
 
 resource "random_password" "bcer_api_password" {
@@ -142,15 +147,13 @@ variable "bcer_api_username" {
  sensitive = true
 }
 
-
 resource "random_pet" "api_creds_secret_name" {
  prefix = "bcer-api-creds"
  length = 2
 }
 
 resource "aws_secretsmanager_secret" "bcer_apicreds_secret" {
  name = random_pet.api_creds_secret_name.id
-
  tags = {
  managed-by = "terraform"
  }
@@ -164,4 +167,7 @@ resource "aws_secretsmanager_secret_version" "bcer_apicreds_secret_version" {
  "password": "${random_password.bcer_api_password.result}"
  }
 EOF
+ lifecycle {
+ ignore_changes = [secret_string]
+ }
 }