Fix build script and Dockerfile so tests can be run locally

Author: thpierce

contract-tests/README.md

@@ -32,7 +32,8 @@ The steps to add a new test for a library or framework are:
 
 Pre-requirements:
 * Have `docker` installed and running - verify by running the `docker` command.
-* Copy the `aws_opentelemetry_distro` wheel file to each application folder under `images` (e.g. to `requests`, but not `mock-collector`)
+* Create `aws-otel-python-instrumentation/contract-tests/dist` folder
+* Copy the `aws_opentelemetry_distro` wheel file to `aws-otel-python-instrumentation/contract-tests/dist` folder
 
 From `aws-otel-python-instrumentation/contract-tests` execute:
 

contract-tests/images/applications/requests/Dockerfile

@@ -1,8 +1,13 @@
+# Meant to be run from aws-otel-python-instrumentation/contract-tests.
+# Assumes existence of dist/aws_opentelemetry_distro-<pkg_version>-py3-none-any.whl.
+# Assumes filename of aws_opentelemetry_distro-<pkg_version>-py3-none-any.whl is passed in as "DISTRO" arg.
 FROM python:3.9-slim
 WORKDIR /requests
-COPY . /requests
+COPY ./dist /requests
+COPY ./images/applications/requests /requests
 
-RUN pip install -r requirements.txt && pip install aws_opentelemetry_distro-0.0.1-py3-none-any.whl --force-reinstall
+ARG DISTRO
+RUN pip install -r requirements.txt && pip install ${DISTRO} --force-reinstall
 RUN opentelemetry-bootstrap -a install
 
 # Without `-u`, logs will be buffered and `wait_for_logs` will never return.

contract-tests/set-up-contract-tests.sh

@@ -1,29 +1,47 @@
+#!/bin/bash
+# Check script is running in contract-tests
+current_path=`pwd`
+current_dir="${current_path##*/}"
+if [ "$current_dir" != "contract-tests" ]; then
+  echo "Please run from contract-tests dir"
+  exit
+fi
+
+# Remove old whl files (excluding distro whl)
+rm -rf dist/mock_collector*
+rm -rf dist/contract_tests*
+
+# Create mock-collector image
 cd images/mock-collector
 docker build . -t aws-appsignals-mock-collector-python
+cd ../..
+
+# Find and store aws_opentelemetry_distro whl file
+cd dist
+DISTRO=(aws_opentelemetry_distro*.whl)
+if [ "$DISTRO" = "aws_opentelemetry_distro*.whl" ]; then
+ echo "Could not find aws_opentelemetry_distro whl file in dist dir."
+ exit 1
+fi
 cd ..
 
-cd applications
-for dir in */
+# Create application images
+for dir in images/applications/*
 do
-  cd $dir
-  docker build . -t aws-appsignals-tests-${dir%/}-app
-  cd ..
+  application="${dir##*/}"
+  docker build . -t aws-appsignals-tests-${application}-app -f ${dir}/Dockerfile --build-arg="DISTRO=${DISTRO}"
 done
 
-cd ../..
-
-mkdir dist
-rm -rf dist/*
+# Build and install mock-collector
 cd images/mock-collector
 python3 -m build --outdir ../../dist --no-isolation
 cd ../../dist
-pip wheel --no-deps mock_collector-1.0.0.tar.gz
 pip install mock_collector-1.0.0-py3-none-any.whl --force-reinstall
 
+# Build and install contract-tests
 cd ../tests
 python3 -m build --outdir ../dist --no-isolation
 cd ../dist
-pip wheel --no-deps contract_tests-1.0.0.tar.gz
 # --force-reinstall causes `ERROR: No matching distribution found for mock-collector==1.0.0`, but uninstalling and reinstalling works pretty reliably.
 pip uninstall contract-tests -y
 pip install contract_tests-1.0.0-py3-none-any.whl