Support files embedded within a JAR in CqlMigrate

oliverlockwood commented 8 years ago

This is the first pass of a fix to https://github.com/sky-uk/cqlmigrate/issues/15.

The first two commits set up a failing functional test; the last is the actual code fix.

We have a few concerns with the current approach and would welcome feedback or input:

The func test consists of a JAR launched from Gradle. A previous iteration (the first commit) had a jar launched from the command line within a Java integration test - arguably even more hokey. Unfortunately we've not been able to get a repro by any means other than command-line invocation of the JAR (which to be fair does mirror how UMV uses CqlMigrate in reality right now).
We don't have setup or cleanup around the test - we did when it was in the Java integration test, so one option would be to go back towards that model. As it stands, there's a dependency on the existence of the locks table with the lock for the cqlmigrate_func_test keyspace not being held.
(Related to above point) Currently the tests work on my machine :smiley: but they do have a hardcoded Cassandra address and port, so are failing on Travis...
Is there anything better we should be doing around the actual CQL files we're embedding in the JAR, or is what we have OK for now?

chbatey commented 8 years ago

Please use git pair commit rather than commit as 'Cirrus Pairing' station

+1 to the approach of a test against the built jar

chbatey commented 8 years ago

If we have a fucntional module I think we should move the main build into a module and have the common gradle stuff in the parent

oliverlockwood commented 8 years ago

@chbatey a number of changes made, so I think this is ready for re-review and potentially for merge

tests no longer need a separate Gradle module, we're just building a fat test-jar and hitting that in a functional task
the embedded-cassandra issues have been resolved and it's now running without external Cassandra dependencies. You can see from https://travis-ci.org/sky-uk/cqlmigrate/builds/98094743 that the Cassandra shutdown hooks are being run.

jsravn commented 8 years ago

lgtm

I suggest we squash the commits before merging.

oliverlockwood commented 8 years ago

@jsravn @balooo @chbatey squashed as requested. Travis build succeeded for PR but failed for push in the test phase (not the new functional phase), I'm not sure why as it works fine locally. Is there a way to make it try again?

chbatey commented 8 years ago

I dont think we should use internal jira numbers in an external project tho happy to just say that is for the future unless you feel obliged to amend

chbatey commented 8 years ago

Couple of minor comments then LGTM

balooo commented 8 years ago

lgtm

sky-uk / cqlmigrate

Support files embedded within a JAR in CqlMigrate #16