Crypt4GH #35
Crypt4GH #35
Conversation
This reverts commit 7635bea
| @@ -2,6 +2,6 @@ | |||
|
|
|||
| public enum Format { | |||
|
|
|||
| PLAIN, AES, AES128, AES256, GPG_SYMMETRIC, GPG_ASYMMETRIC | |||
| PLAIN, CRYPT4GH | |||
There was a problem hiding this comment.
You should still include AES as target format; even if i is not used at present. GPG can be discarded.
|
I just had one comment. Otherwise it looks good to me. I will try and deploy/test this code later this week. |
|
Thanks! I'll fix the enum tomorrow. |
|
Done. |
|
I can't actually compile it now (I created a fresh Ubuntu image for this test): I keep looking.. |
|
Ok.. 'sudo mvn package' works.. it is just my setting in the fresh VM then! |
ega-data-api-res/pom.xml
Outdated
| @@ -241,7 +261,8 @@ | |||
| <configuration> | |||
| <imageName>${dockerRegistry}/res:${image.version}</imageName> | |||
| <baseImage>java:8</baseImage> | |||
| <entryPoint>["java", "${debug.config}${debug.res.port}", "-jar", "/${project.build.finalName}.jar"] | |||
| <entryPoint>["java", "${debug.config}${debug.res.port}", "-jar", | |||
| "/${project.build.finalName}.jar"] | |||
There was a problem hiding this comment.
Because of formatting, I think that the "/${project.build.finalName}.jar" in newline will not work properly in debug mode, It should be on the same line. Can you check if it work with this?
There was a problem hiding this comment.
Oh, I missed that. You are right, it should be on the same line, I'll fix it.
| @@ -54,7 +54,10 @@ | |||
| import static eu.elixir.ega.ebi.shared.Constants.FILEDATABASE_SERVICE; | |||
| import static eu.elixir.ega.ebi.shared.Constants.RES_SERVICE; | |||
|
|
|||
| @Profile("LocalEGA") | |||
There was a problem hiding this comment.
I just noticed this in the integration test now..
APPLICATION FAILED TO START
Description:
Field fileService in eu.elixir.ega.ebi.dataedge.rest.FileController required a single bean, but 2 were found:
- remoteFileServiceImpl: defined in URL [jar:file:/nfs/ega/public/srv/homes/ega-prod/ngs_3/test/ega-data-api-dataedge-0.0.1-SNAPSHOT.jar!/BOOT-INF/classes!/eu/elixir/ega/ebi/dataedge/service/internal/RemoteFileServiceImpl.class]
- localEGARemoteFileServiceImpl: defined in URL [jar:file:/nfs/ega/public/srv/homes/ega-prod/ngs_3/test/ega-data-api-dataedge-0.0.1-SNAPSHOT.jar!/BOOT-INF/classes!/eu/elixir/ega/ebi/dataedge/service/internal/LocalEGARemoteFileServiceImpl.class]
I think we need to keep profiles for the EBI deployment, as long as we have multiple beans implementing the same interface. Alternatively, we could make one @primary
Crypt4GH support in Data Out solution + additional unit-tests to cover it.
Some endpoints are extended, but only with optional parameters (e.g.
IV), so it should not affect an existing behavior.