Merge pull request #243 from NHSDigital/APM-1162-tweak-apigee-organization-requirement-for-add-jwks-resource-url-to-app

strutt · web-flow · commit 9f2655dc9f58 · 2021-02-15T13:30:29.000Z
APM-1162 No APIGEE_ORGANIZATION for add-jwks-resource-url-to-app
diff --git a/ansible/Makefile b/ansible/Makefile
@@ -21,7 +21,7 @@ VERBOSE := $(if ${VERBOSE},-vvv , )
 template-manifest: guard-DIST_DIR
 	@poetry run ansible-playbook $(VERBOSE) -i local template-manifest.yml
 
-add-jwks-resource-url-to-app: guard-APIGEE_ENVIRONMENT guard-APIGEE_ORGANIZATION guard-APIGEE_ACCESS_TOKEN guard-APP_ID
+add-jwks-resource-url-to-app: guard-APIGEE_ENVIRONMENT guard-APIGEE_ACCESS_TOKEN guard-APP_ID
 	@poetry run ansible-playbook $(VERBOSE) --diff $(CHECK) -i local add-jwks-resource-url-to-app.yml
 
 add-apim-guids-policy:
diff --git a/ansible/collections/ansible_collections/nhsd/apigee/roles/add_jwks_resource_url_to_app/vars/main.yml b/ansible/collections/ansible_collections/nhsd/apigee/roles/add_jwks_resource_url_to_app/vars/main.yml
@@ -1,4 +1,4 @@
-APIGEE_ORGANIZATION: "{{ lookup('env', 'APIGEE_ORGANIZATION')}}"
 APIGEE_ENVIRONMENT: "{{ lookup('env', 'APIGEE_ENVIRONMENT')}}"
+APIGEE_ORGANIZATION: "{{ 'nhsd-prod' if APIGEE_ENVIRONMENT in ['prod', 'sandbox', 'int', 'dev'] else 'nhsd-nonprod' }}"
 APIGEE_ACCESS_TOKEN: "{{ lookup('env', 'APIGEE_ACCESS_TOKEN')}}"
 APP_ID: "{{ lookup('env', 'APP_ID')}}"
