From d5255c238ba67a6989a5a7dbc26c03b56b0b4f9e Mon Sep 17 00:00:00 2001 From: gonagar1 <gonagar1@in.ibm.com> Date: Tue, 13 Oct 2020 12:26:44 +0530 Subject: [PATCH] Squashed commit of the following: commit 66ac9d81fc286fc1661875f7f15fde46ad22888f Merge: adb401b c081dd7 Author: gonagar1 <gonagar1@in.ibm.com> Date: Mon Oct 12 13:57:38 2020 +0530 Merge branch 'og-master' into develop commit adb401bc950722cd196ca9d37bd7a27dfe89bbc9 Merge: 3eec7dd b1ac441 Author: Anuj Gupta <anujgupta@in.ibm.com> Date: Thu Oct 8 14:52:23 2020 +0000 Merge branch 'ibm-core-lib-update' into 'develop' Ibm core lib-test version update See merge request osdu/core/os-indexer!21 commit b1ac441f01abacbbf0be22a1535913d2f177efc8 Author: BhushanRade <BhushanRade@LAPTOP-MPE0Q6D8> Date: Thu Oct 8 19:56:32 2020 +0530 IBM test core-lib version updated from 0.0.19-SNAPSHOT to 0.3.8-SNAPSHOT commit 3eec7ddc8553f8045ea399b1536726567dea4056 Merge: 06b1018 bf843df Author: Shrikant Garg <shrikgar@in.ibm.com> Date: Tue Sep 22 13:25:16 2020 +0000 Merge branch 'liveness' into 'develop' Liveness and readiness implemented See merge request osdu/core/os-indexer!20 commit bf843dfc07efb09a4e51ac7784e53105429c3b4b Author: gonagar1 <gonagar1@in.ibm.com> Date: Tue Sep 22 15:06:32 2020 +0530 Liveness and readiness implemented commit 06b1018fe3ab0af6183a7f5df5b8f395bf750712 Merge: 808e410 fecf1d8 Author: Anuj Gupta <anujgupta@in.ibm.com> Date: Mon Aug 17 10:43:52 2020 +0000 Merge branch 'og-synch-core-lib-upgrade' into 'develop' Og synch core lib upgrade See merge request osdu/core/os-indexer!16 commit fecf1d86308e9b9b1fdac2a6073ff6f5521c97cf Author: Anuj gupta <anujgupta@in.ibm.com> Date: Mon Aug 17 15:58:13 2020 +0530 Merged with Opengroup and changed ibm pom to point to core-lib 0.3.6-snapshot commit b15cb4e217f4f30c54175da9b175574f1856a569 Merge: 808e410 beaa372 Author: Anuj gupta <anujgupta@in.ibm.com> Date: Mon Aug 17 14:57:09 2020 +0530 Merge remote-tracking branch 'og/master' into develop commit 808e4107ff41c2fcd13b55378b1e350788d8ce3f Merge: 7569d4a de9ab6d Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jul 24 12:34:59 2020 +0000 Merge branch 'api-key-testcases' into 'develop' Api key testcases See merge request osdu/core/os-indexer!15 commit de9ab6de34a37a6125582d7033e8d243442658a9 Author: Gokul Nagare <gonagar1@in.ibm.com> Date: Fri Jul 24 12:34:59 2020 +0000 Api key testcases commit 7569d4a6765b35696b3db79a4bb5cf7d5e7553a5 Merge: c57747c 7129382 Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jul 17 11:41:49 2020 +0000 Merge branch 'api_key' into 'develop' merge Api_key branch into develop See merge request osdu/core/os-indexer!14 commit 71293821972269d23471b546755973cc71910277 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Jul 17 08:29:16 2020 -0300 change var name and handle missing header commit c57747cbb515aea5583a8ecae6b6dd0a39ea5564 Merge: 072a12f c588eba Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jul 17 10:24:04 2020 +0000 Merge branch 'requeue_logic' into 'develop' failed record sending back to record queue See merge request osdu/core/os-indexer!9 commit a996097600b1de5010b70cb5a8ca87fe33623235 Author: gonagar1 <gonagar1@in.ibm.com> Date: Fri Jul 10 15:12:31 2020 +0530 api_key in header from indexer-queue validation logic added commit c588eba95e111b0c8c4db1c6486149a9e5db7300 Merge: 50c8734 76ad065 Author: Anuj Gupta <anujgupta@in.ibm.com> Date: Wed Jul 8 08:59:20 2020 +0000 Merge branch 'requeue-logic-merged' into 'requeue_logic' Requeue logic merged See merge request osdu/core/os-indexer!13 commit 76ad0655c85af2dc09dbb5f37de53508be030e4e Merge: 50c8734 072a12f Author: gonagar1 <gonagar1@in.ibm.com> Date: Wed Jul 8 12:35:01 2020 +0530 Merge branch 'develop' into HEAD develop branch is merged into requeue_logic,version conflicts of os-core-lib-ibm resolved in pom commit 072a12f195beb4db337d54b7147f8852e00419a6 Merge: cd34864 f48cc7a Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jul 3 14:09:17 2020 +0000 Merge branch 'synch-master' into 'develop' Synch master See merge request osdu/core/os-indexer!11 commit f48cc7abe38959e211422e29768f390ade5c9651 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Jul 3 10:59:35 2020 -0300 update core lib ibm version commit d30030f174cf085190eab0e10437c78ed56af243 Merge: 25f7026 e9d821a Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Jul 3 09:58:21 2020 -0300 Merge remote-tracking branch 'og/master' into synch-master commit cd348647efb6f65be0e9a71f6cba74809792e12d Merge: 7bbf911 22d6447 Author: Anuj Gupta <anujgupta@in.ibm.com> Date: Thu Jul 2 11:53:48 2020 +0000 Merge branch 'integration_test_new' into 'develop' Add Jenkinsfile See merge request osdu/core/os-indexer!10 commit 50c87347bc0509bdb740c5d6f4a610411c8a67d4 Author: BhushanRade <bhusrad1@in.ibm.com> Date: Thu Jul 2 14:32:28 2020 +0530 added exception details in failure record messages before sending to queue commit f94a5fad5ade56522486ad285b09d81d2103f1ac Author: BhushanRade <bhusrad1@in.ibm.com> Date: Thu Jul 2 14:25:44 2020 +0530 added GlobalExceptionMapper class commit 22d644747bc990d21c295b9a2a93a716bd34f849 Author: Kaliprasanna Basu <kalibas1@in.ibm.com> Date: Wed Jul 1 16:37:36 2020 +0000 Add Jenkinsfile commit 25f702625b5d48c84d0847699ba31e0b9bbd0d63 Merge: 7bbf911 a6fb779 Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Jun 30 14:05:22 2020 -0300 Merge remote-tracking branch 'og/master' into synch-master commit c38716fd1b5fd4739bb15ae51fc89f270910e8fa Author: BhushanRade <bhusrad1@in.ibm.com> Date: Tue Jun 30 11:51:44 2020 +0530 INDEXER_QUEUE_HOST & ibm.env.prefix properties added commit 868f6e5d07499e46d9c2b997e4a5e62d963df358 Author: BhushanRade <bhusrad1@in.ibm.com> Date: Fri Jun 26 15:56:48 2020 +0530 unnecessary sysout line comment out commit 2cfed4f93ac5c058b3f8d6eb18d3b5c5612a6b0f Author: BhushanRade <bhusrad1@in.ibm.com> Date: Fri Jun 26 14:49:14 2020 +0530 logger added in the Exception commit a7626b10162ac6014879a769897c01391fa8aed0 Author: BhushanRade <bhusrad1@in.ibm.com> Date: Fri Jun 26 14:48:25 2020 +0530 os-core-lib-ibm version upgraded to 16 commit d767aa60b307a5158562718c54a9792085a79bec Author: BhushanRade <bhusrad1@in.ibm.com> Date: Fri Jun 19 20:42:23 2020 +0530 failed record sending back to record queue commit 7bbf9115dc9a10c6e724dde13f0286dd6be90fae Merge: fc6186f cbf2076 Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jun 5 18:19:51 2020 +0000 Merge branch 'sync' into 'develop' Sync See merge request osdu/core/os-indexer!7 commit cbf2076124eea6ca7ab00d101aa1cabb09b45d46 Author: alanbraz <alanbraz@br.ibm.com> Date: Fri Jun 5 18:19:51 2020 +0000 Switching to the master version of the pipelines, but adding an override for aws-test We want this to run on the special runner, but don't want all services running there. Thus, not in the common files, only the service specific pipeline specification. commit fc6186f05704cd05288288e231d8e7d7a9b8719e Merge: 50750f6 869a23e Author: alanbraz <alanbraz@br.ibm.com> Date: Wed Jun 3 18:33:32 2020 +0000 Merge branch 'amq_change' into 'develop' Amq change See merge request osdu/core/os-indexer!6 commit 869a23e4d59674763b1bb2509154109de4478c36 Author: Anuj Gupta <anujgupta@in.ibm.com> Date: Wed Jun 3 18:33:32 2020 +0000 Amq change commit 50750f60627c81bf43929435a3e5b4f6510a3fb4 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu May 28 15:22:17 2020 -0300 update core lib version commit f92371ade5fe186cc332d69285f80ba2b8c43ec1 Merge: 24a25fa 447ef7d Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu May 28 13:41:30 2020 -0300 Merge remote-tracking branch 'og/trusted-ibm' into develop commit 447ef7dd3fb9d3a25db9f4189d6275e39b1b3d38 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu May 28 11:39:18 2020 -0400 Update .gitlab-ci.yml commit dd543f2a698a0e15e80b7ca4825d8dea92fc2d05 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed May 27 16:29:54 2020 -0300 ibm clean up commit ec52aefdfdbd967528922bf7f66d891d000774a6 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed May 27 15:15:14 2020 -0400 Update .gitlab-ci.yml commit c4e74176966b447a0f9ed2611e02332ac0a9556a Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue May 26 15:18:50 2020 -0300 remove env vars commit 24a25fae05368820cceddc7e764b67c0c2e891df Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri May 22 15:57:22 2020 -0300 update core lib ibm to 0.0.14 commit 2a4ebd2d48191094fb7e931d45f8ec6adea0b506 Merge: 2166e29 761b846 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri May 22 15:51:43 2020 -0300 Merge remote-tracking branch 'og/trusted-ibm' into develop commit 761b846d9391d8a194d69c4da4edd5cf9b4a84cc Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri May 22 07:46:13 2020 -0400 Update .gitlab-ci.yml commit 16f531ebc0d7bbc8b2d229039099e40db431ae13 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed May 20 21:17:44 2020 -0400 add ibm commit 8b4ada45e83b36aef1818d1028f50274fffa6b5e Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed May 20 21:16:15 2020 -0400 add ibm [skip ci] commit 2166e29801550401b8eb79ae641a047e5c5051ed Merge: a28bc90 688b4c9 Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue May 12 12:58:43 2020 -0300 Merge branch 'master' into develop commit 688b4c962974013fd7194e210a5c2e921973003c Merge: 5ae97d1 8587f80 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Apr 30 20:42:45 2020 -0300 Merge branch 'og-master' commit 5ae97d18cff7cb0d2ecab9168c9efa3daee92998 Merge: 5e72f9c d00830b Author: Walter Dsouza <walterdsouza@in.ibm.com> Date: Wed Apr 29 13:04:59 2020 +0000 Merge branch 'revertprofilingfrommaster' into 'master' Revert profiling changes See merge request osdu/core/os-indexer!3 commit d00830b2b055704df8b3a637a97f1423d74f0a74 Author: 01137A744 <01137A744@9.85.202.13> Date: Wed Apr 29 18:30:42 2020 +0530 Revert profiling changes commit a28bc90e2d51b87c6e64ec7bba7874b22b9d3260 Merge: 98f84f4 b106412 Author: Walter Dsouza <walterdsouza@in.ibm.com> Date: Wed Apr 29 11:03:44 2020 +0000 Merge branch 'env-profile-changes' into 'develop' Environment profiling changes See merge request osdu/core/os-indexer!2 commit b1064129bc8e418d0eff00616e705c611f0824cd Author: 01137A744 <01137A744@9.85.202.13> Date: Wed Apr 29 16:30:37 2020 +0530 Environment profiling changes commit 5e72f9c13ec5afb643c59b2145a5f1b0de6fa5dd Merge: 98f84f4 030f305 Author: Walter Dsouza <walterdsouza@in.ibm.com> Date: Wed Apr 29 10:31:45 2020 +0000 Merge branch 'profile-changes' into 'master' Profile changes See merge request osdu/core/os-indexer!1 commit 030f30583f76964ba3f25b91efe0ed37c6fd997e Author: 01137A744 <01137A744@9.85.202.13> Date: Wed Apr 29 15:55:56 2020 +0530 Changes for local profiling commit 1745f8e8d424041db7518d33d7c71db2ffedca7b Author: 01137A744 <01137A744@9.85.202.13> Date: Wed Apr 29 15:43:04 2020 +0530 Added properties file for local commit 98f84f4667b43f11a7a1f2c1ebfc33e71214b7ed Merge: 622cf94 642e81c Author: Alan Braz <alanbraz@br.ibm.com> Date: Sat Apr 18 12:49:45 2020 +0000 Merged PR 1261: IBM implementation Related work items: #1644 commit 622cf942f8f2ff5a6fec723fbf47a795eba2ab63 Merge: 80150b7 2275803 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Fri Apr 17 13:37:06 2020 +0000 Merged PR 1254: Update AWS Configurations Related work items: #319 commit 642e81c137c29fed1cc4b71b692c14f0ca69552d Merge: 3f4f862 80150b7 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Apr 17 10:19:17 2020 -0300 Merge branch 'master' into ibm commit 3f4f86207a216b467ca75abee68b7ae3814287f7 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Apr 17 10:18:52 2020 -0300 remove creds commit 227580347051ce17e191f1fe1d9abd2402f41de2 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Apr 16 12:58:27 2020 -0500 update aws core lib version number commit 23e38fe761830dc6555c009fbb3e51fb46a783b4 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Apr 16 07:18:40 2020 -0300 removed temp Class to skip elastic SSL commit dac945fb09f3da0aabf43e513a93709a4e47b330 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Apr 16 00:14:58 2020 -0300 migration from Cloudant to CouchDB commit 76992f2e7e470d63a95285a80f3c874988deffb3 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Apr 15 21:42:45 2020 -0500 AWS configuration updates and remove the signing interceptor commit 63df3c290da49b385613fe9a3e9aede4fe1432ad Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Apr 15 21:13:32 2020 -0500 AWS configuration - updates remove signing interceptor. commit 15aa743d582aabc69f74eea99b0813af0e7e3efa Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Apr 15 19:11:08 2020 -0500 Update core-lib-aws to add openid and new name commit 227d665f3b54038a79e3a9e635ee641e966abd4d Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Apr 14 08:31:49 2020 -0300 add scope commit df6182d1de3f94c92e7a4a2d6ae18cdea3c5e3b0 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 8 14:41:33 2020 -0300 add keycloak client secret commit 968b57a1fc7fafee2454eb8d53a814cfcc534f10 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 8 14:41:20 2020 -0300 update core to 0.0.13 commit 80150b7206680e981edb95f4032572f1279f2597 Merge: 39a5df5 1149694 Author: Sviatoslav Nekhaienko <SNekhaienko@slb.com> Date: Tue Apr 7 02:47:21 2020 +0000 Merged PR 1119: GKE merge to master Related work items: #1586 commit 39a5df50cfec4e1a286d3a388800ba510ae10df5 Merge: 715cbc8 75c794d Author: Neelesh Thakur <NThakur4@slb.com> Date: Mon Apr 6 22:52:51 2020 +0000 Merged PR 1212: fetch nested shape using apache util fetch nested shape using apache util Related work items: #1610 commit 75c794d2d5d40d89a6fbf8bf3061c1fd33a0ef6b Author: Neelesh Thakur <NThakur4@slb.com> Date: Mon Apr 6 17:38:04 2020 -0500 fetch nested shape using apache util commit 715cbc88870e3e2c4c83e3f52e28b50d52fb8815 Merge: 8232f52 d1e3832 Author: Neelesh Thakur <NThakur4@slb.com> Date: Mon Apr 6 19:53:02 2020 +0000 Merged PR 1210: add support for geoshape indexing commit d1e38328faa68fbf3613485f6992fcfffacd6448 Author: Neelesh Thakur <NThakur4@slb.com> Date: Mon Apr 6 13:57:02 2020 -0500 refine error message and add more tests commit b8ed55759f4df584a85993f3ab43c951a01bcad1 Author: Neelesh Thakur <NThakur4@slb.com> Date: Mon Apr 6 12:16:23 2020 -0500 use elastic parser only for validations commit 8232f52782325f255d66fc5835a8baf7b3f2466d Merge: 176448b ee9abf4 Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Mon Apr 6 14:47:25 2020 +0000 Merged PR 1182: Adding local dev docs for Azure Adding local dev docs for Azure Related work items: #1470 commit 9839db05fadc350cfd77001260b190ccef4033bd Merge: a408d5d 176448b Author: Neelesh Thakur <NThakur4@slb.com> Date: Sun Apr 5 19:04:59 2020 -0500 Merge branch 'master' into geoparser commit a408d5da1751f77102b1ec970763f0eee41d53a2 Author: Neelesh Thakur <NThakur4@slb.com> Date: Sun Apr 5 15:51:48 2020 -0500 update integration test commit f54d88515326cfd090d8aabeed197c0325b12b1e Author: Neelesh Thakur <NThakur4@slb.com> Date: Fri Apr 3 16:57:55 2020 -0500 add tests commit d488c22f240c340e16490b538c962db0789d39a1 Author: Neelesh Thakur <NThakur4@slb.com> Date: Fri Apr 3 16:55:05 2020 -0500 add support for geojson shape indexing commit 5947fac2604b69987b5f13dbe5048b15c17f8b73 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Apr 3 17:14:04 2020 -0300 remove SSL skip commit 15a98fc040b1b69606eb9999f189da0ea74fdfaf Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Apr 3 16:56:12 2020 -0300 remove creds commit 176448bea08c7620aa34db59ef641106de7cf3d4 Merge: bf0643e 0624784 Author: erik.leckner <erik.leckner@wipro.com> Date: Fri Apr 3 18:44:53 2020 +0000 Merged PR 1198: Bug 1501: Dead Letter Queue count very high for azure en-queue function. This is Part 1 of Bug 1501: Dead Letter Queue count very high for azure en-queue function. os-indexer-azure is emitting a message that contains invalid JSON. The fix is to use `gson.toJson (recordChangedMessages)`. Related work items: #1591 commit ee9abf4eb5aac59139ea4fac6e6e830868758a6c Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Apr 3 17:38:46 2020 +0000 Updated README.md commit bf0643ecba42f3f3ae16b8ec6f4bf7635b9b0189 Merge: 3540652 5d6aa40 Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Thu Apr 2 19:05:04 2020 +0000 Merged PR 1178: use latest libs Related work items: #1578 commit 5d6aa403512f6aa68f8134bfe119b379b4e93731 Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Apr 1 17:18:35 2020 -0500 latest libs commit 06247843acae7492a91f5d5a5f70ab8a0e350d7e Author: Erik Leckner <erik.leckner@wipro.com> Date: Wed Apr 1 11:48:35 2020 -0700 Bug 1501: Dead Letter Queue count very high for azure en-queue function. os-indexer-azure is emitting a message that contains invalid JSON. The fix is to use `gson.toJson (recordChangedMessages)`. commit 91d880c88fafb43aa73119901d4d3e65192ea46f Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 1 15:15:45 2020 -0300 send message to indexer queue commit c8c03eda7e352a15f1b00552a3da77848663141f Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 1 08:09:59 2020 -0300 remove logs commit 2f7c99ae6a1931681097cf92b6c8810bf7deec24 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 1 07:47:34 2020 -0300 fix logs commit 296af4ef7e15deebd3555df239cfa3be7342708f Merge: 6a34bb5 042aec9 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 1 07:17:55 2020 -0300 Merge branch 'ibm' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer into ibm commit 6a34bb5c3502928dd7edac112d90ccb1bb2f666c Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Apr 1 07:15:58 2020 -0300 skip SSL temporarily to connect to ES commit 042aec97dd625226669fb94f1959f2553ee46e79 Author: RahulNakka <RahulNakka@9.163.31.139> Date: Tue Mar 31 22:40:51 2020 -0500 "Implemented the logger configuration to the Indexer-IBM" commit abaf954a9b239902ece53e80b62ec4bdb1c26093 Author: Nicholas Iodice <nmiodice@gmail.com> Date: Tue Mar 31 12:22:27 2020 -0500 adding .envrc.template commit f20c74ebc1688ed1c51d61d4381f0bb78b53fd70 Author: Nicholas Iodice <nmiodice@gmail.com> Date: Tue Mar 31 12:19:20 2020 -0500 adding env vars commit d2a9160d1e42dc06780bf1af4e430026631bf44f Author: Nicholas Iodice <nmiodice@gmail.com> Date: Tue Mar 31 11:21:14 2020 -0500 initial commit commit e23a707f55d4cca49197544ced3adc169343dc8f Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Mar 31 00:07:31 2020 -0300 adding missing dependency commit e8003c702ff4498f5f1233405afbe7cb00a2db1f Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Mar 30 15:47:03 2020 -0500 update other libs commit 52136f848b35534bdb15243f6bb2b3384e35b760 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Mar 30 11:44:38 2020 -0500 update poms commit 93b0544ce449a5a610c8debc9358d5e77c329611 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 17:00:11 2020 -0300 remove sysout commit 4c35815c0e25b060bfb7182ae50045d4a7080e27 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 16:55:19 2020 -0300 remove creds commit 62756fc9151a909cd59022c6291ecbfc162a91b0 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 16:55:07 2020 -0300 IBM Comments commit 2873fe7de4313e96b593cab63371d050574a4086 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 15:54:59 2020 -0300 move SSL skip to ibm folder commit 966bf7b7575951e3988934318edd9432d43509a2 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 15:47:00 2020 -0300 restore from master commit 5df780311ee1e6b7ca296fba7d5cb8bb06e8b042 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 26 14:40:57 2020 -0300 env var to make int test pass commit 663b3dbd690ee9485fb9137cbd92df03f3ee947e Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 17:58:57 2020 -0300 add test creds commit 67f97160cecee754fa71641a2954ab240ef061dc Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 16:42:30 2020 -0300 get custom elastic port from env commit 46e3da052b471ddc8d0085a71883d2f3c1e9dc6b Author: RahulNakka <RahulNakka@9.163.31.139> Date: Wed Mar 25 10:44:39 2020 -0500 committed latest changes commit b4f837d853018ce27ae7f7bb9e438afdfe277335 Merge: 25afa06 1126465 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Wed Mar 25 10:36:31 2020 -0500 Merge branch 'ibm' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into ibm commit 25afa0667d6fcfc2a549ba7b07b1e81fbbe5d3ad Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Wed Mar 25 10:33:14 2020 -0500 changes made to get the token commit 11264659bd5af8b9ad3c3e35031c65ba6007421b Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 12:26:43 2020 -0300 restore test-core from master commit 8a84a5a208be6b2b4e7f2a477572c1ad6a4a001d Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 12:21:32 2020 -0300 restore from master commit 114969432a0c99d5ac1207be36026ac222b78a89 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Wed Mar 25 16:50:58 2020 +0200 use openjdk:8-slim commit e3d36646deebaebb907cc281084cc40f7c6e5ac4 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 11:49:58 2020 -0300 restore from master commit 7563af41fed1c5a1decf292848e8bb7b3be006fc Merge: 235de42 3540652 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 11:46:17 2020 -0300 Merge branch 'master' into ibm commit 235de42a4777b52a1408f5739d47785d31e1e967 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 11:45:35 2020 -0300 get user from env var commit 79e2875723ecfc5be3197702942cfc3e03a4de12 Author: Alan Braz <alanbraz@br.ibm.com> Date: Wed Mar 25 11:44:25 2020 -0300 get user from env vars commit 4a4f1276da8170adc547fe3fcd2f42d41b023616 Author: Max de Bayser <mbayser@br.ibm.com> Date: Tue Mar 24 22:24:19 2020 -0300 Allow overriding the SSL hostname verification that the ElasticSearch client uses by default commit 9d0a6a4a97b5136c67bb6e4cae88da3921fd4039 Author: Max de Bayser <mbayser@br.ibm.com> Date: Tue Mar 24 22:23:03 2020 -0300 Revert "skip SSL on ES request at indexer-core, NEED TO REMOVE before merge to master" This reverts commit 5f7eacb900f9532965f853e95a14a2f99033539f. commit 3540652e7917ba1028011bf840797aede9321b7f Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Mon Mar 23 14:45:13 2020 +0000 Merged PR 1145: Adding missing licenses Adding missing licenses Related work items: #1457 commit d99370fdd44e88cca6a3db8d43597c286f4f67c9 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 23 11:16:10 2020 +0200 use configmap commit cf330aea29718139fa1c0dab65ce43594e9293a0 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 15:17:41 2020 -0300 gettting test user token from KeyCloak commit d991033aade57dfe8482cd3d7e99bca3ef231d05 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 15:16:35 2020 -0300 getting default ES creds from env commit 5f7eacb900f9532965f853e95a14a2f99033539f Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 15:15:34 2020 -0300 skip SSL on ES request at indexer-core, NEED TO REMOVE before merge to master commit 8a24f165f071e6c2cb97d2e32bc016ca64166ee0 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 11:54:48 2020 -0300 get ES from env commit cc7f1e616ffa2436b855583d9793c52b3c9f9fd6 Merge: 0b5a8b9 7840797 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 11:54:37 2020 -0300 Merge branch 'ibm' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer into ibm commit 0b5a8b965687a2e9c2b292c6915cc9d687d67a63 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 20 11:54:30 2020 -0300 getting ES default creds from env commit 7840797c1f7a0c747d2c96012a7e34402d694df8 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Thu Mar 19 17:30:56 2020 -0500 changed TenantInfoServiceTest.java class commit 789dfdabb655f5e4a46356e8ba38ac03c13e8517 Merge: 67dbaca 0cbc224 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Thu Mar 19 17:13:03 2020 -0500 latest changes commit 67dbaca0b8804ad7f469faef507f19ceb6bc6487 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Thu Mar 19 17:08:23 2020 -0500 latest changes commit 0cbc22433fea9841196d3a1ff9992ed998c50938 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 19 18:59:31 2020 -0300 implement missing beans commit f052e5e1e7afe0f59d15905e65d7eca086f980d3 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 19 18:23:40 2020 -0300 refactor ibm to match azure commit 1446a60739c029c6c07756e9e487bf6145603969 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 19 18:06:38 2020 -0300 restore azure and core from master commit 4d53a1947801e843292484f5425aa28720871ab2 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 19 16:29:28 2020 -0300 test classes commit b628a214e2ccc7d69e41037796348b04fc9b3f09 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 19 14:58:50 2020 -0300 moved queue listenet to indexer-queue commit e92a84075578cc2287773e4b666b0027e773ead2 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Thu Mar 19 12:00:04 2020 -0500 changes implemented commit ec48d935323a26e636e01464774d3f02f80e0c95 Merge: bf1ff6b e7ef62b Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Mar 17 23:01:39 2020 -0300 Merge branch 'ibm' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer into ibm commit bf1ff6bb49351e47d5235f881dd4f5e47d25ac98 Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Mar 17 22:54:02 2020 -0300 listening to rabbitmq queue and printing the message commit e7ef62b4d60c0b73f9ecc43055dc8a353cc0d593 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Tue Mar 17 13:47:28 2020 -0500 commentted the test cases commit caec712e988d7830d0940825f017b2ed3cc2381f Merge: 56d588b 9b86645 Author: Rahul Nakka <rahul.nakka@ibm.com> Date: Tue Mar 17 11:20:23 2020 -0500 committed latest changes commit 56d588b48dee42b7cbfc0b325021df10e0d80c24 Author: RahulNakka <RahulNakka@9.211.92.200> Date: Tue Mar 17 11:04:39 2020 -0500 committed latest changes commit 9b8664592ada623d84b6929df10b9084fe896d7b Author: Alan Braz <alanbraz@br.ibm.com> Date: Mon Mar 16 18:15:36 2020 -0300 update configs commit e55f3c34c67f71cecf65660a6a1655e562062225 Author: Alan Braz <alanbraz@br.ibm.com> Date: Mon Mar 16 17:34:25 2020 -0300 remove inject and connect to Cloudant commit a8d3eb98fc4cdab8378ce0012e50696e1d71bf65 Author: Alan Braz <alanbraz@br.ibm.com> Date: Mon Mar 16 16:26:42 2020 -0300 clean up for ibm implementation commit 2931aa1794e4e18ea0218fbaa3ee8d41646f3011 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 16 15:29:05 2020 +0200 cleanup commit 59ec70de12e266c809132bdd63a5753596b10f45 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 16 15:27:24 2020 +0200 move to devops commit 4b332db15c965bc0580e00e2ad808f71b7545afe Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 16 14:56:23 2020 +0200 disable appengine logging commit 0232817d970a25fb24bcc2ff49c20d2bfad4ff90 Merge: f02f857 cb74327 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 16 14:12:05 2020 +0200 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into kuber-migration commit c6fea37b9a8ddfbd948b9d2adec08c4288b315f2 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 13 15:00:49 2020 -0300 fix imports commit 4e469700cb91c0d169ae458d5b4f024d68cc411c Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 13 14:58:34 2020 -0300 update parent versions commit 147cc164deeac685d3d91d8e78a50ea77e400a88 Merge: 9c9ee19 cb74327 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Mar 13 14:54:40 2020 -0300 Merge branch 'master' into ibm commit 9c9ee194079c9541968bd3c0017ddfa560c047f7 Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Mar 12 13:34:50 2020 -0300 updates to ibm lib 0.0.11-SNAPSHOT commit ae33b4836b8dac1ac1e2b3370fa731fb00505266 Author: RahulNakka <RahulNakka@9.163.63.246> Date: Wed Mar 11 12:47:02 2020 -0500 updated authentication to the existing Indexer-IBM.. commit cb7432718f8342e9f1a9a0e6d201cea76686e452 Merge: 67c5361 bd163cf Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Tue Mar 10 16:22:38 2020 +0000 Merged PR 1095: Add appengine logging, testing environment config Related work items: #1398, #1399 commit bd163cfe6ba86c167a5e2f155e8e3b0ee4eb5cdd Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Mar 9 17:47:02 2020 -0500 add spring profiles active commit 2129343ff01e728d8922a01525426cb4eb090df0 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Mar 9 17:31:34 2020 -0500 add testing env config commit c4cf44ef99e72a07f4bdc5f1e819f6d06c2d6fff Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Mar 9 16:38:41 2020 -0500 update all poms commit 67c53617c42e3d0c305421434bbeb300eca6c7af Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Mar 6 14:21:42 2020 +0000 Merged PR 1082: Add reference to Azure deployment docs This change adds a reference to the documentation that describes how to deploy the service into Azure. Note: The documentation referenced is included in !1078 Related work items: #1159 commit f02f857ea38f207e3e2c24f1b84a1b1897f4ac8a Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Fri Mar 6 15:14:50 2020 +0200 fix https in properties commit 4ca1fac5ceacc3fe23f577ce818e47443f1982ea Merge: 6a4debe e2043ad Author: Ethiraj Krishnamanaidu <EKrishnamanaidu@slb.com> Date: Thu Mar 5 16:51:59 2020 +0000 Merged PR 1069: dependency version update(removed snapshot) dependency version update(removed snapshot) Related work items: #1315 commit e2043ad75999c4bce3bb8de4bf6a8231f43d6363 Author: Ethiraj Krishnamanaidu <EKrishnamanaidu@slb.com> Date: Tue Mar 3 15:13:04 2020 -0600 removed snapshot from testing commit 3b2e9e13079d694480a522a78aaaf232b4dd89f2 Author: Ethiraj Krishnamanaidu <EKrishnamanaidu@slb.com> Date: Tue Mar 3 13:28:19 2020 -0600 Removed snapshot commit 6a4debee3cabb2d498a2d6b30053b16f9a2280da Merge: 5d29979 6ec0d14 Author: Dexter.Williams <Dexter.Williams@microsoft.com> Date: Tue Mar 3 18:18:20 2020 +0000 Merged PR 1057: Indexer Service Unified Pipeline * [YES] Have you followed our code review [guidelines](https://github.com/microsoft/code-with-engineering-playbook/blob/master/pull-requests/code-reviews/readme.md)? * [YES] Have you added an explanation of what your changes do and why you'd like us to include them? * [NO] I have updated the documentation accordingly. * [N/A] I have added tests to cover my changes. * [YES] All new and existing tests passed. * [YES] My code follows the code style of this project. * [YES] I ran lint checks locally prior to submission. ## What is the current behavior? ------------------------------------- 1.) Currently, Azure has one build pipeline that generates the SNAPSHOT jar file for the indexer service, runs the unit tests and publishes the artifact to TFS. There's another release pipeline that was manually created in ADO that's responsible for deploying the snapshot jar to the indexer app service, generating the test core and azure indexer provider libraries and running the integration tests. If the snapshot version were to change, the deployment operator will have to manually go into the azure portal and update the startup command for the indexer service and point the service to the new jar location. The current pipeline is error prone as it relies on the manual update in the azure portal. The other challenge is that the current release pipeline cannot be constructed through code and/or in a repeatable fashion. 2.) Previous releases depended on cached core dependencies within the dps build agent pool. Issue: #1291 ## What is the new behavior? Why? ------------------------------------- 1.) We've merged the build and release stages into a single pipeline by leveraging the service ADO pipeline templates within the infrastructure-templates repo. There will be only 1 azure pipeline that is pushed through release environments based on whether a feature-branch/PR (devint) or master (devint, qa, prod) triggered the pipeline. `Opendes/os-indexer-azure` will be renamed as `Opendes/os-indexer-azure-release`. 2.) Releases no longer depend on cached dependencies as the pom.xml files now have the proper xml tags to pull down core dependencies within a non-custom microsoft hosted build agent pool. ## NEXT STEPS ------------------------------------- Cleanup old pipelines in task #1336. See this task for clean-up strategy ## Does this introduce a breaking change? ------------------------------------- - [NO] ## Pipeline Run Status for `os-indexer-azure-unified-dexterw` (feature branch using current shared pipeline) ------------------------------------- .png) Related work items: #1291 commit 4cee63218d67967f2169bcd33020829c6f6bc7e9 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 2 14:26:23 2020 +0200 fix docker build commit beeeb9e91942301d7862bc65ca8c15ab3accf81a Merge: 61f238f 8859c38 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 2 14:04:29 2020 +0200 Merge branch 'kuber-migration' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into kuber-migration commit 61f238face0b2a01ec8b93813c9c05320f95d148 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 2 14:03:16 2020 +0200 use internal service names commit ff25bb8f7608d6d2ccba66d2569eb488aa60137c Merge: b09f8e8 5d29979 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon Mar 2 11:13:58 2020 +0200 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into kuber-migration commit 6ec0d1485d16d1dee15f769a592d2bd96bee1e6f Author: Dexter Williams <Dexterw@microsoft.com> Date: Fri Feb 28 17:00:24 2020 -0600 removing feature branch refrence commit 1c9c84fc4b97daf9e93e424245d733472cff1230 Author: Dexter Williams <Dexterw@microsoft.com> Date: Fri Feb 28 15:07:04 2020 -0600 deleting commentary commit 2de2d345cc068de0bd6eb50359a2c5634bae3bb9 Author: Dexter Williams <Dexterw@microsoft.com> Date: Thu Feb 27 18:52:48 2020 -0600 syncing with shared pipeline commit 35289e48d2fd272572755d50092b06c6065e06d4 Author: Dexter Williams <Dexterw@microsoft.com> Date: Thu Feb 27 13:57:48 2020 -0600 updating shared pipeline reference away from master commit ae7c36e9c5fe07ca523a320d622c881d1ed25031 Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 18:27:08 2020 -0600 Add missing OSDU mvn repo commit 4eecedf0367f0941d5095b9a47a672a7bf2d677e Author: Nicholas Iodice <nmiodice@gmail.com> Date: Wed Feb 26 18:12:24 2020 -0600 Add missing OSDU mvn repo commit bce06616ec37cc337d4476938282e0566d0f1d50 Author: Nicholas Iodice <nmiodice@gmail.com> Date: Wed Feb 26 17:33:41 2020 -0600 Adding feed token commit 49a80ce0f8ca6b3c8a62e8df7007b955b45762a3 Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 15:38:11 2020 -0600 restoring os-core version references and agent pool reference commit b56a7606fedd9a2be71a807b14836bf88afa0db1 Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 15:22:19 2020 -0600 bumping os-core-common version reference commit 93e8d9befe1210525919e8be483a2052526af417 Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 14:41:35 2020 -0600 removing reference to custom dps-build agent pool, it may not have latest azure cli commit c881c57641657ae30b99bdfdb096d285cafc197b Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 12:37:24 2020 -0600 remove unnecessary sub-path from testcoremavenoptions commit edb44391a3617211a9a1669009fe946b75325d2e Author: Dexter Williams <Dexterw@microsoft.com> Date: Wed Feb 26 12:31:11 2020 -0600 add maven paths for core interation tests commit 8859c38ee9e98a5999fff0d70162f528e1597956 Author: Sviatoslav Nekhaienko <SNekhaienko@slb.com> Date: Wed Feb 26 13:00:35 2020 +0000 Update gke-indexer-cicd.yml for Azure Pipelines commit 637a4106c9d799af76ac654c1ec825399ca51521 Author: Dexter Williams <Dexterw@microsoft.com> Date: Tue Feb 25 14:44:00 2020 -0600 reformatting commit 96719ab0fc8b55d14da0fa0532f85ef923274369 Author: Dexter Williams <Dexterw@microsoft.com> Date: Tue Feb 25 14:41:44 2020 -0600 renaming yaml file to match master for testing commit 20b1bfb2bcc7ac849ed540cef3171006cb64d43e Author: Dexter Williams <Dexterw@microsoft.com> Date: Tue Feb 25 14:20:08 2020 -0600 splitting yaml into pr pipeline and release pipeline commit b09f8e8ef436f625c4e758707ef7466e0598cf26 Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Tue Feb 18 16:23:50 2020 +0200 update deployment commit 17971ddbb7b1b6210539b724ba440d57afcfc3ff Author: Sviatoslav Nekhaienko <SNekhaienko@slb.com> Date: Tue Feb 25 12:59:21 2020 +0000 Update gke-indexer-cicd.yml for Azure Pipelines commit 5d29979ebc74bc757c7b8910a830845d665dc5ec Merge: 9c7ba27 fd79f50 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Fri Feb 21 16:19:13 2020 +0000 Merged PR 903: Remaining core refactor changes Related work items: #879 commit fd79f50f4e115523c1976f4f9dd33ed555d34922 Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Feb 21 15:41:38 2020 +0000 Merged PR 1003: auth fixes auth fixes commit d33c20f5ecb173446a0af906aed3a0a4768efa50 Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Feb 21 07:00:14 2020 +0000 Merged PR 1001: adding back missing property adding back missing property commit ebda8fd64cafa37dd22ffcadf3a2eb8eee678974 Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Feb 21 04:57:18 2020 +0000 Merged PR 999: one more fix commit e914de37be11b5a26b71762870345a1189888384 Author: Nicholas.Iodice <Nicholas.Iodice@microsoft.com> Date: Fri Feb 21 04:40:02 2020 +0000 Merged PR 992: Updating from master; fixing any azure problems commit 4e0d8e978ddbc9b73a9be63c4b70845033fce093 Author: KrishnasagarVutukuru <KrishnasagarVutukuru@9.85.136.254> Date: Thu Feb 20 11:46:35 2020 -0600 Made changes using core-lib-ibm version- 0.0.9. commit dd13928301f0f1c2441c2b8eae43dec289f4c4de Merge: c6b63c6 23ca4d6 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Tue Feb 18 15:36:20 2020 +0000 Merged PR 962: Update common package structure Update common package structure Related work items: #879 commit 23ca4d67029cbab746cdefb001f8c5cecaeb1983 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Tue Feb 18 08:53:11 2020 -0600 Update common package structure commit 8b307fc5b800409392944409d2033a1a599c08bb Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Tue Feb 18 16:03:00 2020 +0200 update kubernetes properties commit 69093b5d5658fbd5d96388047f3690f11b31795a Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Tue Feb 18 15:58:22 2020 +0200 update kubernetes properties commit c6b63c6fe3eef0d688f93b6c2660c1bf06790b41 Merge: c608d7d 99a0c46 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Fri Feb 14 14:48:04 2020 +0000 Merged PR 942: Update version numbers on all repos Update version numbers on all repos Related work items: #879 commit 99a0c463a81948442c48c781d3ba3a871698148d Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Feb 13 16:39:25 2020 -0600 Update version numbers on all repos commit c608d7d578e4aa9398e2f4acc91a65c11b6ed677 Merge: f5eabe9 44b736d Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Thu Feb 13 17:43:32 2020 +0000 Merged PR 932: Fix duplicate AuthorizationService.java and missing entitlements bean from Fix duplicate AuthorizationService.java and missing entitlements bean from is-core Related work items: #879 commit 44b736d9c00eedcce35932fae1d2d48f69f08c3d Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Feb 13 11:03:38 2020 -0600 Fix duplicate AuthorizationService.java and missing entitlements bean from is-core commit 72d9453a43f1ca28b337eef582c65942d9b72523 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Feb 13 10:11:15 2020 -0600 Fix duplicate AuthorizationService.java and missing entitlements bean from is-core commit f5eabe93676df4b28a2550fbe0b26888ea23097e Merge: e1adda3 982d651 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Wed Feb 12 16:34:58 2020 +0000 Merged PR 885: Add remaining core refactor changes from the aws repos Add remaining core refactor changes from the aws repos Related work items: #879 commit aa84c7ddc6b4b15224c57f38f477989f61ae5012 Author: Sviatoslav Nekhaienko <SNekhaienko@slb.com> Date: Wed Feb 12 09:20:08 2020 +0000 Update gke-indexer-cicd.yml for Azure Pipelines commit 982d6512736698922a766ac6c1273ba0f457319c Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Tue Feb 11 10:46:58 2020 -0600 add missing entitlements bean commit fe2782474841b2beb73dce3656b27b4a35990211 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Tue Feb 11 02:51:19 2020 -0600 Add remaining core refactor changes from the aws repos commit 9c7ba277ec5157ac0a00e4247aa2bc2f67ce8b89 Merge: 26c3a53 87a02db Author: Keith.Rome <Keith.Rome@microsoft.com> Date: Thu Feb 6 16:35:04 2020 +0000 Merged PR 864: Resolve issues with CI builds Refactored pipeline to support multiple environments Related work items: #1078 commit cd4bc0e8529a567f1a94c29f31e95aa1e7d441d9 Merge: 9797b02 c4bb2fa Author: Renan Souza <rfsouza@br.ibm.com> Date: Thu Feb 6 13:04:32 2020 -0300 Merge branch 'ibm' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer into ibm commit 9797b02f7ca7e4deeba97033e08c6045b0ee7505 Author: Renan Souza <rfsouza@br.ibm.com> Date: Thu Feb 6 13:04:20 2020 -0300 application properties fix commit c4bb2fac1ebc2d3f3f1e7bf1d5e5699baa21e82e Author: Alan Braz <alanbraz@br.ibm.com> Date: Thu Feb 6 11:43:31 2020 -0300 fix indexer-service version according to master commit ec0188d0f9e9b0160f5610e0816bf1416ce86dce Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Feb 5 18:57:45 2020 -0300 removing unused file commit b6f87838fbe536069a531b38f31d38e37ab8b45e Merge: eae2a84 885227f Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Feb 5 18:56:34 2020 -0300 pom fixes commit eae2a84e5ec28e308b81da60ce08a9347474a848 Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Feb 5 18:51:24 2020 -0300 pom fixes commit 6f39a0744c4565f2fcfb2e7dc2379e9994f47b5a Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:49:56 2020 -0300 updare indexer-service version commit d3f90974b54c50962ec832ca28b0868c4c5e02c1 Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:39:16 2020 -0300 update os-core-lib-ibm version and refactor commit a206426a4d2dca40da10bcbaf1256d8c886d169d Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:38:39 2020 -0300 update indexer-core lib version commit f9d6c7446950689d0a716ac8137419467777b7d0 Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Jan 31 20:44:47 2020 +0000 Added settings.xml to make build work at OCP commit 80fa8888a07545cb4fe1c0aaddc9c6b0ae0d5e94 Author: Renan Souza <rfsouza@br.ibm.com> Date: Fri Jan 31 14:14:32 2020 -0300 indexer-ibm running commit 9528e5bb2e84b22bf82a125b22708cd619da35db Author: Renan Souza <rfsouza@br.ibm.com> Date: Fri Jan 24 11:27:40 2020 -0300 adding ibm's indexer commit 1a13a84676e714eaced6def052aedeafc895f99d Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Jan 22 14:46:57 2020 -0300 commit before merge with master commit f42d598bc07c167ab6e9e62a93c402968d94a59c Author: Renan Souza <rfsouza@br.ibm.com> Date: Thu Dec 12 16:41:02 2019 -0300 ES https certificate commit 87a02dbcb2a025a423594fcb59000cc5bfb3864f Author: Keith Rome <keith.rome@gmail.com> Date: Wed Feb 5 12:36:26 2020 -0600 Refactored pipeline to support multiple environments commit 46b66c0caee42c2aad9d3fc56fae6e38167213cb Author: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Wed Feb 5 18:21:41 2020 +0200 gke integration commit 885227f5274381105ba5aafd1e46016b9f2834bb Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:49:56 2020 -0300 updare indexer-service version commit 3d733dfd7adc42d75c765ddb446ce46342a1398a Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:39:16 2020 -0300 update os-core-lib-ibm version and refactor commit 92bd96e62e4da3e3c98f0af05a5377ab76570f71 Author: Alan Braz <alanbraz@br.ibm.com> Date: Tue Feb 4 11:38:39 2020 -0300 update indexer-core lib version commit 41b68540b913276437207b14174f972967fe972a Author: Alan Braz <alanbraz@br.ibm.com> Date: Fri Jan 31 20:44:47 2020 +0000 Added settings.xml to make build work at OCP commit 3c36411ab0a44e709229ce067c690dc3ba5e4d80 Author: Renan Souza <rfsouza@br.ibm.com> Date: Fri Jan 31 14:14:32 2020 -0300 indexer-ibm running commit 26c3a53146eacb4d6192f2561ea9c3a026fd2636 Author: Dan.Massey <danmass@microsoft.com> Date: Thu Jan 30 22:35:38 2020 +0000 Merged PR 824: Reuse AppDev CICD template from infrastructure-templates This is the basic build and test yaml pipeline template reuse that follows the first example in os-storage from #1054 Related work items: #1054, #1055 commit 58e97c02b2849b41e1623badebd3baf6b305e2ee Merge: a98671b e1adda3 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Thu Jan 30 12:35:39 2020 +0000 Merged PR 795: Core Refactor P3 Initial Merge Related work items: #1052, #894, #898, #899 commit e1adda353d1ed0608bcd2057a748d3d499579530 Merge: 21c6b0a 26cd641 Author: Stephen.Henderson <Stephen.Henderson@microsoft.com> Date: Tue Jan 28 21:59:29 2020 +0000 Merged PR 811: Provide correct LOG_PREFIX values for each service & provider Provide correct LOG_PREFIX values for each service & provider Related work items: #1052 commit 26cd641eadb58b3fb9aa668a0a6397eac2a29b2c Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Tue Jan 28 14:20:15 2020 -0600 Provide correct LOG_PREFIX values for each service & provider commit 21c6b0a02e24adf7a43c5ee17a0c218d4482bdea Merge: 869b2ee a3ad199 Author: Stephen.Henderson <Stephen.Henderson@microsoft.com> Date: Tue Jan 28 16:05:53 2020 +0000 Merged PR 807: Default Logging Refactor Work #1052 Default Logging Refactor Work #1052 Related work items: #1052 commit a3ad1997c9e08b5a00d5b6c1d217bbffecc76b4e Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Tue Jan 28 09:34:43 2020 -0600 Default logging is now `@Inject`-able commit db9a2c6c0e4ce61c54e282674e0347371f4bab4e Author: Renan Souza <rfsouza@br.ibm.com> Date: Fri Jan 24 11:27:40 2020 -0300 adding ibm's indexer commit 99633b919dbac0b369be3ff658e88f41e12a85e6 Merge: d9e7a76 f0c0bf0 Author: Renan Souza <rfsouza@br.ibm.com> Date: Fri Jan 24 10:13:52 2020 -0300 partial commit for merge with master commit 869b2ee89581611219182f35bdd4b34a30a37113 Merge: 9f2754b 83de874 Author: Stephen.Henderson <Stephen.Henderson@microsoft.com> Date: Thu Jan 23 16:18:40 2020 +0000 Merged PR 773: Logging Refactor Closes #1052 Logging Refactor Closes #1052 Related work items: #1052 commit 83de874d581262ed12f151c02cf84fe651be862a Merge: c87c5a0 9f2754b Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 16:03:22 2020 -0600 Merge in other's updates from core-refactor-p3. commit c87c5a096920abd37b12f36f967a1524802bc395 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 15:32:04 2020 -0600 cont'd moving Audit* to final locations commit 963565f0e29538451f17b0edf864b6586c53ca4f Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 15:05:01 2020 -0600 cont'd moving Audit* to final locations commit 9f2754b485267732e75e74d9aa3133e88913a5c8 Merge: dffd52b 86b36a1 Author: Danielle Jackson <danielle.jackson@wipro.com> Date: Wed Jan 22 21:03:22 2020 +0000 Merged PR 762: #898-indexer moved indexer spi's back to indexer-core Related work items: #898 commit 6534bb3d668d18c604585d8fb63757d6e0a4f53d Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 14:53:00 2020 -0600 cont'd moving Audit* to final locations commit 86b36a17d2f40d2a0d4b2698924308a0f7900f23 Author: Danielle <danielle.jackson@wipro.com> Date: Wed Jan 22 14:30:40 2020 -0600 - commit 636e16664b164a8ec3017f9039ecee0c6ac6f6da Author: Danielle <danielle.jackson@wipro.com> Date: Wed Jan 22 14:27:07 2020 -0600 - commit 61ba8c8c4ec73acd63a815b4bfb9c498532ac8c2 Author: Danielle <danielle.jackson@wipro.com> Date: Wed Jan 22 14:23:59 2020 -0600 - commit 113ae3a026b42a074c1708c6b24e22a139564a87 Author: Danielle <danielle.jackson@wipro.com> Date: Wed Jan 22 14:19:37 2020 -0600 - commit d2663dacba5480c2fa7e79c82dae04db011c1bd9 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 13:28:11 2020 -0600 remove LogId usage/needs everywhere commit da294947b2c47a2ac23c4cd87120724145753da9 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 13:20:12 2020 -0600 move logging pkgs commit f0c0bf02829f07a7d4f57e4cad50d2963d99c4eb Merge: 14b1e7a a98671b Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Jan 22 14:47:13 2020 -0300 Merge branch 'master' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer commit d9e7a76cd499249b32651cd00ff1a05cd126c09f Author: Renan Souza <rfsouza@br.ibm.com> Date: Wed Jan 22 14:46:57 2020 -0300 commit before merge with master commit 30881fb5cd799adb50399349ed5a77b86574138e Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 22 02:41:24 2020 -0600 Fix renamed imports/classes commit 9f521d6a3d577e10e5f7596faba3f260c3f26b30 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Tue Jan 21 17:26:53 2020 -0600 Begin moving logging classes into a dedicated package commit 75d89dc087f690f71ddcddf7cb9532e05c18cda4 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Tue Jan 21 15:37:17 2020 -0600 Rename Log to DefaultLogger. commit 52789bc7cb86bfde317c5d4773d784b0daf44abb Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Tue Jan 21 14:58:20 2020 -0600 Rename IDpsLog to ILogger. Added ENV-based log prefixing for one Logger (testing). commit a268df3a352eed5746312daacbea8126b652fcee Author: Danielle <danielle.jackson@wipro.com> Date: Tue Jan 21 14:51:57 2020 -0600 updated references to coreis spi commit 65b9e5dcac908237b906f59f5e789f0582f3a171 Author: Danielle <danielle.jackson@wipro.com> Date: Tue Jan 21 14:23:53 2020 -0600 moved indexer spi's back to indexer-core commit dffd52bd4106cb13f98196ed759add80f4649b2c Merge: 40cd33f 8a7567b Author: Danielle Jackson <danielle.jackson@wipro.com> Date: Fri Jan 17 19:59:15 2020 +0000 Merged PR 743: Story 893/894 Related work items: #894 commit 8a7567b7c4d003d1c2708d73ca1b1e1474707786 Author: Danielle <danielle.jackson@wipro.com> Date: Fri Jan 17 13:25:18 2020 -0600 fixed errors in indexer-azure commit d2918a0127caa24bdc8c203e16a411ea951d8f37 Author: Danielle <danielle.jackson@wipro.com> Date: Fri Jan 17 11:33:07 2020 -0600 resolved aws pom commit 4a7710d62e9e8732a2083b075460ef1dcf9c5efd Author: Danielle <danielle.jackson@wipro.com> Date: Thu Jan 16 14:49:30 2020 -0600 fixed errors commit f635090e79d89cba1823a3bea87a0bf7244860b8 Author: Danielle <danielle.jackson@wipro.com> Date: Thu Jan 16 14:35:40 2020 -0600 updated imports commit f61972d4a6dcb6a0a4db6ddcbc456175587b95be Author: Danielle <danielle.jackson@wipro.com> Date: Thu Jan 16 09:25:49 2020 -0600 updated references to AppException class commit 40cd33f7109472779d7608e67bc2a45d7d345961 Merge: e6d4d57 31cdce4 Author: Danielle Jackson <danielle.jackson@wipro.com> Date: Tue Jan 14 17:10:11 2020 +0000 Merged PR 719: Story 899 - Combine ConversionStatus classes Updated references to ConversionStatus class Related work items: #899 commit e6d4d57f080f2c29927d4de37b27db84f4bf9682 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Tue Jan 14 10:25:17 2020 -0600 Update version numbers to Snapshot commit 31cdce42dffcec685ba475219ff8439493df5aa7 Author: Danielle <danielle.jackson@wipro.com> Date: Mon Jan 13 16:54:46 2020 -0600 Updated references to ConversionStatus class commit a98671b74e4b083b9a257e38054c95f32e36ca4b Merge: b48dd42 25eee1d Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Sat Jan 11 02:11:10 2020 +0000 Merged PR 711: Refactor p2 Related work items: #272 commit 25eee1dc2803ae9c1270629f0ba70fe67bce802f Author: Alok Joshi <AJoshi19@slb.com> Date: Fri Jan 10 11:03:53 2020 -0600 remove SNAPSHOT commit 19c09974c7162cb59b76ba2199c6cfaea41b87b1 Author: Sherman Yang <SYang@slb.com> Date: Fri Jan 10 09:51:43 2020 -0600 add bean binding qualifier TenantInfoFactorySearch to TenantInfo class commit b55f31cf4771cff1b2165b39328d0a8a91d42f32 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Jan 9 14:10:42 2020 -0600 update indexer to use SNAPSHOT commit f9627a597f95889ba0af7260c0aa38180d50b593 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Jan 8 14:23:19 2020 -0600 update core lib version commit 7369239384e19c6d48539d06ceaeb74bd605981f Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Jan 8 14:07:52 2020 -0600 update to latest common lib commit 7c14044a5dffc3e3fcdc6db045c0a3da54ab64c8 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Jan 8 13:54:57 2020 -0600 Update qualifier to use search DpsHeaders commit 26fbf126d6da0981445fc832bf18d6655e2d552a Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Jan 8 11:52:54 2020 -0600 replace dpsHeaderFactorySearch commit 6d27b60be745bd5a66218056c2931b7ed6277c17 Author: Stephen Henderson <stephen.henderson@microsoft.com> Date: Wed Jan 8 10:40:07 2020 -0600 update pom dep versions commit 8d2a888cdfebdbc3b8286e88b683645f61e7d45f Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Jan 6 19:18:04 2020 -0600 refactor p2 changes commit 58891b92836024ad7a4069488f54d0695c181da5 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Jan 6 18:00:34 2020 -0600 refactor p2 changes commit b48dd42c413a57d662f614c662acd05597a81dc9 Merge: 3ded507 904805a Author: spencer.sutton <spencer.sutton@parivedasolutions.com> Date: Fri Jan 3 22:29:56 2020 +0000 Merged PR 633: Refactor v1 Related work items: #272 commit 904805a00dce0730311457d4a8bbfe4dbf8a3b2a Author: Alok Joshi <AJoshi19@slb.com> Date: Fri Jan 3 13:41:57 2020 -0600 use latest core-common-model commit 2cd26b2f1005449ad36a5906c21572bb4e23bcf3 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Jan 2 22:25:45 2020 -0600 add other env variables commit f732eb247f92853347d96637bc69d539cf73211b Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Jan 2 15:19:46 2020 -0600 revert back lazy commit a6639155670ab9118b0cb6d5ad8be0d4a9c38ae0 Author: Sherman Yang <SYang@slb.com> Date: Thu Jan 2 13:47:48 2020 -0600 remove DeleteSchema and GetSchema integration tests and update maven settings commit 380efa3eba7ae8c7f6d853fa68a0a1980596c1c7 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 23:33:38 2019 -0600 add lazy commit 56b6b473f2ef7f06c393b728ac76576b083caa93 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 21:54:24 2019 -0600 add Lazy on logger commit 8347d129bda28a0b8198a270b38475f2d86b10dc Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 20:42:34 2019 -0600 only take spring boot artifact commit 798f6780cca3aa8d295d2d5f4149cfd3c1899d9a Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 20:01:36 2019 -0600 change artifact commit f31b36ef045b4d2503515c25c544f38ada20d7ae Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 19:47:41 2019 -0600 repo change in pom commit 4c65850fb62eb6b4162ad5b36e3a54fb390f2b03 Merge: 14ccec4 d0ac901 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 19:44:28 2019 -0600 Merge branch 'ado-refactor' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into ado-refactor commit 14ccec41b23b39386bc2d77f0bf01f09f22589e3 Author: Alok Joshi <AJoshi19@slb.com> Date: Mon Dec 23 19:43:22 2019 -0600 repository change commit d0ac901865b8841c2778405ea959043c0ce3e173 Merge: 2101913 86bab91 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Fri Dec 20 16:27:49 2019 -0600 Merged refactor and master and ado commit 2101913285b97565785d6563a996cb89737444b9 Merge: e2ac14e 3ded507 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Fri Dec 20 16:10:15 2019 -0600 Merged from ado commit 3ded5079d73fd842da36eed1ef8dc766a9100292 Merge: 0c5b98b 5b0239c Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Fri Dec 20 19:38:55 2019 +0000 Merged PR 621: Remove tests that used an old search endpoint Related work items: #811 commit 5b0239ce5e5cbb72de9ce38c90c6b9c0c019a142 Merge: 0f499e5 0c5b98b Author: Alok Joshi <AJoshi19@slb.com> Date: Fri Dec 20 13:31:09 2019 -0600 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into aws-implementation commit 0f499e53ed32e68238585c802db767ba4d65850e Author: Alok Joshi <AJoshi19@slb.com> Date: Fri Dec 20 13:30:46 2019 -0600 remove unused api tests commit 0c5b98b99910e856fc00c4921ee80117e912d5c0 Merge: 13c951f 4fc5fd5 Author: Wyatt.Nielsen <Wyatt.Nielsen@parivedasolutions.com> Date: Fri Dec 20 16:47:58 2019 +0000 Merged PR 606: Adding aws implementation Adding aws implementation Related work items: #299 commit 4fc5fd5da705d0b655f4520852dda01ac6b20335 Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Thu Dec 19 22:33:05 2019 +0000 change gcp build agent to dps-build commit 023a70662491e09a659c3d23fad6acc27dd679ca Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Dec 19 16:09:14 2019 -0600 add IndexerAwsApplication commit cb6fcdb72cddf86b887af01bbef3445fec0460b2 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Dec 19 14:39:24 2019 -0600 force update commit cf523b8d2697e73c4bf3c07e82741a9dfe09e4c9 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Dec 19 14:35:51 2019 -0600 removing local repo for interceptor commit d6804235443f156bef889242294b3a30b55c0af0 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Dec 19 14:14:11 2019 -0600 change lib version commit fecf632ccadfd1eacc768a2754ae639f935d2b90 Merge: 69012f1 ca988e3 Author: Alok Joshi <AJoshi19@slb.com> Date: Thu Dec 19 09:08:44 2019 -0600 Merge branch 'aws-implementation' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into aws-implementation commit 69012f18189ac6d58b4e50cf1d61ec5ecba36f3e Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 16:59:24 2019 -0600 fix dependency issue commit ca988e3df5bb85fc5564729bb1f1808efb940990 Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Wed Dec 18 22:49:07 2019 +0000 Update azure-build.yml for Azure Pipelines commit fc4b6f54552c3eef4bb720c2d0092e64d6a4b0c7 Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Wed Dec 18 22:47:19 2019 +0000 Update azure-build.yml for Azure Pipelines commit adaac8f4d4f23f544d76642993bde0210798e732 Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 16:07:41 2019 -0600 change settings commit f04efd17a258b55c28d8c4cda002454d430d3e3b Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 15:36:17 2019 -0600 add interceptor dependency commit ee26c2b78d36ae795405531fef4da83b7929c05f Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 14:51:28 2019 -0600 change Mockito runner commit 8fd6103748579e01c2acb9a69755585ed58efc9a Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 14:49:47 2019 -0600 fix pom version for indexer code commit e2ac14e17688d7f16006e2a703811aa3390e595a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 14:43:59 2019 -0600 updating jar location. commit 37531615231aef68d65b0c663806790e4fdf180d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 14:02:11 2019 -0600 updating pom dependency. commit 4a037ca505c100cfd3db82e2859d499667de35f6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 12:38:47 2019 -0600 updating mvn commands. commit 9862fbf239042f1a54b298cce17f9f3d5512a3bc Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 12:34:11 2019 -0600 updating commit 88c243b6819649e7e6dc590669df008d2a3d5af3 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 12:23:07 2019 -0600 updating commit 1347b31bdb5072d517c164ae7d00d89c69858059 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 12:14:28 2019 -0600 updating commit ae7090b26045c7e69fd229a3d06e4b7911e4c307 Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 12:02:59 2019 -0600 correct parent pom version commit 28d1f10ca10fe22049034588e45b16fd0f7f481c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 11:58:48 2019 -0600 updating commit 58942517364054849f272c4fb3c4d5fb5f4618c5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 11:49:51 2019 -0600 updating commit e7549a86d00f070753f526525ad7d00f87cdbfb4 Author: Alok Joshi <AJoshi19@slb.com> Date: Wed Dec 18 11:47:20 2019 -0600 added azure-build for aws commit e82f15596af5cf03e6c394808f4335d954720f6a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 11:43:48 2019 -0600 updating commit fbdec1491a7afa394a0650e7e9afa1bb8215789a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 11:34:55 2019 -0600 updating commit 7412cddd8a41bfefc043c6ae0cf4c8d517e0ae91 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 11:25:10 2019 -0600 updating pom commit 4259ae43fc62054a3152e759c41be6c5ebe4e9ea Author: Alok Joshi <AJoshi19@slb001.onmicrosoft.com> Date: Wed Dec 18 17:07:32 2019 +0000 Modify pom with dependencies commit 1731fd8af239f8c091238b74136b38ce7fd8d3fc Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 10:53:05 2019 -0600 updating commit d672e609d2f73d933c3dcd9b9f93f7812f492e2e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 10:47:01 2019 -0600 updating commit 836cf7e68f09da9d64e0d274050f484b49465362 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 10:42:46 2019 -0600 updating commit 654b27df8653b6b6d9284012e58397a781376038 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 10:29:54 2019 -0600 updating indexer. commit 3d815d3035122eaed3aeca5192d4f732bee42cb5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 18 09:36:22 2019 -0600 updating to look at jar commit 86bab91c0a94de89e077e2f03115f287d32ca985 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 16 19:23:22 2019 -0600 Update to latest packages commit 6e9590ec4b00f797fe98c0c01b6bf24d78b4d0a2 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 16 19:16:02 2019 -0600 Update to latest packages commit ff6d136127bdd01b25aea1990ab8e66f18925b17 Merge: a86a534 550e4f3 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 16 12:30:40 2019 -0600 updating. commit 550e4f301461a29038a1d620e8982a9d18b9317c Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 16 11:21:32 2019 -0600 Add latest changes from ADO commit cc7ccd423c7bdea71a57d28acf5a364feb7db6e7 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 16 11:15:11 2019 -0600 Adding aws implementation commit a86a5344b80988e1a0393bafeafc959c20e9630a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 16 10:26:35 2019 -0600 updating imports. commit cbbbf5c100b73a681b3b4ef10b0f98c3a666e43e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Dec 13 16:37:08 2019 -0600 updating commit a6404f61f8f878314b30ed188fe9e8d5c06c425e Author: Renan Souza <rfsouza@br.ibm.com> Date: Thu Dec 12 16:41:02 2019 -0300 ES https certificate commit 542af9af84d21b110a628a99da75d506b9703786 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Thu Dec 12 07:53:02 2019 -0600 Updated AWS region environment variable name. commit 6f8c33af4a2dfca9b8d9ba381aae5479aec3916d Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 14:13:34 2019 -0600 Re-enabled stacks. commit 9f66f42369bf90b04f6d2dbdd357670d3af5287b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 13:32:35 2019 -0600 Re-enabled stacks. commit a539c2d2b25d3d6b007abce4723eac959122f26b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 13:11:34 2019 -0600 Removing stacks to change name. commit 81935f5af04a9a94d097ec04055a87c5a5b08d71 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 13:00:41 2019 -0600 Updated schema cache name. commit 763369c225071b7abf3ea121d3bff4859d6d9bf5 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 12:46:29 2019 -0600 Finished environmentalization of application.properties. commit 1d975aa8eacd8b1bcb23a1e7cc4a3e3914d05027 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 12:04:36 2019 -0600 Updated variable name. commit 8e01f436c9d541a1ab379f4a7af7778a382357f7 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 11:48:53 2019 -0600 Updated SNS topic name. commit de4c791651eac44f120331428f7bc1321909277b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 11:38:29 2019 -0600 Added environment to test command. commit 8bdf69d3154e66944748d81e8ef218e34858f016 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 11:28:31 2019 -0600 Updating to hopefully fix the ECR repo errors due to AWS Account ID. commit 0a0701937a5a7e3d2b5ab806b17faefa689fceeb Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 11:10:09 2019 -0600 Removed extra backtick. commit d6a65fd2e6e29b51bb326e1d1877017c280f0bd8 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 10:09:50 2019 -0600 Fixed import name. commit 88a1c4a5a1365b1c151bb19fcf76d1ba25374125 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 09:13:29 2019 -0600 Restored stacks. commit 83743b095f706ce64c63a538e6e9b932ae5f2b4b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 08:52:23 2019 -0600 Commented out. commit 08a1df19e3001d0be16f9ee20a5b551bbb0ab751 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 08:42:02 2019 -0600 Removed Access Policy section for now. commit a180d7fcbb02375763d3f98212b9a435635aaf53 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 08:35:03 2019 -0600 Commented out a problem policy creating 409 errors. commit 11bd54daf0f9ffa555bf5abe04079495dce2a031 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 08:27:29 2019 -0600 Fixed parameter name. commit 2490267e9158ae9b22fc0040dcf12f345f15fe3b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 08:20:26 2019 -0600 Updated DependsOn clause; began environmentalization of the application.properties file. commit 45840b2ec46b9f162074ef8229c4cf9aa41c429f Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Dec 11 07:58:20 2019 -0600 Updated to automate deployment of new ECR images, and to lay the groundwork to environmentalize `application.properties`. commit b53064cc9255b8969a6a687c424d182bb0ae1d30 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 14:35:53 2019 -0600 updating commit ce07f4a110d83ec0bd538e69b34156f1dcaec400 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 13:56:09 2019 -0600 working with cloud formation commit fc1c52c1e8e8b066301e99514683762f97c1dd26 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 13:49:38 2019 -0600 updating. commit a123a5e7abb3cfe0500c107321e6ce5425ab4311 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 13:47:40 2019 -0600 updating. commit 268eb9f0e234e3c40ee464d09c9d539c62a6c431 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 13:21:53 2019 -0600 updating cloud formation. commit 69693852da8cac15827786501aaeee70b970b4a8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 13:00:13 2019 -0600 updating cloudformation. commit f64208852e23ade41632d76a3821ac3e573c36b6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 10 10:40:19 2019 -0600 updating cloud formation. commit da95e8e8af164f65dbb7add20479f86c187c6da8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 9 13:37:28 2019 -0600 updating policy. commit 14b1e7aff5eeddc2d4772710b2da75129fea38f5 Merge: 9c8c561 13c951f Author: Renan Souza <rfsouza@br.ibm.com> Date: Mon Dec 9 14:40:41 2019 -0300 Merge branch 'master' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/os-indexer commit a3dd30bf46cedd546df609d2b070c7601b7c6e2c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 9 11:07:13 2019 -0600 updating indexer. commit 2788f74a6d5b7a1acfb8c28c01721e7f284d9667 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Dec 6 11:11:45 2019 -0600 updating commit 9dba138d5b13d785a7218793702df4cfa9ab2884 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Dec 5 16:19:35 2019 -0600 updating post deploy commit ef65b6b2f54aeb0510b82bd43cb3c795e98d6041 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Dec 5 15:53:21 2019 -0600 updating indexer post deploy. commit d8cc744f6a22eeea81c9608c81507058b28684ef Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Dec 5 15:10:15 2019 -0600 updating properties commit 59320d6b1aa11d7ea2222039f084ac53ad7c3f1c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Dec 5 14:57:22 2019 -0600 indexer bug fix. commit 13c951fa3b6160658ae5ff0a3b2913a8288f3638 Author: Heba <heelayot@microsoft.com> Date: Thu Dec 5 15:48:10 2019 +0000 Updated settings.xml to match the new setting.xml in the artifact commit 3f239cb9d1b0883bd14b57c874c695a0107966ab Author: Heba <heelayot@microsoft.com> Date: Thu Dec 5 15:28:34 2019 +0000 change the repository id to be os-core as per Alok request commit 2fbff1a8d7e30cd006054975f7a0312dca3fbe3d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 17:24:14 2019 -0600 updating commit e5fa10bcf67032c202b750a3569dceebd484e1cf Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 17:17:46 2019 -0600 updating yml commit 80290cac986170222e4092508976d49f2df20d06 Merge: 20df2b4 9a558a9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 17:05:22 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit 20df2b45ea1a9eb460104ab4d43a6e596674480a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 17:04:59 2019 -0600 updating deployment. commit 9a558a922198d68292942add4d7adce12349a460 Merge: b5d5c11 12b4b81 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Wed Dec 4 15:28:24 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit b5d5c1142e6196a2d18040a760ed061a446d97aa Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Wed Dec 4 15:28:01 2019 -0600 Remove queue commit 12b4b8178b1565c9b8e00d54c9e40ee7bc1d70e9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 14:59:07 2019 -0600 updating storage app name. commit 62457759096d7a157b8a92c75625ad341db083b2 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 14:43:45 2019 -0600 updating queue name in task definitions. commit cbb56b91e914f09c1cc31d23afa0c090ef0c8749 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 14:25:53 2019 -0600 updating endpoint. commit 9acc2a44f7d1619d386295a62fe523978dbc7e8a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 14:25:08 2019 -0600 updating master yml. commit adcf29efb219e5fc86f6e24668ccbab464b6656e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 14:19:15 2019 -0600 updating ecs correctly. commit 841a8e131192b8f59c2008fbdcb4d55c71d53246 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Dec 4 10:55:42 2019 -0600 updating deployment. commit 9c8c56115e9346500ba4b0866e90d568e91a46a8 Author: Heba <heelayot@microsoft.com> Date: Tue Dec 3 21:25:30 2019 +0000 Updated "PERSONAL_ACCESS_TOKEN" to "VSTS" settings.xml commit c418f8ad241738ad6007794a7a0c0a16c20b8f2e Author: Heba <heelayot@microsoft.com> Date: Tue Dec 3 21:13:42 2019 +0000 Updated settings.xml with the new artifact credentials commit 9225879b124bb80108edfa3b16371ded461c76f2 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 14:53:23 2019 -0600 updating commit 8c0a60f83dabf4c3fa54f0ab93ab5cb64d8cad68 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 14:47:49 2019 -0600 updating yml commit aa1153f9edcb8101301e1002db5e9cde15302310 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 14:30:20 2019 -0600 updating commit bb91f5e48caf9fb75a2903fe7bd4646cef7f56bc Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 14:04:17 2019 -0600 removed comments commit 799735498b86f9bc3556426df301a175c7770417 Merge: 73d7678 5083531 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 13:01:14 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit 73d7678f52f41fce3d92e17315aa43fd9066805a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 12:58:40 2019 -0600 updating indexer commit 5083531428c329644012b3048d3c4c1630f9a34b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Dec 3 12:16:38 2019 -0600 Fixed an accidental change. commit f1a3434ea5ad747b33b40a589aa4641d991618db Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Dec 3 12:06:01 2019 -0600 Updated to use t3.large rather than t3.micro to fix memory issues. commit 262a3956edddeeadaab9f69ffca5aab62b5bc7e8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 11:52:54 2019 -0600 updating commit 444a90afbe15181d5c362af7d4214870f88b4ee6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 11:00:06 2019 -0600 updating with logs. commit b27d2a78a2cf8b226b03a3302162c6c44e268236 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 10:45:35 2019 -0600 updating queue commit c0d7e6fd315c0d322956b94f41b482f0188700a9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 10:40:10 2019 -0600 updating credits commit e5251c5ff9ce358054f997798e37174599681c2b Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 10:33:59 2019 -0600 updating iam commit 73b958b66d4d9f0d74df2590500d8a4244e2a508 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 10:20:22 2019 -0600 updating commit af125124a488516fe894410411a58eae667ab6f9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 10:03:46 2019 -0600 updating ecs commit bf25814c0995013197bd29158a6e11ceefd5775a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:54:18 2019 -0600 updating pom commit d8ee8051cfbccfc1a70d78ab56e34e4cbdce691d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:43:04 2019 -0600 updating commit a814b6fa149e7e13093222c384c43043dd52f363 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:31:29 2019 -0600 updating ecs commit 20c805eee070914d912768ae18fdf714074a6289 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:22:53 2019 -0600 updating ecs commit 7725613249e264fffb46c834ff778823fb21af13 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:21:36 2019 -0600 updating indexer queue. commit 9628bf478ad85925668eaf298edf71380ecf2f27 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 09:12:24 2019 -0600 updating indexer queue. commit d8af842a9be6c9ceb4871e3a1897e3a1fe7361fd Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 08:57:46 2019 -0600 added logging commit 7167b21161b2f400f3d46faa6760303b98bf287b Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 08:32:23 2019 -0600 updating commit 34949b6c91f5cf105d438ecaad5af6deabd14fce Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 08:22:23 2019 -0600 updating env variables. commit bad135eef89788cfd8f985ab97e50caf5f6163c8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 08:19:25 2019 -0600 updating env variables. commit 8d2e64380204953492de8944298a71b872bf9af1 Merge: 7e31abb 2589f9c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 08:05:48 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit 7e31abbd348c33e39861caa281973f40c4f2631d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Dec 3 07:55:40 2019 -0600 updating pom. commit 2589f9c8963843e755ff3fa12cb94cb961b8c0f6 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 2 22:05:25 2019 -0600 packing pluign update commit 79eed12d865952a99fd35fb20138c8fcc9c5d0a3 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:53:02 2019 -0600 updating pom. commit c78889b295abd0d4eaf54c54cb5e3d9a23eb060e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:51:21 2019 -0600 updating pom. commit 6e9a663f6cec361c6cb42231da2eebfbb84a7bf5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:42:27 2019 -0600 updating commit 733ec7de555bd679d5bd9cdaffccc961ce4645ab Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:34:07 2019 -0600 update commit 81aacf2156aeb63b1cdb10b24e558acf0d970116 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:27:18 2019 -0600 yml commit a061018f4e7db1b75bf48a4f4f915e81b4fe798b Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:21:32 2019 -0600 UPDATING POM commit 1c936b467fc9e7db1eb25f5a2b64ecee8e31c97c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:19:17 2019 -0600 updating yml commit 458ad00da7b426fd2f8af8ecdd9d63343e39425a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:13:17 2019 -0600 fixing it hopefully commit ef507c3767d25748e1718dbfe1ae87c49dfdf0a2 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:08:02 2019 -0600 updating yml commit db5f6726fe43889674efc8112b2482842cff71d5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 21:00:55 2019 -0600 removing pl commit 4641933d415b194203f4e422c54a89e3424457db Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 20:52:23 2019 -0600 updating commands commit 765c2e8d109267749ffc8d06bc9cb9452faa734e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 20:42:42 2019 -0600 updating yml commit 923a5ba663002fb5f233272039d5d97d267ee6b9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 20:29:18 2019 -0600 updating variables commit 71df01c87363a617b3d7cfab06d398cc546fc241 Merge: 14f85aa b4c93a7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 20:02:41 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit 14f85aacd1c91872647ec6c7f2a2d9759d18a567 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 19:52:29 2019 -0600 added awslogs. commit b4c93a7fbc1296eb9cb4036a2b1482654924d93e Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 2 19:49:15 2019 -0600 Testing logging updates commit 9cb5d59e17ce378102109520e78c4662b0f48535 Merge: c91d24d 36d4e21 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 2 19:39:15 2019 -0600 Merge remote-tracking branch 'origin/dockerfile' into dockerfile commit c91d24ddfe6f7737eddd4320a69fe3c01c7c819a Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 2 19:34:11 2019 -0600 Testing logging updates commit 36d4e21807b571c8ea055ef691b1b1cca5d65fcb Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 19:22:58 2019 -0600 adding env variables commit f5b4bbc8afd253506b47cbd3dd97a48c5072cc83 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 19:12:19 2019 -0600 updating commit bb1243d725ee65141622585482a8a2835248f9c1 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 18:56:15 2019 -0600 updating variables. commit c9ce6e3060de7ead1e8193401c8f1ffd3e8a4114 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Dec 2 18:44:54 2019 -0600 Add plugin to package dependencies commit b026e8a340501fb304e2526c1479c6004d2934eb Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 18:27:17 2019 -0600 updating pom queue. commit 5ab695e53e510cf325d214d607d902c1106c4d7d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 18:10:59 2019 -0600 readded logging. commit 920e962811dc5132b25f0426d880e0bfbb621546 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 16:06:56 2019 -0600 commented out logging. commit 5cf05598dabb244f4321f13ba3440b3363be0a22 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 15:38:53 2019 -0600 updating pom. commit 9be5a127677c302592cc8e5b7022b721ab8a96c8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 15:13:24 2019 -0600 removed grace period commit 3fd5377e4b3e2f636db0c79df4d702f2679859e7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 15:04:33 2019 -0600 adding queueservice commit 3f9e2bb6021bbb9ae52e93c020f19b38d3f5d935 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 14:54:59 2019 -0600 updating yaml. commit 1f733c7659d66ba93a93e068f76f6768180409bf Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 14:42:19 2019 -0600 updating indexer queue. commit 461264fef50deff2c2ab8f1bc773b472865c9e53 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 14:19:48 2019 -0600 updating ecs commit 3b7aae3b3fcd8f0f4d23e0965bcc1a21cb6de901 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 14:02:46 2019 -0600 updating queue pom. commit cb37da74ed601ae775d780b005d57f7ed982b4a5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 13:45:18 2019 -0600 updating server.port. commit de1d9a2b8732bc32165e5ddddc8939cfd430fffc Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 13:29:00 2019 -0600 updating yaml. commit 0039f9ebbcf85dc380a809220098be0b158944aa Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 13:22:03 2019 -0600 removed resource. commit e14525784baa96047fa8302b4bec213b740eab8f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 13:09:22 2019 -0600 updating yml.: commit f2fd921598acabb82655355cb45a81e00de23590 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 13:07:05 2019 -0600 fixed yml. commit c60578c55006c2275c15889e8841fb00d9c1fb2e Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 12:58:12 2019 -0600 updating ecs. commit 6e8d0c0b69bd0805f4eca6487ca01466dbb88c67 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 12:49:14 2019 -0600 updating health check. commit a17d1c88922abe7ddb090a7b34deb6209d48f3c4 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 12:43:02 2019 -0600 updating health check. commit bea043b1385eabc4e1101ca0edfe2fccb6232977 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 12:35:42 2019 -0600 updating health check. commit 5ec2f3a97904562f1837a016fa940df2ad24d494 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 12:21:25 2019 -0600 updating health check. commit e44cf033ee6024f90ab487809fe175176bbf4349 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:52:34 2019 -0600 updating ecs. commit b7fb6575845988c2e38f2b0b1df93bdfb7112bfc Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:41:04 2019 -0600 updating yaml. commit eb03176988c5a3a055fd62521609deb592edc5cd Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:26:32 2019 -0600 updating indexer queue dockerfile. commit 8a7448508d65f9def989cf44a23647844190221f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:25:02 2019 -0600 fixed dockerfile. commit 8d6fc74faa359814d402de228ff8510abe1b608c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:15:10 2019 -0600 updating to snapshot commit 8d08bf3d40b86b3c428cad6b7b03384ff7faeced Merge: 2850eac 6cab20d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:02:33 2019 -0600 Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile commit 2850eac7e01398b96a9c1a24d6f6245f43574f69 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Dec 2 11:01:30 2019 -0600 updating poms commit 6cab20d929862879fc99bd753fbb31387ece0655 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Mon Dec 2 10:13:04 2019 -0600 Updated the Maven test/deploy commands for indexer. commit 7f3d9ce8136f116b48096cd5cf693429b9d7bd3c Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Mon Dec 2 09:41:00 2019 -0600 Removed dependencyManagement block for AWS module POM, which was breaking the builds. commit 90cb1446b482326fb67b69cc4edcca06e67b79d6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 15:31:50 2019 -0600 updating post deploy. commit 15c473fccdd22e0b4e2941a005072a5d93db5b7c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 10:04:25 2019 -0600 reuploading master stack. commit 3e3ed933ce9afcbd1bde27f04786c3746ffb3b98 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:58:36 2019 -0600 added role arn commit df7016037a51545a8249eb27971c9ee758d2d0d5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:48:49 2019 -0600 added role arn commit f67750f00d4f67ce5998c46a38c4af19134ae729 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:48:36 2019 -0600 added role arn commit 0f784802e0c1e54949b3853fbbe08e796c880751 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:43:02 2019 -0600 added role arn commit 9a8416301c0ad8201cfd84166cabd34608a7ca48 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:19:35 2019 -0600 updating typo. commit da320178305947c4eac9543b2d971aa29a99e7b7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 28 09:13:26 2019 -0600 adding indexer queue. commit a596e1565f8bec7a0990e098d679fc12f378f869 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 27 16:35:52 2019 -0600 updating files. commit 5886cdc431c96b21d68103d30ff1db4acdada74f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 27 10:57:34 2019 -0600 updating params commit 43e4cc34ec9d4cb0ac1209c2f9d78d1b37bb223d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 27 10:32:14 2019 -0600 updating ecs. commit b74878f817697438b87a016bb41276d8d4769321 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 27 10:00:48 2019 -0600 updating dockerfile. commit bc14e2fbdc8aa4331bef5f3e64a7558c8da295c3 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 27 09:04:22 2019 -0600 updated dockerfile commit 4e26ff3d3414c45033bfe3a891749822d1eb0e9f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 16:01:26 2019 -0600 min size. commit 8dc3697921da614095617619186cabe9906fa10b Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 15:56:04 2019 -0600 upating unique names. commit 2edc46569ea34b665445223afab89f5d5267c132 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 15:44:49 2019 -0600 updating commit 9a9cbd3addb683f30b663d9f7ee899ebf7c0ae66 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 15:34:12 2019 -0600 updating deployment. commit de7c9a94f4bbea5b24ea88bb9ba16dd4f38737d0 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 15:15:00 2019 -0600 updating deployment. commit eec8e2646489f554641b93553e8f268af79273ba Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 26 15:07:01 2019 -0600 updating deployment. commit c61379c69284dc712f3793124e63e6b17c675461 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Nov 21 23:02:48 2019 +0000 Squashed commit of the following commit 54b4990c Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Thu Nov 21 2019 16:50:49 GMT-0600 (Central Standard Time) Add Copyrights commit f9f412e6b2cded4e327e58e21e742d146b177c29 Merge: a757a09 4bbf734 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 21 13:40:35 2019 -0600 Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into integrationtestcleanup commit a757a09f88b6677b2ac394940e40c2efefe929d0 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 21 13:38:47 2019 -0600 updating pom. commit 4bbf734ce85d7a5c74f9676a7a4c2db1859f1ea2 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Thu Nov 21 13:15:29 2019 -0600 Resetting config commit 8cc391896913c32b7d7856d933670328543cbfc3 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Thu Nov 21 12:50:16 2019 -0600 PR comments commit a24dcda02af2e1006f4993a98afc4eb5ed4a53e6 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Thu Nov 21 10:19:29 2019 -0600 Entitlements Additions to integration tests and queue processor commit 0750b896b9a8d7d7ae3f17185c4557406208118b Merge: 5bf9b22 d65d7e4 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Wed Nov 20 14:34:33 2019 -0600 Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into EntitlementsAdditions commit 984661f330d2f627038bea7c50623c8fc03a9ee7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 20 14:18:40 2019 -0600 update indexer queue. commit d65d7e4ea70ec8a945805cd5fe40656b16b09293 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 20 12:58:45 2019 -0600 removed deployment for indexer queue. not completed. commit c41456f99ef84019cf6ae0a75951496d2de871f9 Merge: 7ff3cd8 c662cb8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 20 12:51:57 2019 -0600 Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into integrationtestcleanup commit 7ff3cd839cd6837b40cd1032d9127b9a1283db3a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 20 12:51:40 2019 -0600 removed test config from Config. commit 5bf9b221ecf50a78bd09267e9f53a09abf1842bd Merge: a15a2a3 c662cb8 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Wed Nov 20 12:20:39 2019 -0600 Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into EntitlementsAdditions commit c662cb8791aee37be155eb04e9d1371b1d85a6fb Merge: 8d21bf8 8aaa85e Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 20 12:13:32 2019 -0600 Merge remote-tracking branch 'origin/master' into dev # Conflicts: # indexer-core/pom.xml # indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java # pom.xml # provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java # provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/DeleteSchemaSteps.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/GetSchemaSteps.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/MappingSteps.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/models/TestIndex.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java # testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/HTTPClient.java # testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature commit a15a2a34b5aa5ed8c65db7a8ed8b39fb576bfb81 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Tue Nov 19 14:51:41 2019 -0600 First changes on entitlements to integration tests commit 8d21bf88dc685f4af1a9f980ef1b812911a9d77d Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 20:44:16 2019 +0000 Squashed commit of the following commit aabba696 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 2019 14:21:04 GMT-0600 (Central Standard Time) Updated Elasticsearch to 6.8. commit 25ca9eb8 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 2019 08:54:05 GMT-0600 (Central Standard Time) Changed test index name back to the normal name, now that testing is over. commit 1833d39b Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 2019 08:44:30 GMT-0600 (Central Standard Time) Changed the default number of Elasticsearch nodes to 2. commit 1aebda14 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 2019 08:17:26 GMT-0600 (Central Standard Time) Added Elasticsearch permissions to the CFNRole. commit 0fb07525 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 19 2019 08:08:30 GMT-0600 (Central Standard Time) Added template for Elasticsearch domain/cluster; added an Elasticsearch stack to the automated pipeline; added Elasticsearch parameters to each environment's parameters file. commit 795447e092d3c1330e0583c7d6ce4f95cb8f5f3c Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Tue Nov 19 20:14:54 2019 +0000 Squashed commit of the following commit f8a4b566 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Mon Nov 18 2019 18:07:30 GMT-0600 (Central Standard Time) Update to use new config classes for AWS resources commit ec7572564c294b8ae986c26286a59dd4412ffde5 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Mon Nov 18 14:21:18 2019 -0600 reverting core changes i made commit 1072b9012355b9fa17fa88adc768d5ee3d2af83c Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Mon Nov 18 14:17:11 2019 -0600 Entitlments addtions to indexer commit 05f1928726890627c97f07ff324fa24ede5137a5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 15 15:33:58 2019 -0600 readded headerinfo impl. commit c82f7cf487804b12b73207acacea37e9568c50a9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 15 15:00:44 2019 -0600 updating indexer. commit 0d95c0050c807496c0c71c20e8056fed5885e76a Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 15 12:20:00 2019 -0600 updated unit tests. commit b58294e89e83ed6879b6f73a5a44b4287068d2b0 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 14 18:04:38 2019 -0600 updates. commit 701997045694eb9f1b74270bd4696429d7b4b6e6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 14 18:02:41 2019 -0600 reverted test changes. commit 5b6acbc106d270dd1e6bd22e5823e91f7b2f6e8a Merge: 574e5e2 5de4c41 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 14 17:57:16 2019 -0600 Merge branch 'dev' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into ConcurrentProcessing commit 574e5e214f6c773e1b6675442e3c883f86645f95 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 14 17:56:10 2019 -0600 refactored indexer queue. commit 5de4c4157a2edaf66596f50a86314b1bff748580 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Nov 13 22:44:40 2019 +0000 Squashed commit of the following commit f79bbff4 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Wed Nov 13 2019 16:27:58 GMT-0600 (Central Standard Time) Removed the ElasticCredentialsCache implementation and AWS resources, since it turns out that we will not need it for the AWS version. commit d6295bba Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 13:53:21 GMT-0600 (Central Standard Time) Reverting unit test changes. commit 9e3fd6f5 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 10:59:51 GMT-0600 (Central Standard Time) Added ElastiCache implementation values; refactored cache names to match naming convention and their respective interfaces; updated cache classes to use Redis. commit cdfd718f Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 09:40:01 GMT-0600 (Central Standard Time) Added ElastiCache permissions to the CFN Role. commit 0839e17d Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 09:10:41 GMT-0600 (Central Standard Time) Granted IAM Put* permissions to the CFN role to fix deployment errors. commit 4d527882 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 08:54:00 GMT-0600 (Central Standard Time) Fixed the queue name. commit 11bf56c8 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 08:30:09 GMT-0600 (Central Standard Time) Removed disused parameters. commit dce92988 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 08:21:30 GMT-0600 (Central Standard Time) Updated CodeBuild instance type. commit 5d02bf1d Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Tue Nov 12 2019 08:12:33 GMT-0600 (Central Standard Time) Created CloudFormation templates and deployment scripts for os-indexer. commit d414d7d7 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Mon Nov 11 2019 10:25:22 GMT-0600 (Central Standard Time) Fixed HTTP auth. commit b5d6e21e7f0875c2ee2d46837b54a408d8227554 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 13 11:54:34 2019 -0600 Dockerfile WIP. commit 189c786c42f4a26013913134cb8dd102fae845d2 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 13 11:53:56 2019 -0600 updating indexer queue. commit 6b9e2fa2d6162191b8de208e1c33fe77d3727e8f Merge: dd34563 856222c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 12 16:42:52 2019 -0600 merge conflicts commit 856222c16381df61a600efb335f9d4383780e3c6 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Nov 12 16:41:04 2019 -0600 updating unit tests. commit dd345639b39ea9f935a0a8eddc5bfd709fb86be9 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Tue Nov 12 16:22:55 2019 -0600 Indexer queue in progress commit ad23e937aa3983fff60791a9744b3cbbc6612450 Author: Spencer Sutton <spencer.sutton@parivedasolutions.com> Date: Mon Nov 11 17:36:25 2019 -0600 Indexer queue rough start commit f255e4ef7bf77f85e4a0898700866aeb41acee56 Merge: 4122b58 05a5ca3 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Nov 11 09:41:33 2019 -0600 merge commit 4122b584fdf1a4b64375fa16b65d5d23623df13c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Nov 11 09:41:08 2019 -0600 updating client to work commit 05a5ca35f4a5f802eeabb0f5c2ef0b14a0a04e41 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Mon Nov 11 09:39:54 2019 -0600 Fixed HTTP requests. commit eb4a06fbdadcc116d066b514d8303c4600f48bbd Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Nov 11 09:08:13 2019 -0600 updating tests. commit 253061ed08d44364d503a3c1375d87de1ab8d74c Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Fri Nov 8 14:18:58 2019 -0600 Reverted pom and ElasticUtils changes. commit ea07b1ca026ecedcd68bd668f1fc79d94e4e2b42 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Fri Nov 8 13:35:11 2019 -0600 Integration test fixes commit ba8111287d34ecd2ba6e1f23d01004b3885db6d7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 8 11:59:35 2019 -0600 updating tests. commit 229b4a61d082be40fbdf0c316a69438967a2bb31 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 7 15:03:11 2019 -0600 updated imports. commit 876834d95a3cb81aa10f23685c8b6447ee5a71b0 Author: Barclay Walsh <barclay.walsh@parivedasolutions.com> Date: Thu Nov 7 14:30:30 2019 -0600 Fixed for the refactor. commit 5883cca9ff40537e81e87321b84fcf32aa44e301 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Nov 7 08:13:04 2019 -0600 WIP. commit 415d1994d1ad52903d6067e4fe63245ab025d0d4 Merge: 5fdd34e d6afaf7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 6 11:18:55 2019 -0600 merge conflicts commit 5fdd34eab1267682292d7b8e3877d123c446c299 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Nov 6 11:15:57 2019 -0600 creating thread pool. commit d6afaf7791e4fc3cdfe05a7f42e7c4215bda5aef Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 17:01:20 2019 +0000 Squashed commit of the following commit 8aaa85e4 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 06 2019 10:52:45 GMT-0600 (Central Standard Time) Merge indexer changes from ADO - provider updates commit ab068719 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 06 2019 10:52:10 GMT-0600 (Central Standard Time) Merge indexer changes from ADO - provider updates commit 7e214fe4 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 06 2019 10:49:29 GMT-0600 (Central Standard Time) Merge indexer changes from ADO - adding testing directory commit d9b6119e Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 06 2019 10:46:44 GMT-0600 (Central Standard Time) Merging core changes from Azure DevOps commit d8a75178 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 06 2019 10:37:15 GMT-0600 (Central Standard Time) Renaming folders for DevOps Merge commit 8aaa85e4706b77b048e6822608e2d37c314ea42b Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 10:52:45 2019 -0600 Merge indexer changes from ADO - provider updates commit ab06871920504ce5107ed15596f2aa9a23e4b711 Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 10:52:10 2019 -0600 Merge indexer changes from ADO - provider updates commit 7e214fe41e2036dedf96a7bd33f0871b2e74bd0c Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 10:49:29 2019 -0600 Merge indexer changes from ADO - adding testing directory commit d9b6119ea9265266438b95fcde7af6a2b74eb3ae Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 10:46:44 2019 -0600 Merging core changes from Azure DevOps commit d8a7517816c33ac71ab2e4d017d90e2e645fb29e Author: Wyatt Nielsen <wyatt.nielsen@parivedasolutions.com> Date: Wed Nov 6 10:37:15 2019 -0600 Renaming folders for DevOps Merge commit 0b719a2397544f5d8517cc78b93ae4e7c9f7072d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Nov 4 14:59:59 2019 -0600 updated indexer to reindex. commit bb8842f8e18a082a34288f02a9cc006245607912 Merge: d203698 82bd924 Author: Sherman Yang <SYang@slb.com> Date: Sun Nov 3 03:13:33 2019 +0000 Merged PR 419: move test data to core lib and update test logic accordingly move test data to core lib and update test logic accordingly Related work items: #317 commit 1ac2d5ebebf708dae3b35f10ba46743eb2415f2b Merge: d203698 03e53e2 Author: Sherman Yang <SYang@slb.com> Date: Sun Nov 3 03:13:33 2019 +0000 Merged PR 419: move test data to core lib and update test logic accordingly move test data to core lib and update test logic accordingly Related work items: #317 commit 82bd924396b495d983c8d42bee2767327275ffa3 Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 15:22:16 2019 -0500 move test data to core lib and update test logic accordingly commit 03e53e27d470c74ad38579b3d18999714e3b162c Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 15:22:16 2019 -0500 move test data to core lib and update test logic accordingly commit d203698b66830b9cc6577f946ebb33cecd0c66d8 Merge: f303a30 4f4f28b Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 18:59:30 2019 +0000 Merged PR 417: indexer: rename service name from indexer-service to os-indexer to match task queue settings. indexer: rename service name from indexer-service to os-indexer to match task queue settings. Re-enabled previously ignored integration tests. Related work items: #317 commit 4f4f28b8482d53c9add2f2e41d6909ea8f52dc09 Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 13:21:45 2019 -0500 re-enable ignored integration tests commit c09e9af4d24d3a545c22c1324e0355faa1ec6d50 Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 12:53:06 2019 -0500 rename indexer-service to be os-indexer to match cloud task settings commit b55a58a7b44a746ba40c808efeec4b28276e54e8 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 1 12:26:10 2019 -0500 mino refactor. commit a487e6214c6d3f97c1679f9262e5f5d2526c64f0 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 1 11:18:56 2019 -0500 updating indexer to work with core application. commit f303a30e6e36f0a8e80e34d23f6efa7a5b265ab8 Merge: efd186e a7d940c Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 16:14:26 2019 +0000 Merged PR 415: Indexer: port and abstract integration tests Port and abstract integration tests: Create indexer-test-core library and abstract all common test code there Create indexer-test-gcp project to test gcp integration tests Update the gcp CI/CD pipelines to run the integration tests Related work items: #317 commit 1db936523dcf75374507363c81e6608081a95c8c Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Nov 1 11:10:02 2019 -0500 indexer impl. commit a7d940c38343489082762da279b19f5a40de9b72 Author: Sherman Yang <SYang@slb.com> Date: Fri Nov 1 08:59:42 2019 -0500 ignore indexer record related integration tests temporarily until indexer queue is deployed commit c701ebd5e29a97cfb262f345049e957d0d614b12 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 30 16:03:04 2019 -0500 remove mapping integration tests as mapping apis are not supported commit d0d998140c9df8fba4edad0968a38a8adfcb60d4 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 30 08:32:57 2019 -0500 remove some idea files commit ecda41ee531101c9848b470c660d803b1ee01216 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Oct 29 15:55:12 2019 -0500 updating record repo. commit 9f199c96c830a1505ba4aa2f9263b96c02934c6c Author: Sherman Yang <SYang@slb.com> Date: Tue Oct 29 15:03:40 2019 -0500 update integratest tests commit cded8341b538506bbe77fe9631c46e75aecc3de8 Author: Sherman Yang <SYang@slb.com> Date: Mon Oct 28 14:58:56 2019 -0500 remove on behave of related logic commit 81ca17cb972f299e0780cb82b50284d9b663b7f1 Author: Sherman Yang <SYang@slb.com> Date: Mon Oct 28 11:43:01 2019 -0500 update integration tests commit 997991b7f21debba910de8f5c97210f83dc43f73 Author: Sherman Yang <SYang@slb.com> Date: Mon Oct 28 10:39:55 2019 -0500 add maven settings.xml for testing commit 733c2e9e67795605a8ab7ab3b5a87731fc045151 Author: Sherman Yang <SYang@slb.com> Date: Mon Oct 28 09:35:03 2019 -0500 update gcp deployment scripts commit 510350e010f4e8e2cc46eaca5e0149a67b166125 Author: Sherman Yang <SYang@slb.com> Date: Fri Oct 25 15:59:53 2019 -0500 more integration tests updates commit 7ff780808cba17c45d86d971a5ea3730d217027f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Oct 25 15:15:29 2019 -0500 updating. commit f0b37e2c3d439887acfe76ae32639287060203a0 Author: Sherman Yang <SYang@slb.com> Date: Fri Oct 25 14:44:10 2019 -0500 update integration tests commit a2bd05753f076fe30cc2fc66134623fd11041eb7 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Fri Oct 25 10:25:06 2019 -0500 updating WIP. commit daff4bdb16b2b7a5f1fa1cc857c7dbf3b95b9a61 Merge: f571f68 efd186e Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 15:37:31 2019 -0500 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into test commit efd186eb64f68ed47d1b17142b9ba668f064f52e Merge: 8d8be6f 9420b00 Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 20:37:04 2019 +0000 Merged PR 395: Replace all instances of @Autowired with @Inject to conform with standard Replace all instances of @Autowired with @Inject to conform with standard Related work items: #525 commit f571f68e205e8ae0564d02de04c2f677e9631248 Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 15:35:34 2019 -0500 initial integration test files commit 6add3ce91e1d49244cb1cf80e07d248ff61e1fe5 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Oct 24 15:21:24 2019 -0500 updating wip. commit 9420b00ddd86fa882ff27f5ba7cfc933eaeadf05 Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 11:34:55 2019 -0500 move imports to proper groups commit 530d5c8767e07dc14de72c748216708813490110 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Oct 24 11:23:58 2019 -0500 removing .DS_Store commit ec49012992560dc4bfb4452ab21bc3a42dd27e74 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Oct 24 11:21:20 2019 -0500 WIP. commit b773d99fe921afa7c56c3d683e9ceb935981d744 Merge: 00202ec 8d8be6f Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 11:17:13 2019 -0500 merge master commit 8d8be6fd6b420f4fcf6ca32a01052a49671e6554 Merge: 2c069b1 6789ab7 Author: Thameem Ansari <thameem.abdulhameed@wipro.com> Date: Thu Oct 24 16:13:05 2019 +0000 Merged PR 393: Incremented the os-indexer-search-core lib to 1.0.10 to support ES in http mode Incremented the os-indexer-search-core lib to 1.0.10 to support ES in http mode Related Azure changes Related work items: #504 commit 2c069b19c39cd4e5737284e49e14dc1136ab6d2c Merge: 3ed4623 324a51f Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 16:10:08 2019 +0000 Merged PR 394: move AuthorizationServiceEntitlements from GCP to core move AuthorizationServiceEntitlements from GCP to core Update pom to fix unit test issues. Related work items: #524 commit 00202ec5cd103183d1d07cd37dd2d0bdbb6cdd52 Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 10:59:49 2019 -0500 replace all @Autowired with @Inject to conform with standard commit 324a51f3c1dfae9fe38060a0d1555f6fe9fcca8a Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 10:42:05 2019 -0500 move AuthorizationServiceEntitlements from GCP to core commit 684b746296613ec0f4d25e934417787ace9a0590 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Oct 24 10:39:41 2019 -0500 removed awsindexerapp. commit e18e59b1c0d5b2a8cd976768eaec012f56973b39 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Thu Oct 24 10:36:12 2019 -0500 indexer running not connecting to es. commit 6789ab74be021ed20f13e96472d94edc95f7e532 Author: Thameem Ansari <thameema@gmail.com> Date: Thu Oct 24 00:40:17 2019 -0500 Fixed the typo - incremented wrong pom file commit bf33ff55b186d2352fba951a09cce07aa8886517 Author: Thameem Ansari <thameema@gmail.com> Date: Thu Oct 24 00:32:37 2019 -0500 Incremented pom version and changed the indexer-azure pom to snapshot commit 575dbfe4965c0d16c29ff3c11b5ec349a2e80794 Author: Thameem Ansari <thameema@gmail.com> Date: Thu Oct 24 00:26:24 2019 -0500 Incremented the os-indexer-search-core lib to 1.0.10 to support ES in http mode Related Azure changes commit 3ed462377da7ac8aa33cbe98dbf5e7252ef138af Merge: 7a5f076 daf535e Author: Sherman Yang <SYang@slb.com> Date: Thu Oct 24 01:53:04 2019 +0000 Merged PR 391: Indexer service: restructure folders to conform with standard and update CI/CD pipelines accordingly Indexer service: restructure folders to conform with standard and update CI/CD pipelines accordingly Related work items: #515 commit 8885974557ab302877da7111e87537a07b1bca9f Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Oct 23 17:15:12 2019 -0500 propped up indexer. commit daf535e77ae89f7f49ac2a88097d884e0543e9fa Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 15:19:50 2019 -0500 update parent pom commit 747ec3a3681f5575379be5467249aa27b349ff65 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 14:49:47 2019 -0500 update gcp commit ebb4e9cf36640297c23937b463378f22bb1b91ae Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Oct 23 13:41:10 2019 -0500 merge conflict commit 6ffa8fccbd550d11e6c3a46494eb0de3d131475f Merge: aabb546 3e570ef Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Oct 23 13:38:47 2019 -0500 Merge branch 'dev' into indexerPublisherImpl commit 3e570ef8775f9f78c2517bcabb27bee14686da6e Merge: b083aeb f5dbc26 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Wed Oct 23 13:38:20 2019 -0500 merge conflict commit 274bfd84c7c56a22b74a45422878c830e747fece Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 13:24:38 2019 -0500 update gcp commit 5fb6ed5573ba3a3b31867051049f9652270649a4 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 13:18:36 2019 -0500 update gcp commit c01ec45c2fd459c53a773d692b5863d0e4d14760 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 13:02:45 2019 -0500 update gcp maven settings commit c084cea0927a4259022ee01da7c5456d01a3c609 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 12:54:56 2019 -0500 update gcp pom commit 9c291f96fe192a15dc0e343c27b5bfd228a17761 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 12:40:24 2019 -0500 update gcp pom commit d5f5ea4d2ca790f8bd63a3632b816d8787e8e25b Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 11:33:31 2019 -0500 update gcp build script commit 1ea20a9dc2cd7d6baa4886ad74b7d8053d7324af Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 11:16:54 2019 -0500 update azure pom commit 6fb5cf17f43676e78e639b779b3a10d8d71d0888 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 10:53:16 2019 -0500 update poms commit 41ce1b6e4a632d8262d0fe171362471c8634720a Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 10:29:14 2019 -0500 update poms commit 6553481fcdb6ae34b1a002c2d7dbd6fc000676c6 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 09:51:18 2019 -0500 update parent pom commit dffedfe87a90989fcb4663747d8668e12f68e0c3 Author: Sherman Yang <SYang@slb.com> Date: Wed Oct 23 09:41:45 2019 -0500 restructure folders and move files to conform with standard commit aabb546a6b371a73aee5e9394fec82335e9ec40d Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Tue Oct 22 15:32:10 2019 -0500 WIP commit f5dbc26b7704f338a50c1e1751d095d5736d89cb Author: Wyatt Nielsen <W.Nielsen@ssss.com> Date: Tue Oct 22 15:17:05 2019 -0500 Add throw to prevent null ref exception commit ad845eeb0d31554643c1febe2fdbce66af05a960 Author: Wyatt Nielsen <W.Nielsen@ssss.com> Date: Tue Oct 22 15:12:28 2019 -0500 Implement IHeadersInfo commit b083aebea915e587e003e33f923b4e7234e2988b Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Oct 21 16:56:29 2019 -0500 WIP. getting the indexer application to run. commit 0e51c41465fadb137d9bb19d8800b092dfc992b9 Author: Michael Nguyen <michael.nguyen@parivedasolutions.com> Date: Mon Oct 21 10:18:45 2019 -0500 adding aws module. commit 7a5f07687921db1fdcd09657bc9d07bb2722f9c3 Merge: 2543a09 42d2076 Author: Jagan Mohan Gottimukkula <JGottimukkula@slb.com> Date: Fri Oct 18 19:31:25 2019 +0000 Merged PR 372: Added auth for /reindex and fixed testcases Added auth for /reindex and fixed testcases Related work items: #314, #316 commit 42d2076599f574a1e834a9a90f8d3d0ccc5b9fac Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 18 12:36:26 2019 -0500 removed old swagger ref commit dc67ba16eed8fccbbf55ec3b4d5b7d9d56652b38 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 18 12:30:46 2019 -0500 removed old swagger references commit 2543a09da5360b2a48cbcfd2b59883859b82e0ce Merge: 395ad2b 1dddb54 Author: Jagan Mohan Gottimukkula <JGottimukkula@slb.com> Date: Fri Oct 18 16:40:15 2019 +0000 Merged PR 374: Update azure-pipelines.yml for Azure Pipelines Added build support for gcp Related work items: #314 commit 9f9003559f62f7e38fcb98930fdb0555d522a7c4 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 18 11:38:52 2019 -0500 added gcp deployment scripts commit 1dddb544e93bf1f0aa11d614e88909c417ee746d Author: Jagan Mohan Gottimukkula <JGottimukkula@slb.com> Date: Fri Oct 18 05:13:21 2019 +0000 Update azure-pipelines.yml for Azure Pipelines Added build support for gcp commit 40398c2d432da3be4b887cfde46073197ef3fe8a Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Thu Oct 17 14:23:35 2019 -0500 Added auth for /reindex and fixed testcases commit 9de8a2c7740d1531b07758861ec2a522b56b5fca Author: Wyatt Nielsen <W.Nielsen@ssss.com> Date: Tue Oct 15 13:08:26 2019 -0500 Code pull from SLB repo 10/15/2019 commit 395ad2b21fd7d0546235fe6cf37fbb46711517f3 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 11 22:06:46 2019 -0700 fixed test case commit e97153e74ed12a176cffb83263387ed15f4fa0e4 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 11 21:17:08 2019 -0700 Fixed cache for GCP & Azure commit def0ef1efbb64997d42ab4d14b173c5efccc4a79 Merge: ec2e34e f5fa7a5 Author: Heba <heelayot@microsoft.com> Date: Wed Oct 9 20:44:47 2019 +0000 Merged PR 305: Azure headers, maven settings and RecordIndexerApi header check - Add Microsoft Headers - add azure maven settings and plugin and add azure pipeline - - Add a check in RecordIndexerApi to check DATA_PARITION_ID header. - fix test cases commit f5fa7a5af97eddd169fa776dedb58a0acfdd6564 Merge: a875827 b7d2af9 Author: helayoty <hebaelayoty@gmail.com> Date: Wed Oct 9 00:47:22 2019 -0700 Merge branch 'heba-azure-work' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into heba-azure-work commit a8758273083f3795b6d7f4cc0dac8e2409639c6e Author: helayoty <hebaelayoty@gmail.com> Date: Wed Oct 9 00:46:36 2019 -0700 Move Services test cases to vendor projects commit e13ad39bc6939a5d279fd5832bf67f5e4ffe8952 Author: helayoty <hebaelayoty@gmail.com> Date: Tue Oct 8 23:49:23 2019 -0700 Move Services test cases to vendor projects commit ec2e34e59783ab7c3113890cafd7fdd969e7e46f Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Tue Oct 8 17:41:08 2019 -0700 updated vendor specific implementations in core and root commit b7d2af926468fdd8f53c473f5d2341260274641b Author: helayoty <hebaelayoty@gmail.com> Date: Tue Oct 8 11:46:38 2019 -0700 - Add check in RecordIndexerApi to check DATA_PARITION_ID header. - fix test cases commit 808a4d62cea8d78de024c72c1d421fc6f0bd9b15 Merge: 50b29a9 579ab55 Author: helayoty <hebaelayoty@gmail.com> Date: Mon Oct 7 18:07:48 2019 -0700 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into heba-azure-work commit 579ab5596708c7cfcac646761c336c1526d0ed5e Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Oct 7 18:06:45 2019 -0700 Updated Azure functions url for reindex commit 50b29a9603e4f8eab9dfd8fd9f65e4a94653f4ad Merge: 8f77f3b 3a2c58d Author: helayoty <hebaelayoty@gmail.com> Date: Mon Oct 7 17:46:21 2019 -0700 Merge branch 'master' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/os-indexer into heba-azure-work commit 3a2c58d7afea77271ea64ed6c221f3fd552453fd Author: Heba <heelayot@microsoft.com> Date: Sat Oct 5 02:28:24 2019 +0000 Merged PR 294: Add azure maven settings and plugin and add azure pipeline add azure maven settings and plugin and add azure pipeline commit 8f77f3b48bb6b50d53d2307a8363a90e7216e63e Author: helayoty <hebaelayoty@gmail.com> Date: Fri Oct 4 19:27:12 2019 -0700 add azure maven settings and plugin and add azure pipeline commit 661b50f28641630ad9b0085fcbbf0ab68562fb03 Author: Heba <heelayot@microsoft.com> Date: Sat Oct 5 02:15:04 2019 +0000 Merged PR 293: Add Microsoft Headers Add Microsoft Headers commit 9bf7356678dc638bf1f815001b8e22335b6a7d60 Author: helayoty <hebaelayoty@gmail.com> Date: Fri Oct 4 19:03:33 2019 -0700 Add Microsoft Headers commit 348cdd894b7089dad9f084f2362b6dd7c9ea3093 Merge: c8b99e5 88805f4 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 4 17:32:07 2019 -0700 merging azure code commit c8b99e59406973f657b8bcc945808e4e63f8ad3f Author: helayoty <hebaelayoty@gmail.com> Date: Fri Oct 4 15:05:31 2019 -0700 using serviceAccount (serviceprincipalAppId) for cache commit 88805f406de4b50e2ea223d74b713d0214bf88ec Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Oct 4 14:40:06 2019 -0700 fixed few test cases commit 245face14ecd13ed8a3668ca0160bbf0e5059a47 Author: helayoty <hebaelayoty@gmail.com> Date: Fri Oct 4 11:10:46 2019 -0700 Add serviceprincipalAppId property instead of tenantInfo object commit c1db20c23b6eab3febf3222d42d13a574bc102ea Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Thu Oct 3 19:31:50 2019 -0700 fixed indexer gcp commit ff69b244cd652fcb8a1e7353906d8c8acf5c772f Author: helayoty <hebaelayoty@gmail.com> Date: Thu Oct 3 19:25:21 2019 -0700 elastic search and tenant info modification commit 0f10985e1a55fc662d788a9be47c68d178639759 Author: helayoty <hebaelayoty@gmail.com> Date: Thu Oct 3 02:03:34 2019 -0700 apply modification in headerInfo and RequestInfo commit 36e6326baee9d9df99715c5ae32a3d936fcc7a9a Author: helayoty <hebaelayoty@gmail.com> Date: Wed Oct 2 00:34:42 2019 -0700 - Implement CosmosDB for tenantInfo and ElasticSettings - Add unit test for JWT - modify security settings commit 9719ad7d3f095b9778d7554e7f8495e2f6492e0f Author: helayoty <hebaelayoty@gmail.com> Date: Wed Oct 2 00:24:36 2019 -0700 - Implement CosmosDB for tenantInfo and ElasticSettings - Add unit test for JWT - modify security settings commit 9893cc09985a0e713561a2086f8f606954e5825a Author: helayoty <hebaelayoty@gmail.com> Date: Mon Sep 30 18:18:17 2019 -0700 Apply the new package name for client-lib commit 64011c23d5f99dd8f8fda0c930f1b51cd44fb1ad Merge: e314fd3 4d480f7 Author: helayoty <hebaelayoty@gmail.com> Date: Mon Sep 30 18:18:06 2019 -0700 Apply the new package name for client-lib commit e314fd3d9a01de2f413fbe2ddc05630164d7863f Author: helayoty <hebaelayoty@gmail.com> Date: Mon Sep 30 13:25:16 2019 -0700 Add Azure implementation for retrieve access token task: - implement getToken using MSAL lib commit 4d480f7ff69aa7e687b949811cd99adcea1cd651 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Sep 27 15:06:11 2019 -0700 fixed Headers and RequestScope issues commit 682211d89f061233931da4df232951ac8b750a1f Author: helayoty <hebaelayoty@gmail.com> Date: Wed Sep 25 16:47:46 2019 -0700 Add Azure implementation for retrieve access token task: - add azure storage endpoints - apply fixes to headerinfo & requestinfo for azure commit 85c6cd9dc666808a40a92d19ae83a5b8cb360fbd Author: helayoty <hebaelayoty@gmail.com> Date: Wed Sep 25 16:44:28 2019 -0700 Add Azure implementation for retrieve access token task: - add azure storage endpoints - apply fixes to headerinfo & requestinfo for azure commit e6208171acbcf2ddc0f54887acc33b0267018eb9 Merge: cc53b11 9813ed4 Author: helayoty <hebaelayoty@gmail.com> Date: Wed Sep 25 14:52:20 2019 -0700 Merge branch 'indexer-boot-jagan' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/dps-indexer-boot-mvn into heb-indexer-boot commit cc53b113eb8e6d1baddd4f583033a6fa73096e36 Author: helayoty <hebaelayoty@gmail.com> Date: Wed Sep 25 14:49:42 2019 -0700 Add Azure implementation for retrieve access token commit 9813ed43bb035d39230e6438704041c4466defd7 Merge: 5397a52 e2a69ff Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Wed Sep 25 14:43:21 2019 -0700 Merge branch 'indexer-boot-jagan' of ssh.dev.azure.com:v3/slb-des-ext-collaboration/open-data-ecosystem/dps-indexer-boot-mvn into indexer-boot-jagan commit 5397a52b4c1cdcd6a913bcf1ab8df0a94f9dff9d Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Wed Sep 25 14:42:52 2019 -0700 fixing indexer commit e2a69ff92f4d6e67ef78e87f72e7458fa0db9c32 Author: helayoty <hebaelayoty@gmail.com> Date: Tue Sep 24 22:06:20 2019 -0700 Add Azure implementation for security (files, resources and dependencies) commit 5875a7d7fc781b9e67a9d578797daba379a4e0f8 Author: adubey8 <adubey8@slb.com> Date: Tue Sep 24 13:57:52 2019 -0700 PublishImpl initial code commit bc0fea4eeba065364f27f48f874353c71ae6466f Merge: b145ff7 0ba0c4c Author: helayoty <hebaelayoty@gmail.com> Date: Tue Sep 24 13:40:28 2019 -0700 Merge branch 'indexer-boot-jagan' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/dps-indexer-boot-mvn into heb-indexer-boot commit 0ba0c4c6f331abefeb4d2cfcb1cf425ba59f50d2 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Tue Sep 24 13:39:12 2019 -0700 removed config dependencies from storageserviceimpl commit b145ff7fcc1e11cfa57464a9f246828056923687 Author: helayoty <hebaelayoty@gmail.com> Date: Tue Sep 24 13:39:00 2019 -0700 Add Azure implementation for util/di files commit 005d9e3d6b0d8589958aba445ffebe9e738645af Merge: d802e21 43c9206 Author: helayoty <hebaelayoty@gmail.com> Date: Tue Sep 24 13:03:51 2019 -0700 Merge branch 'indexer-boot-jagan' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/dps-indexer-boot-mvn into heb-indexer-boot commit 43c9206d1e5ad759def04e51d1833b6917c65fac Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Tue Sep 24 13:00:55 2019 -0700 fixing indexer service commit d802e21fe97d843eb5a2f77eaa5fd98551624241 Merge: 16bf46a 3210cb6 Author: helayoty <hebaelayoty@gmail.com> Date: Tue Sep 24 10:57:57 2019 -0700 Merge branch 'indexer-boot-jagan' of https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/dps-indexer-boot-mvn into heb-indexer-boot # Conflicts: # pom.xml commit 3210cb637ef26148128587df168c2d1e92708fc9 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Sep 23 18:46:35 2019 -0700 indexer changes commit 16bf46a76b0d2d736f27a0aaac28ca58dbb9ea32 Author: helayoty <hebaelayoty@gmail.com> Date: Mon Sep 23 14:10:42 2019 -0700 remove the models and apply profiling commit c00373e7d30aa75e6c4c26bf21c4134a20046729 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Sep 23 13:31:58 2019 -0700 fixing indexer commit b5e9ae65de9ea8d30db5674e0f9b7d43bce9a518 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Sep 23 11:55:50 2019 -0700 fixing indexer commit dcf417042a3cfa0c8789fb2b4a0f43985e45c02e Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Thu Sep 19 17:02:20 2019 -0700 disabled default spring security commit 95476df5e8df4d2fd33709a83128aed367957047 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Sep 16 15:53:57 2019 -0700 incorporated AppengineHeaders from client lib gcp commit e43553b24522b82a7a33f8e300604164cf55556b Merge: 4be9cd1 d62083b Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Mon Sep 16 13:30:19 2019 -0700 merged from master commit d62083bc96cd3f7c015c09d492b17385a81df9d1 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Sat Sep 14 07:16:27 2019 -0700 * Fixed the package name in azure * Fixed the schema file dependency from core * Updated the spring boot applications for gcp and azure commit b4d3d0d7bc057b9b7406360abb31ac7c2aff7a85 Author: Heba <heelayot@microsoft.com> Date: Fri Sep 13 23:38:28 2019 +0000 Merged PR 159: Fix unit tests -Fix test path for Gcp -Add MockMaker property file for Mockito Related work items: #159 commit 4be9cd1f0ee74a689b621bb49b1107596f99483c Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Sep 13 12:53:07 2019 -0700 excluded core root lib from gcp and azure core lib dependency commit 5a1f62854e143663428c30f8068b0a2d635f8233 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Sep 13 02:22:52 2019 -0700 spring boot migration commit ed2d7262ff0198b98f768bc291722b4365658547 Author: Jagan Gottimukkula <jgottimukkula@slb.com> Date: Fri Sep 13 00:16:28 2019 -0700 spring boot migration commit 7236242139415b5033052a0e59541c66f1b63e2c Author: helayoty <hebaelayoty@gmail.com> Date: Thu Sep 12 18:25:29 2019 -0700 migrate indexer to spring boot/cloud commit 5d5e5d7cee15b7fa3df4460c1a4db1952772e39a Author: helayoty <hebaelayoty@gmail.com> Date: Fri Sep 6 11:47:27 2019 -0700 migrate indexer to spring boot/cloud commit 1fac3bc7d01076d70cbaf7634abb11436e3a3fc9 Author: helayoty <hebaelayoty@gmail.com> Date: Thu Sep 5 11:56:33 2019 -0700 migrate indexer to spring boot/cloud commit bc79575ca0400d6414a152dfede879e774307af0 Author: helayoty <hebaelayoty@gmail.com> Date: Fri Aug 30 11:59:04 2019 -0700 Add spring boot/cloud framework files commit 761299f6d602076846c3446831b440072eb8fc4c Author: helayoty <hebaelayoty@gmail.com> Date: Fri Aug 30 11:20:24 2019 -0700 Add spring boot framework files commit 5a44258be43f48fadb8ec75f293a357dbc1c79a4 Author: helayoty <hebaelayoty@gmail.com> Date: Fri Aug 30 11:16:20 2019 -0700 Add spring boot framework files commit 41f5fb4100e53d0a06d07e394659874a3edf4d26 Author: helayoty <hebaelayoty@gmail.com> Date: Mon Aug 19 11:53:37 2019 -0700 Indexer new structure commit f7f9c98a8b7dacd49d254260d6818a01e2ad7870 Author: Jagan Mohan Gottimukkula <JGottimukkula@slb.com> Date: Mon Aug 19 18:14:47 2019 +0000 Added README.md file --- devops/Jenkinsfile | 85 ++++++++++++++++++ provider/indexer-ibm/pom.xml | 2 +- .../indexer/ibm/security/SecurityConfig.java | 2 + .../ibm/util/GlobalExceptionMapper.java | 83 ++++++++++++++++++ .../ibm/util/IndexerQueueTaskBuilderIbm.java | 86 +++++++++++++++++++ .../indexer/ibm/util/RequestInfoImpl.java | 25 ++++-- .../src/main/resources/application.properties | 5 ++ testing/indexer-test-ibm/pom.xml | 2 +- .../src/main/resources/apikey.feature | 10 +++ .../index/record/RunTest.java | 2 +- .../step_definitions/index/record/Steps.java | 60 ++++++++++++- 11 files changed, 353 insertions(+), 9 deletions(-) create mode 100644 devops/Jenkinsfile create mode 100644 provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/GlobalExceptionMapper.java create mode 100644 provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/IndexerQueueTaskBuilderIbm.java create mode 100644 testing/indexer-test-ibm/src/main/resources/apikey.feature diff --git a/devops/Jenkinsfile b/devops/Jenkinsfile new file mode 100644 index 000000000..84a24dd3c --- /dev/null +++ b/devops/Jenkinsfile @@ -0,0 +1,85 @@ +pipeline { + agent { + kubernetes { + cloud 'openshift' + label 'maven-openjdk18' + yaml """ +spec: + containers: + - name: jnlp + image: quay.io/openshift/origin-jenkins-agent-maven:v4.0.0 + volumeMounts: + - mountPath: "/tmp" + name: "workspace-volume" + readOnly: false + workingDir: "/tmp" + securityContext: + privileged: false + tty: false + resources: + limits: + cpu: 200m + memory: 2Gi + requests: + cpu: 200m + memory: 2Gi + restartPolicy: "Never" +""" + } + } + + environment { + + //Cluster environment variable(CLS_ENV). Like QA, DEV, PERF, PROD etc. + CLS_ENV = "dev" + + //Service variable(CORE_SERVICE). Like indexer, search, delivery, storage, legal etc. + CORE_SERVICE = "indexer" + + //GitHub repo URL credential ID for Environment variable files which saved as Secure text in Jenkins Credential. + GIT_ENV_VAR_PATH_URL = credentials('GitRepo-URL-For-Environment-variables') + + //Personal token variable ID which saved as Secure text in Jenkins Credential. Like: GitHub-PRIVATE-TOKEN. + PRIVATE_TOKEN = credentials('GitHub-PRIVATE-TOKEN') + + def runShell = sh (returnStdout: true, script: "curl --header 'PRIVATE-TOKEN: $PRIVATE_TOKEN' ''$GIT_ENV_VAR_PATH_URL'%2F'$CORE_SERVICE'_'$CLS_ENV'_env.json/raw?ref=master' -s -o env.json") + + } + + stages { + stage('Integration_test') { + environment { + def readContent = readJSON file: 'env.json' + + AUTH_USER_ACCESS = "${readContent['AUTH_USER_ACCESS']}" + AUTH_USER_ACCESS_PASSWORD = "${readContent['AUTH_USER_ACCESS_PASSWORD']}" + DEFAULT_DATA_PARTITION_ID_TENANT1 = "${readContent['DEFAULT_DATA_PARTITION_ID_TENANT1']}" + DEFAULT_DATA_PARTITION_ID_TENANT2 = "${readContent['DEFAULT_DATA_PARTITION_ID_TENANT2']}" + ELASTIC_HOST = "${readContent['ELASTIC_HOST']}" + ELASTIC_PASSWORD = "${readContent['ELASTIC_PASSWORD']}" + ELASTIC_PORT = "${readContent['ELASTIC_PORT']}" + ELASTIC_USER_NAME = "${readContent['ELASTIC_USER_NAME']}" + ENTITLEMENTS_DOMAIN = "${readContent['ENTITLEMENTS_DOMAIN']}" + KEYCLOAK_CLIENT_ID = "${readContent['KEYCLOAK_CLIENT_ID']}" + KEYCLOAK_CLIENT_SECRET = "${readContent['KEYCLOAK_CLIENT_SECRET']}" + KEYCLOAK_REALM = "${readContent['KEYCLOAK_REALM']}" + KEYCLOAK_URL = "${readContent['KEYCLOAK_URL']}" + LEGAL_TAG = "${readContent['LEGAL_TAG']}" + OTHER_RELEVANT_DATA_COUNTRIES = "${readContent['OTHER_RELEVANT_DATA_COUNTRIES']}" + STORAGE_HOST = "${readContent['STORAGE_HOST']}" + SEARCH_HOST = "${readContent['SEARCH_HOST']}" + LEGAL_HOST = "${readContent['LEGAL_HOST']}" + INDEXER_HOST = "${readContent['INDEXER_HOST']}" + ENTITLEMENT_URL = "${readContent['ENTITLEMENT_URL']}" + + } + steps { + script { + sh 'mvn -f testing/indexer-test-ibm/pom.xml test' + } + } + } + } + + +} \ No newline at end of file diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml index ae6917c09..07b269a72 100644 --- a/provider/indexer-ibm/pom.xml +++ b/provider/indexer-ibm/pom.xml @@ -33,7 +33,7 @@ <packaging>jar</packaging> <properties> - <os-core-lib-ibm.version>0.0.18</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version> </properties> <profiles> diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java index 2cf274bea..561edbc1e 100644 --- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java +++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java @@ -29,6 +29,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .csrf().disable() .authorizeRequests() .antMatchers("/", "/index.html", + "/liveness_check", + "/readiness_check", "/index-worker", "/_dps/task-handlers", "/_dps/task-handlers/**", "/reindex", "/v2/api-docs", diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/GlobalExceptionMapper.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/GlobalExceptionMapper.java new file mode 100644 index 000000000..60e0be562 --- /dev/null +++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/GlobalExceptionMapper.java @@ -0,0 +1,83 @@ +// Copyright 2017-2019, Schlumberger +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package org.opengroup.osdu.indexer.ibm.util; + +import javax.validation.ValidationException; + +import javassist.NotFoundException; +import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import org.opengroup.osdu.core.common.model.http.AppException; + +@Order(Ordered.HIGHEST_PRECEDENCE) +@ControllerAdvice +public class GlobalExceptionMapper extends ResponseEntityExceptionHandler { + + @Autowired + private JaxRsDpsLog logger; + + @ExceptionHandler(AppException.class) + protected ResponseEntity<Object> handleAppException(AppException e) { + return this.getErrorResponse(e); + } + + @ExceptionHandler(ValidationException.class) + protected ResponseEntity<Object> handleValidationException(ValidationException e) { + return this.getErrorResponse( + new AppException(HttpStatus.BAD_REQUEST.value(), "Validation error.", e.getMessage(), e)); + } + + @ExceptionHandler(NotFoundException.class) + protected ResponseEntity<Object> handleNotFoundException(NotFoundException e) { + return this.getErrorResponse( + new AppException(HttpStatus.NOT_FOUND.value(), "Resource not found.", e.getMessage(), e)); + } + + @ExceptionHandler(AccessDeniedException.class) + protected ResponseEntity<Object> handleAccessDeniedException(AccessDeniedException e) { + return this.getErrorResponse( + new AppException(HttpStatus.FORBIDDEN.value(), "Access denied", e.getMessage(), e)); + } + + @ExceptionHandler(Exception.class) + protected ResponseEntity<Object> handleGeneralException(Exception e) { + return this.getErrorResponse( + new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Server error.", + "An unknown error has occurred.", e)); + } + + private ResponseEntity<Object> getErrorResponse(AppException e) { + + String exceptionMsg = e.getOriginalException() != null + ? e.getOriginalException().getMessage() + : e.getError().getMessage(); + + if (e.getError().getCode() > 499) { + this.logger.error(exceptionMsg, e); + } else { + this.logger.warning(exceptionMsg, e); + } + + return new ResponseEntity<Object>(e.getError(), HttpStatus.resolve(e.getError().getCode())); + } +} \ No newline at end of file diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/IndexerQueueTaskBuilderIbm.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/IndexerQueueTaskBuilderIbm.java new file mode 100644 index 000000000..a429d1455 --- /dev/null +++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/IndexerQueueTaskBuilderIbm.java @@ -0,0 +1,86 @@ +package org.opengroup.osdu.indexer.ibm.util; + +import java.util.Map; + +import javax.inject.Inject; + +import org.opengroup.osdu.core.common.model.http.DpsHeaders; +import org.opengroup.osdu.core.common.model.search.RecordChangedMessages; +import org.opengroup.osdu.core.ibm.messagebus.IMessageFactory; +import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import com.google.gson.Gson; +import com.google.gson.JsonSyntaxException; + +@Primary +@Component +public class IndexerQueueTaskBuilderIbm extends IndexerQueueTaskBuilder { + private static final Logger logger = LoggerFactory.getLogger(IndexerQueueTaskBuilderIbm.class); + + @Inject + IMessageFactory mq; + + private Gson gson; + private final static String RETRY_STRING = "retry"; + private final static String ERROR_CODE = "errorCode"; + private final static String ERROR_MESSAGE = "errorMessage"; + + @Inject + public void init() { + gson = new Gson(); + } + + @Override + public void createWorkerTask(String payload, DpsHeaders headers) { + createTask(payload, headers); + } + + @Override + public void createReIndexTask(String payload, DpsHeaders headers) { + createTask(payload, headers); + } + + private void createTask(String payload, DpsHeaders headers) { + + try { + RecordChangedMessages receivedPayload = gson.fromJson(payload, RecordChangedMessages.class); + + Map<String, String> attributes = receivedPayload.getAttributes(); + int retryCount = 0; + if (attributes.containsKey(RETRY_STRING)) { + retryCount = Integer.parseInt(attributes.get(RETRY_STRING)); + retryCount++; + } else { + retryCount = 1; + } + attributes.put(RETRY_STRING, String.valueOf(retryCount)); + attributes.put(ERROR_CODE, "999"); //error code TBD + attributes.put(ERROR_MESSAGE, "Indexer could not process record"); + receivedPayload.setAttributes(attributes); + + // incase if we need to shift logic from indexer-queue-ibm/subscriber.java + /* + * if(Integer.parseInt(receivedPayload.getAttributes().get(RETRY_STRING))>3) { + * //add DLQ in IMessageFactory + * + * mq.sendMessage("DLQ", gson.toJson(receivedPayload)); } + */ + logger.info("Message send back to queue : " + receivedPayload); + mq.sendMessage(IMessageFactory.DEFAULT_QUEUE_NAME, gson.toJson(receivedPayload)); + } catch (JsonSyntaxException e) { + logger.error("JsonSyntaxException in IndexerQueueTaskBuilderIbm " + e.toString()); + e.printStackTrace(); + } catch (NumberFormatException e) { + logger.error("NumberFormatException in IndexerQueueTaskBuilderIbm " + e.toString()); + e.printStackTrace(); + } catch (Exception e) { + logger.error("Exception in IndexerQueueTaskBuilderIbm " + e.toString()); + e.printStackTrace(); + } + + } +} \ No newline at end of file diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java index 12fd218f8..6ddf941be 100644 --- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java +++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java @@ -53,10 +53,14 @@ public class RequestInfoImpl implements IRequestInfo { @Inject private TenantInfo tenantInfo; - + @Value("${DEPLOYMENT_ENVIRONMENT}") private String DEPLOYMENT_ENVIRONMENT; + private static final String INDEXER_API_KEY_HEADER="x-api-key"; + + @Value("${INDEXER_API_KEY}") + private String tokenFromProperty; @Override public DpsHeaders getHeaders() { @@ -65,9 +69,19 @@ public class RequestInfoImpl implements IRequestInfo { // throw to prevent null reference exception below throw new AppException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Invalid Headers", "Headers Map DpsHeaders is null"); } - DpsHeaders headers = this.getCoreServiceHeaders(headersMap.getHeaders()); - return headers; - } + DpsHeaders headers = this.getCoreServiceHeaders(headersMap.getHeaders()); + + if (headers.getHeaders().containsKey(INDEXER_API_KEY_HEADER)) { + String apiToken = headers.getHeaders().get(INDEXER_API_KEY_HEADER); + if (!apiToken.equals(tokenFromProperty)) { + logger.error("Indexer API Token in header is mismatched"); + throw new AppException(HttpStatus.SC_UNAUTHORIZED, "Indexer API Token in header mismatched.", "Indexer API Token in header mismatched."); + } + } else { + throw new AppException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Missing Header", "The headers "+ INDEXER_API_KEY_HEADER + " is missing!"); + } + return headers; + } @Override public String getPartitionId() { @@ -95,7 +109,8 @@ public class RequestInfoImpl implements IRequestInfo { @Override public boolean isTaskQueueRequest() { - //if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_QUEUE_KEY)) return false; + //if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_API_KEY_HEADER)) return false; + // String queueId = this.headersInfo.getHeadersMap().get(AppEngineHeaders.TASK_QUEUE_NAME); // return queueId.endsWith(Constants.INDEXER_QUEUE_IDENTIFIER); diff --git a/provider/indexer-ibm/src/main/resources/application.properties b/provider/indexer-ibm/src/main/resources/application.properties index 9a7a16cc4..701f7c846 100644 --- a/provider/indexer-ibm/src/main/resources/application.properties +++ b/provider/indexer-ibm/src/main/resources/application.properties @@ -64,3 +64,8 @@ ELASTIC_DATASTORE_ID=indexer-service ELASTIC_HOST=elasticsearch.com ELASTIC_PORT=443 ELASTIC_USER_PASSWORD=REPLACE_ME:REPLACE_ME + +#requeue logic +INDEXER_QUEUE_HOST="" +ibm.env.prefix=oc-local +INDEXER_API_KEY=abcds diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml index c9119b69b..62842b147 100644 --- a/testing/indexer-test-ibm/pom.xml +++ b/testing/indexer-test-ibm/pom.xml @@ -14,7 +14,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <cucumber.version>1.2.5</cucumber.version> - <os-core-lib-ibm.version>0.0.18</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.3.8-SNAPSHOT</os-core-lib-ibm.version> </properties> <dependencies> diff --git a/testing/indexer-test-ibm/src/main/resources/apikey.feature b/testing/indexer-test-ibm/src/main/resources/apikey.feature new file mode 100644 index 000000000..4be8e4eb3 --- /dev/null +++ b/testing/indexer-test-ibm/src/main/resources/apikey.feature @@ -0,0 +1,10 @@ +Feature: check the api key in header + This feature check the api key received from headers is matching with configured in environment + + Scenario Outline: compare the api key with configured environment key + When I pass api key + Then compare with key configured in properties file + + Examples: + | apiKey | + | "abcd" | diff --git a/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/RunTest.java b/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/RunTest.java index 4978ddfcc..897f02c15 100644 --- a/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/RunTest.java +++ b/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/RunTest.java @@ -6,7 +6,7 @@ import org.junit.runner.RunWith; @RunWith(Cucumber.class) @CucumberOptions( - features = "classpath:features/indexrecord/IndexRecord.feature", + features = {"classpath:features/indexrecord/IndexRecord.feature","classpath:apikey.feature"}, glue = {"classpath:org.opengroup.osdu.step_definitions/index/record"}, plugin = {"pretty", "junit:target/cucumber-reports/TEST-indexrecord.xml"}) public class RunTest { diff --git a/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java b/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java index 518b2b6f9..3c885b11c 100644 --- a/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java +++ b/testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java @@ -1,8 +1,25 @@ package org.opengroup.osdu.step_definitions.index.record; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; import org.opengroup.osdu.common.RecordSteps; +import org.opengroup.osdu.core.common.Constants; +import org.opengroup.osdu.core.common.http.HttpClient; +import org.opengroup.osdu.core.common.http.HttpRequest; +import org.opengroup.osdu.core.common.http.HttpResponse; +import org.opengroup.osdu.core.common.model.http.AppError; +import org.opengroup.osdu.core.common.model.http.DpsHeaders; +import org.opengroup.osdu.core.common.model.search.RecordChangedMessages; +import org.opengroup.osdu.core.ibm.util.Config; import org.opengroup.osdu.util.IBMHTTPClient; +import com.google.gson.Gson; + import cucumber.api.DataTable; import cucumber.api.Scenario; import cucumber.api.java.Before; @@ -48,5 +65,46 @@ public class Steps extends RecordSteps { public void iShouldGetTheNumberDocumentsForTheIndexInTheElasticSearchWithOutSkippedAttribute(int expectedCount, String index, String skippedAttributes) throws Throwable { super.iShouldGetTheNumberDocumentsForTheIndexInTheElasticSearchWithOutSkippedAttribute(expectedCount, index, skippedAttributes); } - + + @When("^I pass api key$") + public void i_pass_the_api_key() { + } + + @Then("^compare with key configured in properties file$") + public void compare_with_key_configured_in_propertiesFile() throws Throwable { + + final String CORRELATION_ID = "1234"; + final String OPENDES = "opendes"; + final Gson gson = new Gson(); + + String INDEXER_API_KEY = Config.getEnvironmentVariable("INDEXER_API_KEY"); + String INDEXER_HOST_URL = Config.getEnvironmentVariable("INDEXER_HOST_URL"); + + RecordChangedMessages recordChangeMessage = new RecordChangedMessages(); + + String data = "[{\"id\":\"opendes:doc:1234\",\"kind\":\"opendes:test:test:1.0.0\",\"op\":\"create\"}]"; + + Map<String, String> attributes = new HashMap<>(); + attributes.put("correlation-id", CORRELATION_ID); + attributes.put("data-partition-id", OPENDES); + recordChangeMessage.setAttributes(attributes); + recordChangeMessage.setData(data); + + String url = StringUtils.join(INDEXER_HOST_URL, Constants.WORKER_RELATIVE_URL); + HttpClient httpClient = new HttpClient(); + DpsHeaders dpsHeaders = new DpsHeaders(); + dpsHeaders.put("x-api-key", INDEXER_API_KEY); + dpsHeaders.put("correlation-id", CORRELATION_ID); + dpsHeaders.put("data-partition-id", OPENDES); + + HttpRequest rq = HttpRequest.post(recordChangeMessage).url(url).headers(dpsHeaders.getHeaders()).build(); + HttpResponse result = httpClient.send(rq); + if(result.hasException().equals(false) && result.getResponseCode() == 500) { + assertTrue(result.getResponseCode() == 500); + } else { + AppError error = gson.fromJson(result.getBody(), AppError.class); + assertFalse("Token is mismatched", error.getCode() == 401); + } + + } } \ No newline at end of file -- GitLab