Skip to content

Commit 80d5b1a

Browse files
committed
CCM-11938: try remote with ssm
1 parent 0c4b6a8 commit 80d5b1a

File tree

3 files changed

+6
-40
lines changed

3 files changed

+6
-40
lines changed

.github/actions/build-proxies/action.yml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: "Build Proxies"
44
inputs:
55
version:
66
description: "Version number"
7-
required: true
7+
required: false
88
releaseVersion:
99
description: "Release, tag, branch, or commit ID to be used for deployment"
1010
required: true
@@ -48,7 +48,7 @@ runs:
4848
ENV="${{ inputs.environment }}"
4949
if [[ "$ENV" == "internal-dev" || "$ENV" == pr* ]]; then
5050
echo "TARGET_DOMAIN=suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
51-
elif [[ "$ENV" == "uat" ]]; then
51+
elif [[ "$ENV" == "int" ]]; then
5252
echo "TARGET_DOMAIN=suppliers.nonprod.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
5353
elif [[ "$ENV" == "prod" ]]; then
5454
echo "TARGET_DOMAIN=suppliers.prod.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
@@ -69,21 +69,6 @@ runs:
6969
echo "MTLS_NAME=notify-supplier-mtls-pr$PR_NUMBER" >> $GITHUB_ENV
7070
fi
7171
72-
# - name: Install Proxygen client
73-
# shell: bash
74-
# run: |
75-
# # Install proxygen cli
76-
# pip install pipx
77-
# pipx install proxygen-cli
78-
79-
# # Setup proxygen auth and settings
80-
# mkdir -p ${HOME}/.proxygen
81-
# echo -n $PROXYGEN_PRIVATE_KEY | base64 --decode > ${HOME}/.proxygen/key
82-
# envsubst < ./.github/proxygen-credentials-template.yaml > ${HOME}/.proxygen/credentials.yaml
83-
# envsubst < ./.github/proxygen-credentials-template.yaml | cat
84-
# envsubst < ./.github/proxygen-settings.yaml > ${HOME}/.proxygen/settings.yaml
85-
# envsubst < ./.github/proxygen-settings.yaml | cat
86-
8772
- name: Build ${{ inputs.apimEnv }} oas
8873
working-directory: .
8974
shell: bash
@@ -123,12 +108,3 @@ runs:
123108
--targetDomain "$TARGET_DOMAIN" \
124109
--version "${{ inputs.version }}"
125110
126-
# - name: Set docker tag
127-
# shell: bash
128-
# run: |
129-
# jq --arg newtag "$SANDBOX_TAG" '.["x-nhsd-apim"].target.containers[0].image.tag = $newtag' build/notify-supplier.json > build/notify-supplier_target.json && mv build/notify-supplier_target.json build/notify-supplier.json
130-
131-
# - name: Deploy to Internal Dev Sandbox
132-
# shell: bash
133-
# run: |
134-
# proxygen instance deploy internal-dev-${{ inputs.apimEnv }} $INSTANCE build/notify-supplier.json --no-confirm

.github/workflows/manual-proxy-environment-deploy.yaml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ on:
77
- feature/CCM-11938_workflow
88
workflow_dispatch:
99
inputs:
10-
version:
11-
description: Version number
12-
required: true
13-
type: string
1410
environment:
1511
description: Name of the environment to deploy
1612
required: true
1713
type: choice
1814
default: internal-dev
1915
options:
2016
- internal-dev
17+
- int
18+
- prod
2119

2220
permissions:
2321
contents: read
@@ -86,6 +84,7 @@ jobs:
8684
fi
8785
- name: "Build proxies"
8886
env:
87+
PROXYGEN_API_NAME: nhs-notify-supplier
8988
PR_NUMBER: ${{ steps.pr_exists.outputs.pr_number }}
9089
PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
9190
uses: ./.github/actions/build-proxies
@@ -96,13 +95,3 @@ jobs:
9695
buildSandbox: false
9796
releaseVersion: ${{ github.ref_name }}
9897

99-
# - name: Set target and cert
100-
# shell: bash
101-
# run: |
102-
# jq --arg newurl "$TARGET" '.["x-nhsd-apim"].target.url = $newurl' build/notify-supplier.json > build/notify-supplier_target.json && mv build/notify-supplier_target.json build/notify-supplier.json
103-
# jq --arg newmtls "$MTLS_NAME" '.["x-nhsd-apim"].target.security.secret = $newmtls' build/notify-supplier.json > build/notify-supplier_target.json && mv build/notify-supplier_target.json build/notify-supplier.json
104-
105-
# - name: Deploy to Internal Dev
106-
# shell: bash
107-
# run: |
108-
# proxygen instance deploy internal-dev $INSTANCE build/notify-supplier.json --no-confirm

.github/workflows/stage-3-build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
runs-on: ubuntu-latest
9494
timeout-minutes: 10
9595
env:
96+
PROXYGEN_API_NAME: nhs-notify-supplier
9697
PR_NUMBER: ${{ inputs.pr_number }}
9798
PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
9899
steps:

0 commit comments

Comments
 (0)