Skip to content

Commit

Permalink
Release CLI v0.6 [release]
Browse files Browse the repository at this point in the history
* Set CLI version 0.6 and API 1.9.0

* Fix info version tests

* Rename TOWER_OUTPUT_FORMAT to TOWER_CLI_OUTPUT_FORMAT [skip ci]

* Add missing reflection entry

* Add missing reflection entries
  • Loading branch information
jordeu authored Apr 19, 2022
1 parent 31c9258 commit c40a94f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.1
0.6.0
2 changes: 1 addition & 1 deletion VERSION-API
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7
1.9
13 changes: 11 additions & 2 deletions conf/reflect-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@
"name":"com.sun.crypto.provider.GaloisCounterMode$AESGCM",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"com.sun.crypto.provider.HmacCore$HmacSHA256",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"com.sun.crypto.provider.TlsKeyMaterialGenerator",
"methods":[{"name":"<init>","parameterTypes":[] }]
Expand Down Expand Up @@ -639,7 +643,8 @@
{
"name":"io.seqera.tower.cli.commands.credentials.CredentialsRefOptions$CredentialsRef",
"allDeclaredFields":true,
"queryAllDeclaredMethods":true
"queryAllDeclaredMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"io.seqera.tower.cli.commands.credentials.DeleteCmd",
Expand Down Expand Up @@ -1894,10 +1899,14 @@
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true,
"methods":[
{"name":"<init>","parameterTypes":[] },
{"name":"getDiscriminator","parameterTypes":[] },
{"name":"getPassword","parameterTypes":[] },
{"name":"getRegistry","parameterTypes":[] },
{"name":"getUserName","parameterTypes":[] }
{"name":"getUserName","parameterTypes":[] },
{"name":"setPassword","parameterTypes":["java.lang.String"] },
{"name":"setRegistry","parameterTypes":["java.lang.String"] },
{"name":"setUserName","parameterTypes":["java.lang.String"] }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/seqera/tower/cli/Tower.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class Tower extends AbstractCmd {
@Option(names = {"-u", "--url"}, description = "Tower server API endpoint URL (TOWER_API_ENDPOINT) [default: 'tower.nf'].", defaultValue = "${TOWER_API_ENDPOINT:-https://api.tower.nf}", required = true)
public String url;

@Option(names = {"-o", "--output"}, description = "Show output in defined format (only the 'json' option is available at the moment).", defaultValue = "${TOWER_OUTPUT_FORMAT:-console}")
@Option(names = {"-o", "--output"}, description = "Show output in defined format (only the 'json' option is available at the moment).", defaultValue = "${TOWER_CLI_OUTPUT_FORMAT:-console}")
public OutputType output;

@Option(names = {"-v", "--verbose"}, description = "Show HTTP request/response logs at stderr.")
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/seqera/tower/cli/InfoCmdTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void testInfo(OutputType format, MockServerClient mock) throws IOException {
Map<String, String> opts = new HashMap<>();
opts.put("cliVersion", getCliVersion() );
opts.put("cliApiVersion", getCliApiVersion());
opts.put("towerApiVersion", "1.7.0");
opts.put("towerApiVersion", "1.9.0");
opts.put("towerVersion", "21.10.0");
opts.put("towerApiEndpoint", "http://localhost:"+mock.getPort());
opts.put("userName", "jordi");
Expand Down Expand Up @@ -81,7 +81,7 @@ void testInfoStatusTokenFail(MockServerClient mock) throws IOException {
Map<String, String> opts = new HashMap<>();
opts.put("cliVersion", getCliVersion() );
opts.put("cliApiVersion", getCliApiVersion());
opts.put("towerApiVersion", "1.7.0");
opts.put("towerApiVersion", "1.9.0");
opts.put("towerVersion", "21.10.0");
opts.put("towerApiEndpoint", "http://localhost:"+mock.getPort());
opts.put("userName", null);
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/runcmd/info/service-info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"serviceInfo": {
"version": "21.10.0",
"apiVersion": "1.7.0",
"apiVersion": "1.9.0",
"commitId": "b101b372",
"authTypes": [
"github",
Expand Down

0 comments on commit c40a94f

Please sign in to comment.