Skip to content

Commit cdaf96a

Browse files
CMSNAV-798: Fix build script
1 parent 965b695 commit cdaf96a

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
SHELL=/bin/bash -euo pipefail
22

3-
include .env
4-
export
3+
# Only include .env if it exists.
4+
ifneq ("$(wildcard .env)","")
5+
include .env
6+
export
7+
endif
58

69
#Installs dependencies using poetry.
710
install-python:
@@ -53,7 +56,7 @@ release: clean publish build-proxy
5356
cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-qa-sandbox.yml
5457
cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-dev-sandbox.yml
5558

56-
get_apigee_access_token:
59+
token:
5760
SSO_LOGIN_URL=https://login.apigee.com get_token
5861

5962
#################

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Consider using a **dev container**. While this is in no way a requirement, you m
3838
- You can get an `APIGEE_ACCESS_TOKEN` via the `get_token` command. If you don't already have access to the `get_token` command, you can install it using [these instructions](https://docs.apigee.com/api-platform/system-administration/auth-tools#install).
3939
- You can get the latest `SOURCE_COMMIT_ID` via the `/_ping` endpoint of the proxy you're using. For example, with `PROXY_NAME` set to `nhs-website-content-api-internal-dev`, we would want to access the URL https://internal-dev.api.service.nhs.uk/nhs-website-content/_ping - this should return some JSON, and the value we want has key `commitId`.
4040

41-
:bulb: The `make get_apigee_access_token` command provides a useful shorthand for calling `get_token` with all the right environmental variables.
41+
:bulb: The `make token` command provides a useful shorthand for calling `get_token` with all the right environmental variables.
4242

4343
### Let's Roll
4444

azure/templates/run-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ steps:
2020
# In order to run tests in prod you must supply the unique ID of an Apigee app
2121
# that has authorized access to your service proxy.
2222
- bash: |
23-
touch .env
2423
export PROXY_NAME="$(FULLY_QUALIFIED_SERVICE_NAME)"
2524
export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
2625
export APIGEE_APP_ID="MY APP ID"

0 commit comments

Comments
 (0)