Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Reconciled lerna package split #444

Merged
merged 63 commits into from
Mar 16, 2018
Merged

Reconciled lerna package split #444

merged 63 commits into from
Mar 16, 2018

Conversation

dberesford
Copy link
Contributor

Merge out from master to @wprl's lerna fork https://github.com/wprl/udaru/tree/lerna-ize -
this supersedes #439.

William Riley-Land and others added 3 commits November 17, 2017 14:52
…na-ize

Conflicts:
	docs/swagger/swagger-json.js
	package-lock.json
	package.json
	packages/udaru-hapi-plugin/index.js
@coveralls
Copy link

Coverage Status

Coverage decreased (-2.2%) to 94.041% when pulling b02d0de on wprl-lerna-ize into a3a56a7 on master.

@coveralls
Copy link

coveralls commented Jan 26, 2018

Coverage Status

Coverage decreased (-2.09%) to 94.176% when pulling 4065f6b on wprl-lerna-ize into a3a56a7 on master.

@ghost
Copy link

ghost commented Jan 26, 2018

LGTM :)

Mihai Dima and others added 20 commits February 2, 2018 19:53
fix: allow empty results when the user is in no teams
volume data insertion and autocannon bench tests
jimmymintzer and others added 4 commits March 2, 2018 17:09
Search teams, @jimmymintzer can you rebase the nested teams against this merge and check the response model as I think it might break
* add nested teams to udaru core

* add nested endpoint

* add e2e test for nested team limit

* updating version and changes.md, updated pbac to 0.3.0

* use the buildParams directly to create base resource for user requests

* return 404 if nested team is not found
dberesford and others added 5 commits March 8, 2018 00:07
* Support in udaru core for searching users

* Linting fix

* Added some sanity check sql injection tests

* Linting fix (again)

* Linting fix (again again)

* expose public user search route

* add search users in a team

* Updated end to end testing for teams search and team users search

* updated version and changes

* updated changes.md 4.1.0 date
@cianfoley-nearform
Copy link
Contributor

cianfoley-nearform commented Mar 14, 2018

Hi Guys,

I merged everything and tests are passing, that's no guarantee that everything is perfect at this point but please do pull it down, lerna clean and lerna bootstrap (npm i works from root) and build and try out stuff... for some reason some files like swagger.js ended up being a very old version when i rebased so I overwrote that file, same with server.js under udaru-server... it was missing forked child stuff (not sure why it didn't merge, maybe a disconnect when moving to server folder e.g. delete commit and re-add?)... I'm hoping there's not other places like that but it seems as most recent search code is in place in the core and server and tests are in place...

I tried a good few commands out and regenerated the swagger docs, seems OK and re-committed those
Coverage works
Updated volume runner to work
Updated autocannon and many other references to get working
Syncrhonised versions across packages, updated lab

Let me know if you find any issues, it needs a review now... the commit history above is all over the place now because of rebase with master...

Merging can be performed automatically but would like someone to review and make sure ok

Coverage has dropped on udaru-core as udaru-server was providing some coverage for this.

Need a release plan strategy next as there are now 4 packages to release

@dberesford @mihaidma

need air...

@dberesford
Copy link
Contributor Author

Great job @cianfoley-nearform! I did some sanity checks locally and it all looks good to me. I'm tempted to hit the squash and merge button before master moves on any further ;-)

One odd thing though, I ran npm test from root and all the tests in each of the packages runs fine, however, if I cd into packages/udaru and run npm test I get 69 of 211 tests failed. Any idea why? We should be able to develop and test each of these packages individually so this is very odd.

@cianfoley-nearform
Copy link
Contributor

@dberesford it might be because the test db is initialised in the root package, we might need to set up the test fixture npm command in each sub project

@cianfoley-nearform
Copy link
Contributor

Also, I wonder should I compare each file with master individually (especially in udaru core) to see if anything has gone awry?

@cianfoley-nearform
Copy link
Contributor

cianfoley-nearform commented Mar 16, 2018

@dberesford @mihaidma @IvanJov @jimmymintzer

Please review:

  • Moved udaru to udaru-core
  • Ivan's SQL module merged in
  • Updated versions everywhere to 5.0.0 because of 404 changes on 2 endpoints in Jimmy's work, updated swagger too

Some concerns:
There was a slight disconnect on merge sql.js wasn't deleted and 2 files didn't have the reference (but in Ivan's commit the file had been removed), this concerns me because if there were other changes to those files they may not be merged... as stated in earlier comment there was disconnect with swagger.js too (where the models are defined, not the routes)

@mihaidma the docker file you created in root was also deleted in a previous commit that took effect on merge (maybe it's covered off in compose now)

All tests pass in any case (memory leak issue solved), I had to change test on policy conflict and the message coming up from udaru because the err object had no err.detail, this is a concern too (you'll see in commit 4e58015).

Final issues, which can probably be addressed later based on prioritisation of tasks, is that we probably need to move anything related to test into test package e.g. loadFixtures, loadVolumeDb etc. so that all sub projects can init db before they run their independent tests.

Also each project may require it's own documentation potentially but as they're part of single git hub project may not be 100% necessary once we document them individually correctly and maybe link out to individual sections from within each projects own readmes etc

@cianfoley-nearform cianfoley-nearform self-assigned this Mar 16, 2018
@dberesford dberesford merged commit 02dc5ce into master Mar 16, 2018
@dberesford dberesford deleted the wprl-lerna-ize branch March 16, 2018 17:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants