Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0a9d552
RAA-7897: Replace S3 routing with EPC API Gateway lookup
geberele Jun 5, 2026
f9d4580
Add raa- prefix to PR branch name validation
geberele Jun 5, 2026
08b5757
Update Python version from 3.9.22 to 3.11.15 in CI
geberele Jun 5, 2026
0ce1c2d
Use Python 3.10.20 in CI (frozenlist 1.3.0 incompatible with Python 3…
geberele Jun 5, 2026
5242861
Set PIP_PREFER_BINARY=1 to avoid source builds of old pinned packages
geberele Jun 5, 2026
8927b10
Upgrade pyyaml, awscli, botocore, s3transfer for Python 3.10 CI
geberele Jun 5, 2026
719bbcd
Move api-test-utils to optional e2e group to fix CI install
geberele Jun 5, 2026
6a1602a
Exclude live Apigee py callouts from flake8 to fix lint
geberele Jun 10, 2026
e0414c8
Remove stray [project] table breaking Poetry 2.x config validation
geberele Jun 10, 2026
3237c03
Regenerate poetry.lock for Poetry 2.x (adds group annotations, syncs …
geberele Jun 10, 2026
c306cc1
Pin CI Python to 3.10 so native deps build
geberele Jun 10, 2026
09fe30e
Pin Python 3.10 for pytest setup in post-deploy
geberele Jun 14, 2026
21f7fad
Fix EPC ServiceCallout URL failing Apigee import validation
geberele Jun 14, 2026
e93187a
Wrap ParseEpcResponse in IIFE to fix Rhino top-level return error
geberele Jun 14, 2026
b0e83b2
Include README.md in deploy artifact so poetry install resolves
geberele Jun 14, 2026
dcb7088
Use poetry install --no-root for deps-only install
geberele Jun 15, 2026
c7396d9
Re-trigger CI pipelines
geberele Jul 8, 2026
a84f872
Install e2e dependency group before running post-deploy tests
geberele Jul 8, 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
6 changes: 4 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
with:
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function

- name: Install Python 3.9.22
- name: Install Python 3.10
uses: actions/setup-python@v1
with:
python-version: 3.9.22
python-version: 3.10.20

- name: Update apt repositories
run: sudo apt update
Expand All @@ -34,6 +34,8 @@ jobs:

- name: Install repo
run: make install
env:
PIP_PREFER_BINARY: "1"

- name: Set SPEC_VERSION env var
run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check ticket name conforms to requirements
run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "(apm-[0-9]+)|(apmspii-[0-9]+)|(adz-[0-9]+)|(amb-[0-9]+)|(dependabot\/)"
run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "(apm-[0-9]+)|(apmspii-[0-9]+)|(adz-[0-9]+)|(amb-[0-9]+)|(raa-[0-9]+)|(dependabot\/)"

- name: Grab ticket name
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
run: echo ::set-env name=TICKET_NAME::$(echo ${{ github.event.pull_request.head.ref }} | grep -i -o '\(apm-[0-9]\+\)\|\(apmspii-[0-9]\+\)\|\(adz-[0-9]\+\)|\(amb-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'raa-') || contains(github.event.pull_request.head.ref, 'RAA-')
run: echo ::set-env name=TICKET_NAME::$(echo ${{ github.event.pull_request.head.ref }} | grep -i -o '\(apm-[0-9]\+\)\|\(apmspii-[0-9]\+\)\|\(adz-[0-9]\+\)\|\(amb-[0-9]\+\)\|\(raa-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

- name: Comment on PR with link to JIRA ticket
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'raa-') || contains(github.event.pull_request.head.ref, 'RAA-')
uses: unsplash/comment-on-pr@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
SHELL=/bin/bash -euo pipefail

install-python:
poetry install
poetry install --no-root

install-python-e2e:
poetry install --no-root --with e2e

install-node:
npm install --legacy-peer-deps
Expand All @@ -14,7 +17,7 @@ install: install-node install-python pre-commit-hook

lint:
npm run lint
find . -name '*.py' -not -path '**/.venv/*' -not -path './proxies/sandbox/apiproxy/resources/py/*' | xargs poetry run flake8
find . -name '*.py' -not -path '**/.venv/*' -not -path './proxies/sandbox/apiproxy/resources/py/*' -not -path './proxies/live/apiproxy/resources/py/*' | xargs poetry run flake8

clean:
rm -rf build
Expand Down Expand Up @@ -47,7 +50,7 @@ build-proxy:
copy-examples:
cp -r specification/examples sandbox/src/routes/examples

_dist_include="pytest.ini poetry.lock poetry.toml sandbox pyproject.toml Makefile build/. tests specification terraform infra"
_dist_include="pytest.ini poetry.lock poetry.toml sandbox pyproject.toml README.md Makefile build/. tests specification terraform infra"

release: clean copy-examples publish build-proxy
mkdir -p dist
Expand Down
1 change: 1 addition & 0 deletions azure/azure-build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ extends:
parameters:
service_name: ${{ variables.service_name }}
short_service_name: ${{ variables.short_service_name }}
python_version: "3.10"



7 changes: 6 additions & 1 deletion azure/templates/post-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ parameters:
default: aws --profile=apim-dev

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: "3.10"
displayName: Use Python 3.10

- bash: |
make install-python
make install-python-e2e
workingDirectory: $(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)
displayName: Setup pytests

Expand Down
Loading
Loading