Feat/sbox rds

.github/workflows/deploy-pr.yaml

@@ -10,7 +10,7 @@ permissions:
 jobs:
   EC2-Deploy:
     # if the branch name of the PR does not contain 'skip-deploy'
-    if: "!contains(github.head_ref, 'skip-deploy')"
+    if: "!contains(github.head_ref, 'skip-deploy') && !contains(github.head_ref, 'rds')"
     runs-on: ubuntu-latest
     environment:
       name: ${{ github.ref_name }}

.github/workflows/deploy-sbx.yaml

@@ -0,0 +1,53 @@
+name: Deploy-SBX
+
+on:
+  push:
+    branches: [ feat/sbox-rds ]
+
+permissions:
+  contents: read
+
+jobs:
+  EC2-Deploy:
+    # if the branch name of the PR does not contain 'skip-deploy'
+    if: "!contains(github.head_ref, 'skip-deploy')"
+    runs-on: ubuntu-latest
+
+    steps:
+    - id: deploy
+      name: Deploy
+      uses: bitovi/github-actions-deploy-docker-to-ec2@main
+      with:
+        ###
+        ### App config
+        ###        
+
+        ###
+        ### AWS config
+        ###
+        aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_SANDBOX}}
+        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_SANDBOX}}
+        aws_default_region: us-east-1
+
+        ###
+        ### Deployment config
+        ###
+        # Provide a secret called `DOT_ENV` to append environment variables to the .env file
+        # dot_env: ${{ secrets.DOT_ENV }}
+        tf_stack_destroy: true
+        tf_state_bucket_destroy: true
+        tf_state_bucket: bitovi-devops-training-ec2-gha-example-feat-sbox-rds-tf-state
+        tf_state_file_name: tf-state
+
+        #aws_mount_efs_id: fs-089a6338a687599fc
+        ###
+        ### Postgres config
+        ###
+        # postgres_subnets: "subnet-0f1b65df74adf6e87,subnet-05d768eabcd7591ea,subnet-082c8c6a0f81405d3"
+        #enable_postgres: true
+
+        # TODO:
+        # postgres_vpc_id                 = "vpc-081abe910edab4281"
+        # postgres_vpc_cidr               = "172.31.0.0/16"
+        #postgres_database_port: 5444
+

docker-compose.yaml

@@ -7,7 +7,28 @@ services:
 
     # Specify a .env file for credentials
     # the `AWS_INSTANCE_URL` environment variable will be prepended to that file
-    # env_file: .env
+    # if `enable_postgres` is set to `true`, the env file will also have the following
+    # ==== Postgres ====
+    # # Amazon Resource Name (ARN) of cluster
+    # POSTGRES_CLUSTER_ARN
+    # # Writer endpoint for the cluster
+    # POSTGRES_CLUSTER_ENDPOINT
+    # # A read-only endpoint for the cluster, automatically load-balanced across replicas
+    # POSTGRES_CLUSTER_READER_ENDPOINT
+    # # The running version of the cluster database
+    # POSTGRES_CLUSTER_ENGINE_VERSION_ACTUAL
+    # # Name for an automatically created database on cluster creation
+    # # database_name is not set on `aws_rds_cluster` resource if it was not specified, so can't be used in output
+    # POSTGRES_CLUSTER_DATABASE_NAME
+    # # The database port
+    # POSTGRES_CLUSTER_PORT
+    # # The database master password
+    # POSTGRES_CLUSTER_MASTER_PASSWORD
+    # # The database master username
+    # POSTGRES_CLUSTER_MASTER_USERNAME
+    # # The Route53 Hosted Zone ID of the endpoint
+    # POSTGRES_CLUSTER_HOSTED_ZONE_ID
+    env_file: .env
 
     volumes:
       - .:/app

index.js

@@ -1,9 +1,32 @@
 var port = process.env.PORT || 3000;
 var express = require('express');
+var fs = require('fs');
 var app = express();
+const { Pool, Client } = require('pg')
 
-app.get('/', function (req, res) {
-  res.send("Hello Bitovi Meetup - github-actions-deploy-docker-to-ec2");
+app.get('/', async function (req, res) {
+  console.log("received request", req.route.path);
+  res.send(`Hello Bitovi Meetup - github-actions-deploy-docker-to-ec2`)
+});
+app.get('/postgres', async function (req, res) {
+  console.log("received request", req.route.path);
+
+  const client = new Client({
+    host: process.env.PGHOST,
+    port: process.env.PGPORT,
+    user: process.env.PG_USER,
+    password: process.env.PG_PASSWORD,
+    database: process.env.PGDATABASE,
+    ssl: {
+      ca: fs.readFileSync('rds-combined-ca-bundle.pem').toString()
+    }
+  });
+  client.connect()
+  const result = await client.query('SELECT NOW()');
+  await client.end();
+
+
+  res.send(`Hello SQL timestamp: ${result.rows[0].now}`);
 });
 
 app.listen( port, function () {

package.json

@@ -7,6 +7,7 @@
     "start": "node index.js"
   },
   "dependencies": {
-    "express": "^4.13.4"
+    "express": "^4.13.4",
+    "pg": "^8.9.0"
   }
 }