Skip to content

Commit 0edec05

Browse files
nhsd-david-wassmasl2
nhsd-david-wass
authored and
masl2
committed
CCM-12673 - Make PR proxies temporary (#286)
* CCM-12673 - Make PR proxies temporary * Another refactor and include security * Update monitoring to true for all envs except PRs * sandbox authorization optional Signed-off-by: Mark Slowey <mark.slowey1@nhs.net>
1 parent ee0077b commit 0edec05

72 files changed

Lines changed: 115 additions & 49 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ dist
2828
/sandbox/*.log
2929
/sandbox-staging
3030
/specification/api/components/examples
31+
/specification/api/components/x-nhsd-apim/x-nhsd-apim.yml
32+
/specification/api/components/security-schemes/security-schemes.yml
33+
/specification/api/components/security/security.yml
34+
/specification/api/components/parameters/authorization/authorization.yml
3135
/scripts/JWT/*.pem

‎Makefile‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,32 +46,26 @@ publish-oas:
4646
npm run publish-oas
4747

4848
set-authorization: guard-APIM_ENV
49-
@ AUTHORIZATION=authorization-$$APIM_ENV.yml \
50-
envsubst '$${AUTHORIZATION}' \
51-
< specification/api/components/parameters/authorization/authorization-template.yml > specification/api/components/parameters/authorization/authorization.yml
49+
SPEC_DIR=./specification/api/components/environments
50+
COMPONENT_DIR=./specification/api/components/parameters/authorization
51+
./scripts/build/substitute_build_env.sh $$COMPONENT_DIR/authorization-template.yml $$SPEC_DIR/$$APIM_ENV.env $$COMPONENT_DIR/authorization.yml
5252

53-
set-target: guard-APIM_ENV
54-
@ TARGET=target-$$APIM_ENV.yml \
55-
envsubst '$${TARGET}' \
56-
< specification/api/components/x-nhsd-apim/target-template.yml > specification/api/components/x-nhsd-apim/target.yml
57-
58-
set-access: guard-APIM_ENV
59-
@ ACCESS=access-$$APIM_ENV.yml \
60-
envsubst '$${ACCESS}' \
61-
< specification/api/components/x-nhsd-apim/access-template.yml > specification/api/components/x-nhsd-apim/access.yml
53+
set-nhsd-apim: guard-APIM_ENV
54+
SPEC_DIR=./specification/api/components/environments
55+
COMPONENT_DIR=./specification/api/components/x-nhsd-apim
56+
./scripts/build/substitute_build_env.sh $$COMPONENT_DIR/x-nhsd-apim-template.yml $$SPEC_DIR/$$APIM_ENV.env $$COMPONENT_DIR/x-nhsd-apim.yml
6257

6358
set-security: guard-APIM_ENV
64-
@ SECURITY=security-$$APIM_ENV.yml \
65-
envsubst '$${SECURITY}' \
66-
< specification/api/components/security/security-template.yml > specification/api/components/security/security.yml
67-
@ SECURITY_SCHEMES=security-schemes-$$APIM_ENV.yml \
68-
envsubst '$${SECURITY_SCHEMES}' \
69-
< specification/api/components/security-schemes/security-schemes-template.yml > specification/api/components/security-schemes/security-schemes.yml
59+
SPEC_DIR=./specification/api/components/environments
60+
COMPONENT_DIR=./specification/api/components/security
61+
./scripts/build/substitute_build_env.sh $$COMPONENT_DIR/security-template.yml $$SPEC_DIR/$$APIM_ENV.env $$COMPONENT_DIR/security.yml
62+
COMPONENT_DIR=./specification/api/components/security-schemes
63+
./scripts/build/substitute_build_env.sh $$COMPONENT_DIR/security-schemes-template.yml $$SPEC_DIR/$$APIM_ENV.env $$COMPONENT_DIR/security-schemes.yml
64+
7065

7166
construct-spec: guard-APIM_ENV
67+
$(MAKE) set-nhsd-apim APIM_ENV=$$APIM_ENV
7268
$(MAKE) set-authorization APIM_ENV=$$APIM_ENV
73-
$(MAKE) set-target APIM_ENV=$$APIM_ENV
74-
$(MAKE) set-access APIM_ENV=$$APIM_ENV
7569
$(MAKE) set-security APIM_ENV=$$APIM_ENV
7670

7771
build-json-oas-spec: guard-APIM_ENV

‎scripts/build/substitute_build_env.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
TEMPLATE="$1"
5+
ENV_FILE="$2"
6+
OUT="$3"
7+
8+
# Extract variable names from the env file (left side of KEY=VALUE)
9+
VARS=$(grep -E '^[A-Za-z_][A-Za-z0-9_]*=' "$ENV_FILE" | cut -d= -f1)
10+
11+
# Build envsubst variable list ($VAR1 $VAR2 ...)
12+
VARLIST=""
13+
for v in $VARS; do
14+
VARLIST="$VARLIST \$$v"
15+
done
16+
VARLIST="${VARLIST# }" # remove leading space
17+
18+
# Export values from the env file
19+
set -a
20+
source "$ENV_FILE"
21+
set +a
22+
23+
# Run envsubst only on the selected variables
24+
envsubst "$VARLIST" < "$TEMPLATE" > "$OUT"
25+
26+
echo "Generated: $OUT"

specification/api/components/security-schemes/security-schemes-ptl.yml renamed to specification/api/components/environments/common/security-schemes-ptl.yml

File renamed without changes.

‎specification/api/components/environments/int.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
MONITORING_FLAG=true
2+
TEMPORARY_FLAG=false
3+
ENV_DIR=../environments/int

specification/api/components/x-nhsd-apim/access-int.yml renamed to specification/api/components/environments/int/access.yml

File renamed without changes.

specification/api/components/parameters/authorization/authorization-int.yml renamed to specification/api/components/environments/int/authorization.yml

File renamed without changes.

specification/api/components/x-nhsd-apim/rate-limiting.yml renamed to specification/api/components/environments/int/rate-limiting.yml

File renamed without changes.

‎specification/api/components/environments/int/security-schemes.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$ref: '../common/security-schemes-ptl.yml'

specification/api/components/security/security-int.yml renamed to specification/api/components/environments/int/security.yml

File renamed without changes.

0 commit comments

Comments
 (0)