Skip to content

Tidy up bootstrap and validate manifest in build #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jslb merged 8 commits into from
Mar 17, 2021
Merged

Tidy up bootstrap and validate manifest in build #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
361d438
APM-1910 Bump codegen version and update gen docs
HenryIwanejko Mar 11, 2021
3a78e8b
APM-1910 use x-meta to pass lint of spec
HenryIwanejko Mar 15, 2021
e8cfc33
APM-1910 Update bootstrap to template new files
HenryIwanejko Mar 17, 2021
d47fe4a
APM-1910 Refactor replace task
HenryIwanejko Mar 17, 2021
a9dda1c
APM-1162 Validate manifest in build pipeline
strutt Mar 17, 2021
8c51d2b
Merge pull request #279 from NHSDigital/APM-1162-validate-manifest-in…
jslb Mar 17, 2021
0d9038a
Merge branch 'master' into APM-1910-resolve-template-issues
strutt Mar 17, 2021
9114504
Merge pull request #278 from NHSDigital/APM-1910-resolve-template-issues
strutt Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions ansible/roles/bootstrap-project/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

- name: download swagger-codegen
get_url:
url: "https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.20/swagger-codegen-cli-3.0.20.jar"
url: "https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.25/swagger-codegen-cli-3.0.25.jar"
dest: "{{ build_dir }}/swagger-codegen-cli.jar"

- name: load project config oas
include_vars:
file: "{{ CONFIG }}"
name: config

- name: check meta.{{ item }} is set
- name: check ['x-meta'].{{ item }} is set
fail:
msg: "meta.{{ item }} is not defined"
when: config.meta[item] is not defined
msg: "x-meta.{{ item }} is not defined"
when: config['x-meta'][item] is not defined
loop:
- service_name
- short_service_name
Expand All @@ -42,7 +42,7 @@

- name: set repo_location
set_fact:
repo_location: "{{ DEST }}/{{ config.meta.service_name }}"
repo_location: "{{ DEST }}/{{ config['x-meta'].service_name }}"

- name: clone template repository
git:
Expand All @@ -68,8 +68,6 @@
- "{{ repo_location }}/README.md"
- "{{ repo_location }}/package.json"
- "{{ repo_location }}/pyproject.toml"
- "{{ repo_location }}/terraform/main.tf"
- "{{ repo_location }}/Makefile"
- "{{ repo_location }}/proxies/live/apiproxy/proxy.xml"
- "{{ repo_location }}/proxies/sandbox/apiproxy/proxy.xml"
- "{{ repo_location }}/proxies/live/apiproxy/policies/KeyValueMapOperations.GetSecureVariables.xml"
Expand All @@ -81,15 +79,19 @@
- "{{ repo_location }}/azure/azure-release-pipeline.yml"
- "{{ repo_location }}/azure/project.yml"
- "{{ repo_location }}/manifest_template.yml"
- "{{ repo_location }}/ecs-proxies-containers.yml"
- "{{ repo_location }}/ecs-proxies-deploy.yml"
- "{{ repo_location }}/tests/test_endpoints.py"
- "{{ repo_location }}/pyproject.toml"

- name: rename live proxy file
command: mv "{{ repo_location }}/proxies/live/apiproxy/proxy.xml" "{{ repo_location }}/proxies/live/apiproxy/{{ config.meta.short_service_name }}.xml"
command: mv "{{ repo_location }}/proxies/live/apiproxy/proxy.xml" "{{ repo_location }}/proxies/live/apiproxy/{{ config['x-meta'].short_service_name }}.xml"

- name: rename sandbox proxy file
command: mv "{{ repo_location }}/proxies/sandbox/apiproxy/proxy.xml" "{{ repo_location }}/proxies/sandbox/apiproxy/{{ config.meta.short_service_name }}.xml"
command: mv "{{ repo_location }}/proxies/sandbox/apiproxy/proxy.xml" "{{ repo_location }}/proxies/sandbox/apiproxy/{{ config['x-meta'].short_service_name }}.xml"

- name: rename live target file
command: mv "{{ repo_location }}/proxies/live/apiproxy/targets/target.xml" "{{ repo_location }}/proxies/live/apiproxy/targets/{{ config.meta.short_service_name }}-target.xml"
command: mv "{{ repo_location }}/proxies/live/apiproxy/targets/target.xml" "{{ repo_location }}/proxies/live/apiproxy/targets/{{ config['x-meta'].short_service_name }}-target.xml"

- name: ensure specification folder exists
file:
Expand All @@ -99,14 +101,17 @@
- name: copy config oas to repo
copy:
src: "{{ CONFIG }}"
dest: "{{ repo_location }}/specification/{{ config.meta.service_name }}.yaml"
dest: "{{ repo_location }}/specification/{{ config['x-meta'].service_name }}.yaml"

- name: generate sandbox server
shell:
cmd: "java -jar {{ build_dir }}/swagger-codegen-cli.jar generate -i {{ repo_location }}/specification/{{ config.meta.service_name }}.yaml -l nodejs-server -o {{ repo_location }}/sandbox"
cmd: "java -jar {{ build_dir }}/swagger-codegen-cli.jar generate -i {{ repo_location }}/specification/{{ config['x-meta'].service_name }}.yaml -l nodejs-server -o {{ repo_location }}/sandbox"

- name: set sandbox server default port to 9000
replace:
path: "{{ repo_location }}/sandbox/index.js"
path: "{{ item }}"
regexp: "8080"
replace: "9000"
with_items:
- "{{ repo_location }}/sandbox/index.js"
- "{{ repo_location }}/sandbox/README.md"
2 changes: 2 additions & 0 deletions azure/common/apigee-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,15 @@ jobs:
elif [ -f manifest_template.yml ]; then
rsync -a manifest_template.yml dist
make -C utils/ansible template-manifest
make -C utils/ansible validate-manifest
fi
workingDirectory: "${{ parameters.service_name }}"
displayName: "Validate manifest (template) and copy to artifact"

- bash: |
cd ${{ parameters.service_name }}/utils
git rev-parse HEAD > ../dist/.utils-version
displayName: Snapshot utils version

- publish: ${{ parameters.service_name}}/dist
artifact: "$(Build.BuildNumber)"
Expand Down
2 changes: 2 additions & 0 deletions azure/templates/deploy-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ steps:
fi

cd $(UTILS_DIR)
ANSIBLE_FORCE_COLOR=yes \
make --no-print-directory -C ansible template-proxies

if [ -f $(SERVICE_DIR)/manifest.yml ]; then
DIST_DIR=$(SERVICE_DIR) \
PROXY_DIR=${{ parameters.proxy_path }} \
ANSIBLE_FORCE_COLOR=yes \
make --no-print-directory -C ansible add-apim-guids-policy
fi

Expand Down