Produced by Araxis Merge on 10/12/2018 4:04:43 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-services.zip\vetlink-services | README.md | Fri Aug 24 18:25:23 2018 UTC |
| 2 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-services.zip\vetlink-services | README.md | Fri Oct 12 13:41:09 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 136 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | # Vetlink Services | |
| 2 | ||
| 3 | Version 2. 0.0 | |
| 4 | ||
| 5 | ## Descrip tion | |
| 6 | ||
| 7 | VAMF API G ateway-ena bled Veter an-facing services t hat allow Veterans a nd Authori zed Users to connect with othe r Veterans and Autho rized user s based on similar c haracteris tics and i nterests. They are a ble to ide ntify indi viduals an d groups t o join in discussion s about he alth-relat ed issues. Based upo n access w ith a Prem ium (level 2) DS Log on account , the appl ication ma kes it pos sible for Veterans a nd Authori zed Users to select what infor mation in their prof iles they want to sh are with o thers. Vet erans and Authorized Users wil l be able to quickly find, joi n, and com municate t hrough net works of p eople with common in terests. | |
| 8 | ||
| 9 | ## Technol ogies | |
| 10 | ||
| 11 | - Java 8 | |
| 12 | - Spring B oot | |
| 13 | - MongoDB | |
| 14 | ||
| 15 | ## Depende ncies | |
| 16 | * MongoDB | |
| 17 | ||
| 18 | ## NextGen Build and Deploymen t using Do cker Local Developme nt | |
| 19 | ##### a. Clone the docker-loc al-develop ment and v etlink-ser vices repo s | |
| 20 | * Docker L ocal Devel opment: cl one Releas e/1.x bran ch of [MAE repositor y](https:/ / DNS . URL /projects/ DEV/repos/ docker-loc al-develop ment/brows e) | |
| 21 | * Follow R EADME of a bove repos itory for basic envi ronment pr erequisite s | |
| 22 | * Vetlink Services: clone Rele ase/2.x br anch from [MAE repos itory](htt ps:// DNS . URL /projects/ NAVYMED/re pos/vetlin k-services /browse) | |
| 23 | ||
| 24 | ##### b. E dit the do cker-compo se.yml fil e in docke r-local-de velopment | |
| 25 | * Add Vetl ink Servic es entry t o main `do cker-compo se.yml` in above rep ository: | |
| 26 | ||
| 27 | ```yaml | |
| 28 | vetlink-se rvices: | |
| 29 | image: vetlink-s ervices | |
| 30 | ports: | |
| 31 | - 80 95:8080 | |
| 32 | enviro nment: | |
| 33 | - CONS UL_HTTP_AD DR=${CONSU L_HTTP_ADD R} | |
| 34 | - CONS UL_TOKEN=$ {CONSUL_RE ADONLY_TOK EN} | |
| 35 | - CONS UL_PATH=ap pconfig/${ VAMF_ENVIR ONMENT}/ve tlink-serv ices | |
| 36 | - VAMF _ENVIRONME NT=${VAMF_ ENVIRONMEN T} | |
| 37 | - SERV ICE_TAGS=$ {VAMF_ENVI RONMENT} | |
| 38 | - "con straint:no detype==*s ervice*" | |
| 39 | - DODV AL_CORS_DO MAINS=* | |
| 40 | - DODV AL_MONGO_D B_URL=mong odb://<mon godb_hostn ame:port>/ vetlinkdb? ssl=false& connectTim eoutMS=200 00&maxPool Size=100 | |
| 41 | ``` | |
| 42 | ##### c. Build | |
| 43 | * Vetlink Services: docker bui ld | |
| 44 | ||
| 45 | ```bash | |
| 46 | ./nextgen/ build.sh | |
| 47 | ``` | |
| 48 | ||
| 49 | ##### d. Deploy | |
| 50 | * Bring up docker-lo cal-develo pment envi ronment wi th `./run. sh` | |
| 51 | ||
| 52 | * Expose V etlink Ser vices to t he API Gat eway via C onsul. Use the follo wing curl commands t o register `vetlink- services` and it's e nvironment variables | |
| 53 | ||
| 54 | ```bash | |
| 55 | curl -H "X -Consul-To ken:{CONSU L_TOKEN}" -s -X PUT $CONSUL_HT TP_ADDR:85 00/v1/kv/v amf/$VAMF_ ENVIRONMEN T/apigatew ay/1.0/ser vices/vetl ink-servic es -d '{"l ocation":" /VetLinkSe rvices","s ervice":"v etlink-ser vices","re direct":"o ff","heade rs":{"X-Re al-IP":"$r emote_addr ", "HOST": "$http_hos t"}}' | |
| 56 | curl -H "X -Consul-To ken:{CONSU L_TOKEN}" -s -X PUT $CONSUL_HT TP_ADDR:85 00/v1/kv/a ppconfig/$ VAMF_ENVIR ONMENT/vet link-servi ces/DODVAL _CORS_DOMA INS -d '*' >/dev/nul l | |
| 57 | curl -H "X -Consul-To ken:{CONSU L_TOKEN}" -s -X PUT $CONSUL_HT TP_ADDR:85 00/v1/kv/a ppconfig/$ VAMF_ENVIR ONMENT/vet link-servi ces/DODVAL _MONGO_DB_ URL -d 'mo ngodb://<m ongodb_hos tname:port >/vetlinkd b?ssl=fals e&connectT imeoutMS=2 0000&maxPo olSize=100 ' >/dev/nu ll | |
| 58 | ``` | |
| 59 | ||
| 60 | * The `vet link-servi ces` servi ce will no w be avail able via C onsul | |
| 61 | ||
| 62 | ## Integra tion Tests | |
| 63 | The integr ation test s use clie nt code th at is gene rated from the swagg er contrac t. If the swagger co ntract cha nges, the generated client cod e will als o change a nd may req uire the i ntegration tests to be modifie d to match . | |
| 64 | ||
| 65 | ### Runnin g Integrat ion Tests | |
| 66 | From the p roject roo t execute the follow ing comman d: | |
| 67 | ||
| 68 | ```bash | |
| 69 | ./gradle w clean in tTest | |
| 70 | ``` |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.