Skip to content

Test #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
neil-sproston wants to merge 4 commits into
base: alpha-integration
Choose a base branch
from
Draft

Test #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e70bf07
[GPCAPIM-194] Final configuration for the alpha internal integration …
neil-sproston Apr 2, 2026
a97af3f
GPCAPIM-196 - alpha integration environment (#149)
neil-sproston Apr 2, 2026
ece9de0
Bump aws-actions/configure-aws-credentials
dependabot[bot] Apr 2, 2026
f28b0ba
Bump aws-actions/configure-aws-credentials from 84e497037868db1737eb2…
neil-sproston Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions .github/workflows/alpha-integration-env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
TF_STATE_BUCKET: "cds-cdg-dev-tfstate-900119715266"
TF_STATE_KEY: "dev/preview/alpha-integration.tfstate"
BRANCH_NAME: "alpha-integration"
ALB_RULE_PRIORITY: "2000"
ALB_RULE_PRIORITY: "900"
BASE_URL: "https://internal-dev.api.service.nhs.uk/clinical-data-gateway-api-poc-alpha-integration"
python_version: "3.14"
PROXYGEN_API_NAME: ${{ vars.PROXYGEN_API_NAME }}
Expand All @@ -39,7 +39,7 @@ jobs:
ref: alpha-integration

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@84e497037868db1737eb2907599d3f61e8899373
uses: aws-actions/configure-aws-credentials@51635dbf418c2cdd8b3e1497529334d8db7e4063
with:
role-to-assume: ${{ secrets.DEV_AWS_CREDENTIALS }}
aws-region: ${{ env.AWS_REGION }}
Expand Down Expand Up @@ -220,27 +220,35 @@ jobs:

- name: Run contract tests
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-alpha-integration"
with:
test-type: contract
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
base-url: ${{ env.BASE_URL }}

- name: Run schema validation tests
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-alpha-integration"
with:
test-type: schema
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
base-url: ${{ env.BASE_URL }}

- name: Run integration tests
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-alpha-integration"
with:
test-type: integration
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
base-url: ${{ env.BASE_URL }}

- name: Run acceptance tests
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-alpha-integration"
with:
test-type: acceptance
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
Expand All @@ -249,20 +257,6 @@ jobs:
- name: Remove mTLS temp files
run: rm -f /tmp/client1-key.pem /tmp/client1-cert.pem

# - name: Trivy IaC scan
# uses: nhs-england-tools/trivy-action/iac-scan@289984b2f03034233a347d6dbadecd5ca9ea9634
# with:
# scan-ref: infrastructure/environments/preview
# artifact-name: trivy-iac-scan-alpha-integration

# - name: Trivy image scan
# uses: nhs-england-tools/trivy-action/image-scan@289984b2f03034233a347d6dbadecd5ca9ea9634
# with:
# image-ref: ${{ steps.meta.outputs.ecr_url }}:${{ env.BRANCH_NAME }}
# artifact-name: trivy-image-scan-alpha-integration

# - name: Generate SBOM
# uses: nhs-england-tools/trivy-action/image-scan@289984b2f03034233a347d6dbadecd5ca9ea9634
# with:
# image-ref: ${{ steps.meta.outputs.ecr_url }}:${{ env.BRANCH_NAME }}
# artifact-name: trivy-sbom-alpha-integration
# - name: Trivy IaC scan - replacement
# - name: Trivy image scan - replacement
# - name: Generate SBOM - replacement
10 changes: 9 additions & 1 deletion .github/workflows/preview-env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

# Configure AWS credentials (OIDC recommended)
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@84e497037868db1737eb2907599d3f61e8899373
uses: aws-actions/configure-aws-credentials@51635dbf418c2cdd8b3e1497529334d8db7e4063
with:
role-to-assume: ${{ steps.role-select.outputs.aws_role }}
aws-region: ${{ env.AWS_REGION }}
Expand Down Expand Up @@ -340,6 +340,8 @@ jobs:
- name: "Run contract tests"
if: github.event.action != 'closed'
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-pr-${{ github.event.pull_request.number }}"
with:
test-type: contract
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
Expand All @@ -348,6 +350,8 @@ jobs:
- name: "Run schema validation tests"
if: github.event.action != 'closed'
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-pr-${{ github.event.pull_request.number }}"
with:
test-type: schema
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
Expand All @@ -356,6 +360,8 @@ jobs:
- name: "Run integration tests"
if: github.event.action != 'closed'
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-pr-${{ github.event.pull_request.number }}"
with:
test-type: integration
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
Expand All @@ -364,6 +370,8 @@ jobs:
- name: "Run acceptance tests"
if: github.event.action != 'closed'
uses: ./.github/actions/run-test-suite
env:
PROXY_BASE_PATH: "clinical-data-gateway-api-poc-pr-${{ github.event.pull_request.number }}"
with:
test-type: acceptance
apigee-access-token: ${{ steps.apigee-token.outputs.apigee-access-token }}
Expand Down
12 changes: 11 additions & 1 deletion scripts/tests/run-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,26 @@ else
fi

if [[ "${ENV:-local}" = "remote" ]] && [[ "$TEST_TYPE" != "unit" ]]; then
echo "[run-test] Branch: remote non-unit path"
echo "[run-test] ENV=${ENV:-local}, TEST_TYPE=${TEST_TYPE}"
echo "[run-test] Running via APIM proxy options"
if [[ -z "${PROXY_BASE_PATH:-}" ]]; then
echo "Error: PROXY_BASE_PATH must be set when ENV=remote and TEST_TYPE is not unit" >&2
exit 1
fi
# Note: TEST_PATH is intentionally unquoted to allow glob expansion
poetry run pytest ${TEST_PATH} --env="remote" -v \
--api-name="${PROXYGEN_API_NAME}" \
--proxy-name="${PROXYGEN_API_NAME}--internal-dev--${PROXYGEN_API_NAME}-pr-${PR_NUMBER}" \
--proxy-name="${PROXYGEN_API_NAME}--internal-dev--${PROXY_BASE_PATH}" \
--cov="${COV_PATH}" \
--cov-report=html:test-artefacts/coverage-html \
--cov-report=term \
--junit-xml="test-artefacts/${TEST_TYPE}-tests.xml" \
--html="test-artefacts/${TEST_TYPE}-tests.html" --self-contained-html
else
echo "[run-test] Branch: local/default path"
echo "[run-test] ENV=${ENV:-local}, TEST_TYPE=${TEST_TYPE}"
echo "[run-test] Running direct tests without APIM proxy options"
poetry run pytest ${TEST_PATH} -v \
--api-name="clinical-data-gateway-api" \
--cov="${COV_PATH}" \
Expand Down
Loading