CCM-10483: download consumer contracts

Author: harrim91

package.json

@@ -43,8 +43,9 @@
     "start": "npm run start --workspace frontend",
     "test:contracts:clean": "npm --workspace=tests/contracts run pact:clean",
     "test:contracts:consumers": "npm --workspace=tests/contracts run test:consumers",
-    "test:contracts:producer": "npm --workspace=tests/contracts run test:producer",
-    "test:contracts:upload": "npm --workspace=tests/contracts run upload:consumer-pacts",
+    "test:contracts:download": "npm --workspace=tests/contracts run pact:download",
+    "test:contracts:provider": "npm --workspace=tests/contracts run test:provider",
+    "test:contracts:upload": "npm --workspace=tests/contracts run pact:upload",
     "test:unit": "npm run test:unit --workspaces",
     "typecheck": "npm run typecheck --workspaces"
   },

tests/contracts/.gitignore

@@ -1 +1 @@
-*/pacts/
+**/pacts/

tests/contracts/package.json

@@ -11,9 +11,10 @@
   "private": true,
   "scripts": {
     "pact:clean": "./scripts/clean.sh",
-    "test:consumers": "jest consumer consumer-2",
-    "test:producer": "cp -r consumer/pacts producer && cp -r consumer-2/pacts producer && jest producer/",
-    "upload:consumer-pacts": "./scripts/upload-consumer-pacts.sh"
+    "pact:download:consumer": "./scripts/download-pacts.sh",
+    "pact:upload:consumer": "./scripts/upload-pacts.sh",
+    "test:consumers": "jest consumer.pact.test.ts",
+    "test:provider": "jest provider.pact.test.ts"
   },
   "version": "1.0.0"
 }

tests/contracts/scripts/clean.sh

@@ -3,14 +3,18 @@ set -euo pipefail
 
 script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 
-dirs=("consumer" "consumer-2" "producer")
+service_dirs=("auth" "core" "templates")
+pact_dirs=("consumer/pacts" "provider/pacts")
 
-for dir in "${dirs[@]}"; do
-  pact_dir="$(realpath "${script_path}/../${dir}")/pacts"
-
-  echo "Removing pact files in $pact_dir..."
-
-  rm -rf $pact_dir
+for service_dir in "${service_dirs[@]}"; do
+  for pact_dir in "${pact_dirs[@]}"; do
+    target="${script_path}/../tests/${service_dir}/${pact_dir}"
+    if [ -d "$target" ]; then
+      target_dir="$(realpath "${target}")"
+      echo "Removing pact files in ${target_dir} ..."
+      rm -rf $target_dir
+    fi
+  done
 done
 
-echo "All Pact files deleted successfully."
+echo "All local Pact files deleted successfully."

tests/contracts/scripts/download-consumer-pacts.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -euo pipefail
+
+# Downloads all consumer-generated Pact contract files for a provider, for use in producer-side tests
+
+script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
+
+provider="templates"
+
+provider_dir=$(realpath "${script_path}/../tests/${provider}")
+
+target_dir="${provider_dir}/provider/pacts"
+
+echo "Downloading Pact files for provider: $provider"
+
+mkdir -p "$target_dir"
+
+aws s3 sync "s3://$PACT_BUCKET/pacts/$provider/" "$target_dir/" \
+  --exclude "*" \
+  --include "*.json"
+
+echo "Pact files downloaded to $target_dir"

tests/contracts/scripts/upload-consumer-pacts.sh

@@ -1,31 +1,33 @@
 #!/bin/bash
 set -euo pipefail
 
+# Uploads Pact contract files generated by running consumer Pact tests
+# These files should be downloaded by the provider for use in provider tests
+
 script_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 
-consumer_dirs=("consumer" "consumer-2")
-pact_dir="pacts"
+consumer_service_dirs=("auth" "core")
+consumer_pact_dir="consumer/pacts"
 
-VERSION_TAG=${PACT_VERSION:-$(git rev-parse --abbrev-ref HEAD)}
+for consumer in "${consumer_service_dirs[@]}"; do
+  source="${script_path}/../tests/${consumer}/${consumer_pact_dir}"
 
-for consumer in "${consumer_dirs[@]}"; do
-  consumer_pact_dir=$(realpath "${script_path}/../${consumer}/${pact_dir}")
+  if [ -d "${source}" ]; then
+    source_dir=$(realpath "${source}")
 
-  echo "Looking for pact files in $consumer_pact_dir..."
+    echo "Looking for pact files in $source_dir..."
 
-  for file in "$consumer_pact_dir"/*.json; do
-    if [[ -f "$file" ]]; then
-      # Extract consumer and provider names from filename
-      filename=$(basename "$file")
-      provider=$(cat $file | jq -r ".provider.name")
+    for file in "$source_dir"/*.json; do
+      if [[ -f "$file" ]]; then
+        filename=$(basename "$file")
+        provider=$(cat $file | jq -r ".provider.name")
 
-      # Define S3 target path
-      targetPath="pacts/$provider/$filename"
+        targetPath="pacts/$provider/$filename"
 
-      echo "Uploading to s3://$PACT_BUCKET/$targetPath"
-      # aws s3 cp "$file" "s3://$PACT_BUCKET/$targetPath" --acl bucket-owner-full-control
-    fi
-  done
+        aws s3 cp "$file" "s3://$PACT_BUCKET/$targetPath"
+      fi
+    done
+  fi
 done
 
 echo "All Pact files uploaded successfully."

…consumer-2/template-deleted.pact.test.ts …r/template-deleted.consumer.pact.test.tstests/contracts/consumer-2/template-deleted.pact.test.ts renamed to tests/contracts/tests/auth/consumer/template-deleted.consumer.pact.test.ts tests/contracts/consumer-2/template-deleted.pact.test.ts renamed to tests/contracts/tests/auth/consumer/template-deleted.consumer.pact.test.ts

@@ -25,7 +25,7 @@ async function handleTemplateDeleted(event: unknown): Promise<void> {
 
 describe('Pact Message Consumer - TemplateDeleted Event', () => {
   const messagePact = new MessageConsumerPact({
-    consumer: 'consumer-2',
+    consumer: 'auth',
     provider: 'templates',
     dir: path.resolve(__dirname, 'pacts'),
     pactfileWriteMode: 'update',