Cloudwatch event and sns modules

.github/workflows/documents.yml

@@ -1,4 +1,4 @@
-name: Documentation
+name: Documentation for Terraform
 on:
   - pull_request 
 jobs:
@@ -8,7 +8,7 @@ jobs:
     steps:
     - name: Clone Repository
       id: checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.ref }}
     - name: Terraform Documentation

aws/templates/backend_task.yml

@@ -0,0 +1,106 @@
+family: "$PROGRAM-$ENV-$PROJECT-backend"
+networkMode: awsvpc
+cpu: "512"
+memory: "1024"
+executionRoleArn: "arn:aws:iam::$AWS_ACCOUNT_ID:role/power-user-$PROJECT-$ENV-ecs-task-execution-role"
+taskRoleArn: "arn:aws:iam::$AWS_ACCOUNT_ID:role/power-user-$PROJECT-$ENV-ecs-task-role"
+requiresCompatibilities:
+- FARGATE
+containerDefinitions:
+
+- name: sumologic-firelens
+  image: public.ecr.aws/aws-observability/aws-for-fluent-bit:stable
+  essential: true
+  firelensConfiguration:
+    type: fluentbit
+    options:
+      enable-ecs-log-metadata: "true"
+
+- name: newrelic-infra
+  image: newrelic/nri-ecs:1.9.2
+  essential: true
+  environment:
+  - name: "FARGATE"
+    value: "true"
+  - name: "NRIA_IS_FORWARD_ONLY"
+    value: "true"
+  - name: "NEW_RELIC_DISTRIBUTED_TRACING_ENABLED"
+    value: "true"
+  - name: "NRIA_PASSTHROUGH_ENVIRONMENT"
+    value: "ECS_CONTAINER_METADATA_URI,ECS_CONTAINER_METADATA_URI_V4,FARGATE"
+  - name: "NEW_RELIC_HOST"
+    value: "gov-collector.newrelic.com"
+  - name: "NRIA_CUSTOM_ATTRIBUTES"
+    value: "{\"nrDeployMethod\":\"downloadPage\"}"
+  - name: "NEW_RELIC_APP_NAME"
+    value: "$SERVICE"
+  - name: "NRIA_OVERRIDE_HOST_ROOT"
+    value: ""
+  secrets:
+  - name: "NRIA_LICENSE_KEY"
+    valueFrom: "arn:aws:secretsmanager:$REGION:$AWS_ACCOUNT_ID:secret:monitoring/newrelic:api_key::"
+
+- name: backend
+  image: "$IMAGE_ID"
+  portMappings:
+  - protocol: tcp
+    containerPort: 8080
+    hostPort: 8080
+  essential: true
+  environment:
+  - name: "PROJECT"
+    value: "$PROJECT"
+  - name: "BENTO_API_VERSION"
+    value: "$IMAGE_TAG"
+  - name: "NEO4J_URL"
+    value: "bolt://$NEO4J_HOST:7687"
+  - name: "NEO4J_GRAPHQL_ENDPOINT"
+    value: "http://$NEO4J_HOST:7474/graphql/"
+  - name: "ES_FILTER_ENABLED"
+    value: "true"
+  - name: "ES_SCHEMA"
+    value": "es-schema-ctdc.graphql"
+  - name: "REDIS_HOST"
+    value: "localhost"
+  - name: "REDIS_ENABLE"
+    value: "false"
+  - name: "REDIS_USE_CLUSTER"
+    value: "true"
+  - name: "REDIS_PORT"
+    value: "6379"
+  - name: "REDIS_FILTER_ENABLE"
+    value: "false"
+  - name: "NEW_RELIC_LOG_FILE_NAME"
+    value: "STDOUT"
+  - name: "NEW_RELIC_DISTRIBUTED_TRACING_ENABLED"
+    value: "true"
+  - name: "NEW_RELIC_HOST"
+    value: "gov-collector.newrelic.com"
+  - name: "NEW_RELIC_LABELS"
+    value: "Project:$PROJECT;Environment:$ENV"
+  - name: "NEW_RELIC_APP_NAME"
+    value: "$PROJECT-$ENV-backend"
+  - name: "JAVA_OPTS"
+    value: "-javaagent:/usr/local/tomcat/newrelic/newrelic.jar"
+  secrets:
+  - name: "NEO4J_USER"
+    valueFrom: "arn:aws:secretsmanager:us-east-1:$ACCOUNT_ID:secret:bento/$PROJECT/$ENV:neo4j_user::"
+  - name: "NEO4J_PASSWORD"
+    valueFrom: "arn:aws:secretsmanager:us-east-1:$ACCOUNT_ID:secret:bento/$PROJECT/$ENV:neo4j_password::"
+  - name: "ES_HOST"
+    valueFrom: "arn:aws:secretsmanager:us-east-1:$ACCOUNT_ID:secret:bento/$PROJECT/$ENV:es_host::"
+  - name: "NEW_RELIC_LICENSE_KEY"
+    valueFrom: "arn:aws:secretsmanager:us-east-1:$ACCOUNT_ID:secret:monitoring/newrelic:api_key::"
+  logConfiguration:
+    logDriver: awsfirelens
+    options:
+      Format: json_lines
+      Name: http
+      Port: "443"
+      URI: "/receiver/v1/http/$SUMO_COLLECTOR_TOKEN"
+      Retry_Limit: "2"
+      tls: "on"
+      tls.verify: "off"
+    secretOptions:
+      - name: "Host"
+        valueFrom: "arn:aws:secretsmanager:us-east-1:$AWS_ACCOUNT_ID:secret:bento/$PROJECT/$ENV:sumo_collector_endpoint::"

docker/base_image_list.csv

@@ -0,0 +1,17 @@
+Image,Project,Repo
+tomcat:10.1.13-jdk17,"C3DC, CTDC","CCDI-C3DC-Backend (1.0.0), crdc-ctdc-backend (mvp)"
+nginx:1.25.2,"C3DC, CCDI-HUB","bento-c3dc-frontend (1.0.0), CCDI-Portal-WebPortal (2.1.0)"
+node:slim,CDS,bento-files (cds-multistage)
+nginx:1.25-alpine,CDS,bento-cds-frontend (4.1.0)
+node:18.18.2-alpine3.18,CRDC-DH,"crdc-datahub-authn (2.1.0), crdc-datahub-authz (2.0.0), crdc-datahub-backend (2.0.0)"
+nginx:1.25.3-alpine3.18-slim,"CRDC-DH, CTDC","crdc-datahub-ui (mvp-2), crdc-ctdc-ui (mvp)"
+node:16.20.2-alpine3.18,"CTDC, ICDC","crdc-ctdc-authn (CTDC-1205), crdc-ctdc-files (main), bento-files (2.3.1)"
+node:16.17.0,GMB,"bento-auth (master), bento-files (main)"
+tomcat:9.0.80-jdk11-temurin-jammy,GMB,gmb-backend (develop)
+nginx:1.23.3-alpine,"GMB, ICDC","bento-gmb-frontend (bento-release-4.0.0-develop), bento-icdc-frontend (v4.0.0)"
+node:16-alpine3.11,GMB,bento-users (master)
+tomcat:10.1.15-jdk17,CCDI-HUB,CCDI-Portal-WebService (2.1.0)
+tomcat:9.0.83-jdk11-temurin-jammy,ICDC,bento-icdc-backend (14.8.1)
+node:16.17.0-alpine3.16,ICDC,bento-icdc-interoperation (idc-tcia-down-test)
+openjdk:11,MTP,ccdi-mtp-backend (2.0.0)
+rocker/r-ver:4.1.0,MTP,PediatricOpenTargets/OpenPedCan-api (main)

jenkins/templates/DeployBackend.jenkinsfile

@@ -71,7 +71,7 @@ pipeline {
  			script {
 
 			    // set sumo vars for logging
-				env.SUMO_COLLECTOR_ENDPOINT = sh(label: 'Get Sumo Endpoint', returnStdout: true, script: "aws secretsmanager get-secret-value --region $REGION --secret-id bento/$PROJECT/$ENV --query SecretString --output text | jq -r '.sumo_collector_endpoint'").trim()
+				//env.SUMO_COLLECTOR_ENDPOINT = sh(label: 'Get Sumo Endpoint', returnStdout: true, script: "aws secretsmanager get-secret-value --region $REGION --secret-id bento/$PROJECT/$ENV --query SecretString --output text | jq -r '.sumo_collector_endpoint'").trim()
 				env.SUMO_COLLECTOR_TOKEN = sh(label: 'Get Sumo Token', returnStdout: true, script: "aws secretsmanager get-secret-value --region $REGION --secret-id bento/$PROJECT/$ENV --query SecretString --output text | jq -r '.sumo_collector_token_$APP'").trim()
 
 				// set neo4j vars
@@ -84,7 +84,7 @@ pipeline {
 				env.REPO_URL = "${ECR_ACCOUNT}.dkr.ecr.${REGION}.amazonaws.com/${ECR_REPO}"
 
 				// set template file name
-				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.json"
+				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.yml"
 
 			}
 
@@ -140,19 +140,12 @@ pipeline {
 
 				# create new revision for $PROJECT-$APP Task Definition
 				echo "Updating Task Defintion to Use: $ECR_REPO:$IMAGE_TAG"
-				ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
-				IMAGE_ID="$REPO_URL:$IMAGE_TAG"
-
-				sed -i "s|{{account_id}}|$ACCOUNT_ID|" $TEMPLATE_FILE
-				sed -i "s|{{image_id}}|$IMAGE_ID|" $TEMPLATE_FILE
-				sed -i "s|{{image_tag}}|$IMAGE_TAG|" $TEMPLATE_FILE
-				sed -i "s|{{environment}}|$ENV|" $TEMPLATE_FILE
-				sed -i "s|{{project}}|$PROJECT|" $TEMPLATE_FILE
-				sed -i "s|{{sumo_collector_endpoint}}|$SUMO_COLLECTOR_ENDPOINT|" $TEMPLATE_FILE
-				sed -i "s|{{sumo_collector_token}}|$SUMO_COLLECTOR_TOKEN|" $TEMPLATE_FILE
-				sed -i "s|{{neo4j_host}}|$NEO4J_HOST|" $TEMPLATE_FILE
-
-				aws ecs register-task-definition --cli-input-json file://$TEMPLATE_FILE
+				export ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
+				export IMAGE_ID="$REPO_URL:$IMAGE_TAG"
+
+				# Update and register task definition
+				envsubst < $TEMPLATE_FILE > $TEMPLATE_FILE
+				aws ecs register-task-definition --cli-input-yaml file://$TEMPLATE_FILE
 
 				'''
 

jenkins/templates/DeployFiles.jenkinsfile

@@ -91,7 +91,7 @@ pipeline {
 				env.REPO_URL = "${ECR_ACCOUNT}.dkr.ecr.${REGION}.amazonaws.com/${ECR_REPO}"
 
 				// set template file name
-				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.json"
+				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.yml"
 
 			}
 
@@ -145,21 +145,13 @@ pipeline {
 
 				# create new revision for $PROJECT-$APP Task Definition
 				echo "Updating Task Defintion to Use: $ECR_REPO:$IMAGE_TAG"
-				ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
-				IMAGE_ID="$REPO_URL:$IMAGE_TAG"
-				DATE=$(date '+%m/%d/%Y')
-
-				sed -i "s|{{account_id}}|$ACCOUNT_ID|" $TEMPLATE_FILE
-				sed -i "s|{{image_id}}|$IMAGE_ID|" $TEMPLATE_FILE
-				sed -i "s|{{image_tag}}|$IMAGE_TAG|" $TEMPLATE_FILE
-				sed -i "s|{{environment}}|$ENV|" $TEMPLATE_FILE
-				sed -i "s|{{project}}|$PROJECT|" $TEMPLATE_FILE
-				sed -i "s|{{domain_name}}|$DOMAIN_NAME|" $TEMPLATE_FILE
-				sed -i "s|{{sumo_collector_endpoint}}|$SUMO_COLLECTOR_ENDPOINT|" $TEMPLATE_FILE
-				sed -i "s|{{sumo_collector_token}}|$SUMO_COLLECTOR_TOKEN|" $TEMPLATE_FILE
-				sed -i "s|{{date}}|$DATE|" $TEMPLATE_FILE
-
-				aws ecs register-task-definition --cli-input-json file://$TEMPLATE_FILE
+				export ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
+				export IMAGE_ID="$REPO_URL:$IMAGE_TAG"
+				export DATE=$(date '+%m/%d/%Y')
+
+				# Update and register task definition
+				envsubst < $TEMPLATE_FILE > $TEMPLATE_FILE
+				aws ecs register-task-definition --cli-input-yaml file://$TEMPLATE_FILE
 
 				'''
 

jenkins/templates/DeployFrontend.jenkinsfile

@@ -103,7 +103,7 @@ pipeline {
 				env.REPO_URL = "${ECR_ACCOUNT}.dkr.ecr.${REGION}.amazonaws.com/${ECR_REPO}"
 
 				// set template file name
-				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.json"
+				env.TEMPLATE_FILE="${PROJECT}-deployments/aws/${APP}_task.yml"
 
 			}
 
@@ -158,23 +158,12 @@ pipeline {
 
 				# create new revision for $PROJECT-$APP Task Definition
 				echo "Updating Task Defintion to Use: $ECR_REPO:$IMAGE_TAG"
-				ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
-				IMAGE_ID="$REPO_URL:$IMAGE_TAG"
+				export ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
+				export IMAGE_ID="$REPO_URL:$IMAGE_TAG"
 
-				sed -i "s|{{project}}|$PROJECT|" $TEMPLATE_FILE
-				sed -i "s|{{environment}}|$ENV|" $TEMPLATE_FILE
-				sed -i "s|{{account_id}}|$ACCOUNT_ID|" $TEMPLATE_FILE
-
-				sed -i "s|{{image_id}}|$IMAGE_ID|" $TEMPLATE_FILE
-				sed -i "s|{{image_tag}}|$IMAGE_TAG|" $TEMPLATE_FILE
-
-				sed -i "s|{{sumo_collector_endpoint}}|$SUMO_COLLECTOR_ENDPOINT|" $TEMPLATE_FILE
-				sed -i "s|{{sumo_collector_token}}|$SUMO_COLLECTOR_TOKEN|" $TEMPLATE_FILE
-
-				sed -i "s|{{domain_name}}|$DOMAIN_NAME|" $TEMPLATE_FILE
-				sed -i "s|{{be_version}}|$BE_VERSION|" $TEMPLATE_FILE
-
-				aws ecs register-task-definition --cli-input-json file://$TEMPLATE_FILE
+				# Update and register task definition
+				envsubst < $TEMPLATE_FILE > $TEMPLATE_FILE
+				aws ecs register-task-definition --cli-input-yaml file://$TEMPLATE_FILE
 
 				'''