start of sync

Author: anthony-nhs

.github/scripts/fix_cdk_json.sh

@@ -15,8 +15,8 @@ fix_string_key() {
     jq \
         --arg key_value "${KEY_VALUE}" \
         --arg key_name "${KEY_NAME}" \
-        '.context += {($key_name): $key_value}' .build/cdk.json > .build/cdk.new.json
-    mv .build/cdk.new.json .build/cdk.json
+        '. += {($key_name): $key_value}' "$OUTPUT_FILE_NAME" > "${TEMP_FILE}"
+    mv "${TEMP_FILE}" "$OUTPUT_FILE_NAME"
 }
 
 # helper function to set boolean and number values (without quotes)
@@ -31,10 +31,19 @@ fix_boolean_number_key() {
     jq \
         --argjson key_value "${KEY_VALUE}" \
         --arg key_name "${KEY_NAME}" \
-        '.context += {($key_name): $key_value}' .build/cdk.json > .build/cdk.new.json
-    mv .build/cdk.new.json .build/cdk.json
+        '. += {($key_name): $key_value}' "$OUTPUT_FILE_NAME" > "${TEMP_FILE}"
+    mv "${TEMP_FILE}" "$OUTPUT_FILE_NAME"
 }
 
+
+OUTPUT_FILE_NAME=$1
+if [ -z "${OUTPUT_FILE_NAME}" ]; then
+    echo "OUTPUT_FILE_NAME value is unset or set to the empty string"
+    exit 1
+fi
+echo "{}" > "$OUTPUT_FILE_NAME"
+TEMP_FILE=$(mktemp)
+
 CFN_DRIFT_DETECTION_GROUP="epsam"
 IS_PULL_REQUEST="false"
 if [[ "$STACK_NAME" =~ -pr-[0-9]+$ ]]; then
@@ -43,7 +52,6 @@ if [[ "$STACK_NAME" =~ -pr-[0-9]+$ ]]; then
 fi
 
 # go through all the key values we need to set
-fix_string_key accountId "${ACCOUNT_ID}"
 fix_string_key stackName "${STACK_NAME}"
 fix_string_key versionNumber "${VERSION_NUMBER}"
 fix_string_key commitId "${COMMIT_ID}"

.github/workflows/cdk_release_code.yml

@@ -107,7 +107,7 @@ jobs:
 
       - name: fix cdk.json for deployment
         run: |
-          ./.github/scripts/fix_cdk_json.sh
+          ./.github/scripts/fix_cdk_json.sh .build/epsam_app.json
         env:
           ACCOUNT_ID: "${{ env.ACCOUNT_ID }}"
           STACK_NAME: "${{ inputs.STACK_NAME }}"
@@ -128,6 +128,7 @@ jobs:
             -e AWS_REGION="eu-west-2" \
             -e SHOW_DIFF="true" \
             -e DEPLOY_CODE="false" \
+            -e CONFIG_FILE_NAME="epsam_app.json" \
             -e CDK_APP_PATH="packages/cdk/bin/EpsAssistMeApp.ts" \
             cdk-utils-build-repo:latest
 
@@ -142,6 +143,7 @@ jobs:
             -e AWS_REGION="eu-west-2" \
             -e SHOW_DIFF="false" \
             -e DEPLOY_CODE="true" \
+            -e CONFIG_FILE_NAME="epsam_app.json" \
             -e CDK_APP_PATH="packages/cdk/bin/EpsAssistMeApp.ts" \
             cdk-utils-build-repo:latest
         shell: bash

.gitignore

@@ -30,3 +30,6 @@ vendor
 .npmrc
 cdk.out
 .build
+.requirements_slackBotFunction
+.requirements_syncKnowledgeBaseFunction
+.local_config/

packages/cdk/bin/EpsAssistMeApp.ts

@@ -3,8 +3,18 @@ import {App, Aspects, Tags} from "aws-cdk-lib"
 import {AwsSolutionsChecks} from "cdk-nag"
 import {EpsAssistMeStack} from "../stacks/EpsAssistMeStack"
 import {applyCfnGuardSuppressions} from "./utils/appUtils"
+import fs from "fs"
 
-const app = new App()
+// read the config in
+const configFileName = process.env["CONFIG_FILE_NAME"]
+if (configFileName === undefined) {
+  throw new Error("Can not read config file")
+}
+
+const configDetails = JSON.parse(fs.readFileSync(configFileName, "utf-8"))
+
+// create the app using the config details
+const app = new App({context: configDetails})
 
 /* Required Context:
 - accountId
@@ -13,7 +23,6 @@ const app = new App()
 - commit
 */
 
-const accountId = app.node.tryGetContext("accountId")
 const stackName = app.node.tryGetContext("stackName")
 const version = app.node.tryGetContext("versionNumber")
 const commit = app.node.tryGetContext("commitId")
@@ -22,16 +31,14 @@ const cfnDriftDetectionGroup = app.node.tryGetContext("cfnDriftDetectionGroup")
 Aspects.of(app).add(new AwsSolutionsChecks({verbose: true}))
 
 Tags.of(app).add("cdkApp", "EpsAssistMe")
-Tags.of(app).add("accountId", accountId)
 Tags.of(app).add("stackName", stackName)
 Tags.of(app).add("version", version)
 Tags.of(app).add("commit", commit)
 Tags.of(app).add("cfnDriftDetectionGroup", cfnDriftDetectionGroup)
 
 const EpsAssistMe = new EpsAssistMeStack(app, "EpsAssistMeStack", {
   env: {
-    region: "eu-west-2",
-    account: accountId
+    region: "eu-west-2"
   },
   stackName: stackName,
   version: version,

scripts/run_sync.sh

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+set -e
+
+CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+echo "Script directory: $CURRENT_DIR"
+
+mkdir -p .local_config
+FIX_SCRIPT="${CURRENT_DIR}/../.github/scripts/fix_cdk_json.sh"
+EPSAM_CONFIG=".local_config/epsam_app.config.json"
+EPSAM_LOG=".local_config/epsam_app.log"
+
+if [ -z "${PULL_REQUEST_ID}" ]; then
+    echo "What is the pull request id?"
+    read -r PULL_REQUEST_ID
+else
+    read -r -p "Getting exports for pull request id ${PULL_REQUEST_ID}. Is this correct?" yn
+    case $yn in
+        [Yy]* ) ;;
+        [Nn]* ) exit;;
+        * ) exit;;
+    esac
+fi
+
+STACK_NAME=epsam-pr-$PULL_REQUEST_ID
+
+echo "Getting exports from stack ${STACK_NAME}"
+
+CF_LONDON_EXPORTS=$(aws cloudformation list-exports --region eu-west-2 --output json)
+
+
+# vars needed for cdk
+
+COMMIT_ID=$(echo "$CF_LONDON_EXPORTS" | \
+    jq \
+    --arg EXPORT_NAME "${STACK_NAME}:local:COMMIT-ID" \
+    -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value')
+VERSION_NUMBER=$(echo "$CF_LONDON_EXPORTS" | \
+    jq \
+    --arg EXPORT_NAME "${STACK_NAME}:local:VERSION-NUMBER" \
+    -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value')
+SLACK_BOT_TOKEN=$(echo "$CF_LONDON_EXPORTS" | \
+    jq \
+    --arg EXPORT_NAME "${STACK_NAME}:local:slackBotToken" \
+    -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value')
+SLACK_SIGNING_SECRET=$(echo "$CF_LONDON_EXPORTS" | \
+    jq \
+    --arg EXPORT_NAME "${STACK_NAME}:local:slackSigningSecret" \
+    -r '.Exports[] | select(.Name == $EXPORT_NAME) | .Value')
+LOG_RETENTION_IN_DAYS=30
+LOG_LEVEL=debug
+
+# export all the vars so they can be picked up by external programs
+export STACK_NAME
+export COMMIT_ID
+export VERSION_NUMBER
+export SLACK_BOT_TOKEN
+export SLACK_SIGNING_SECRET
+export LOG_RETENTION_IN_DAYS
+export LOG_LEVEL
+
+
+echo "Generating config for ${EPSAM_CONFIG}"
+"$FIX_SCRIPT" "$EPSAM_CONFIG"
+
+echo "Installing dependencies locally"
+poetry export --without-hashes --format=requirements.txt --with slackBotFunction > .requirements_slackBotFunction
+poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > .requirements_syncKnowledgeBaseFunction
+pip3 install -r .requirements_slackBotFunction -t packages/slackBotFunction
+pip3 install -r .requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
+
+sync_epsam_app() {
+    echo "Starting sync epsam CDK app"
+    echo "Stateful CDK app log file at ${EPSAM_LOG}"
+    CONFIG_FILE_NAME="${EPSAM_CONFIG}" npx cdk deploy \
+        --app "npx ts-node --prefer-ts-exts packages/cdk/bin/EpsAssistMeApp.ts" \
+        --watch \
+        --all \
+        --ci true \
+        --require-approval never \
+        --output .local_config/epsam_app.out/ \
+        > $EPSAM_LOG 2>&1
+}
+
+
+(trap 'kill 0' SIGINT; sync_epsam_app)