Skip to content

Commit 3e06f07

Browse files
Merge pull request #3 from NHSDigital/AMB-577-Setup-new-proxy-for-shared-flow-testing
Amb 577 setup new proxy for shared flow testing
2 parents a497e29 + 65233fd commit 3e06f07

File tree

6 files changed

+25
-50
lines changed

6 files changed

+25
-50
lines changed

.editorconfig

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/pr-lint.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Check ticket name conforms to requirements
8-
run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "(apm-[0-9]+)|(apmspii-[0-9]+)|(adz-[0-9]+)|(dependabot\/)"
8+
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\/)"
99

1010
- name: Grab ticket name
11-
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-')
12-
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]\+\)' | tr '[:lower:]' '[:upper:]')
11+
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-')
12+
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:]')
1313
env:
1414
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1515

1616
- name: Comment on PR with link to JIRA ticket
17-
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-')
17+
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-')
1818
uses: unsplash/comment-on-pr@master
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
with:
2222
msg: |
2323
This branch is work on a ticket in the NHS Digital APM JIRA Project. Here's a handy link to the ticket:
24-
# [${{ env.TICKET_NAME }}](https://nhsd-jira.digital.nhs.uk/browse/${{ env.TICKET_NAME}})
24+
# [${{ env.TICKET_NAME }}](https://nhsd-jira.digital.nhs.uk/browse/${{ env.TICKET_NAME}})

azure/azure-pr-pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extends:
4040
make_spec_visible: true
4141
post_deploy:
4242
- template: ./templates/run-smoke-tests.yml
43-
- environment: internal-dev-sandbox
44-
proxy_path: sandbox
45-
post_deploy:
46-
- template: ./templates/run-smoke-tests.yml
43+
# - environment: internal-dev-sandbox
44+
# proxy_path: sandbox
45+
# post_deploy:
46+
# - template: ./templates/run-smoke-tests.yml

azure/azure-release-pipeline.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ extends:
3838
make_spec_visible: true # Off by default. Turn on to allow expose API developers can subscribe their Apps to
3939
post_deploy:
4040
- template: ./templates/run-smoke-tests.yml
41-
- environment: internal-qa
42-
make_spec_visible: true
43-
post_deploy:
44-
- template: ./templates/run-smoke-tests.yml
45-
- environment: internal-qa-sandbox
46-
proxy_path: sandbox
47-
make_spec_visible: true
48-
post_deploy:
49-
- template: ./templates/run-smoke-tests.yml
41+
# - environment: internal-qa
42+
# make_spec_visible: true
43+
# post_deploy:
44+
# - template: ./templates/run-smoke-tests.yml
45+
# - environment: internal-qa-sandbox
46+
# proxy_path: sandbox
47+
# make_spec_visible: true
48+
# post_deploy:
49+
# - template: ./templates/run-smoke-tests.yml
5050
# make_spec_visible is false for sandbox environment
5151
# (App subscription make sense for most sandbox implementations)
52-
- environment: sandbox
53-
proxy_path: sandbox
54-
post_deploy:
55-
- template: ./templates/run-smoke-tests.yml
52+
# - environment: sandbox
53+
# proxy_path: sandbox
54+
# post_deploy:
55+
# - template: ./templates/run-smoke-tests.yml
5656
# Enable int environment when ready by uncommenting:
5757
# - environment: int
5858
# make_spec_visible: true

manifest_template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ APIGEE_ENVIRONMENTS:
2121
meta:
2222
api:
2323
name: shared-flow-testing
24-
guid: e0f1d6cf-402f-493e-8a36-9abea3372000
24+
guid: 3bf28d91-7109-4387-bf1a-e26f673eb0e8
2525
spec_guids:
26-
- a062e000-b843-4833-8d24-8fc143490111
26+
- fc17b6fe-c3c7-4801-8331-3f87c9f26e62
2727
schema_version: 1.1
2828
apigee:
2929
environments:

tests/configuration/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# Api Details
55
ENVIRONMENT = ENV["environment"]
66
BASE_URL = f"https://{ENVIRONMENT}.api.service.nhs.uk"
7-
BASE_PATH = ENV["base_path"]
7+
BASE_PATH = ENV["base_path"]

0 commit comments

Comments
 (0)