8000 Display server-url by KimberleyChong · Pull Request #220 · dockstore/dockstore-cli · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Display server-url #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 27, 2023
Merged

Display server-url #220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31aed0d
display server-url in --server-metadata
KimberleyChong Jan 26, 2023
0b369cb
remove random whitespace
KimberleyChong Jan 26, 2023
112c04e
change to say: Dockstore server
KimberleyChong Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dockstore-client/src/main/java/io/dockstore/client/cli/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public class Client {
private static ObjectMapper objectMapper;

private String configFile = null;
private String serverUrl = null;
private Ga4GhApi ga4ghApi;
private Ga4Ghv20Api ga4ghv20Api;
private ExtendedGa4GhApi extendedGA4GHApi;
Expand Down Expand Up @@ -643,6 +644,7 @@ private void serverMetadata() {
final Metadata metadata = ga4ghApi.metadataGet();
final Gson gson = io.cwl.avro.CWL.getTypeSafeCWLToolDocument();
out(gson.toJson(metadata));
out("Dockstore server: " + serverUrl);
} catch (ApiException ex) {
exceptionMessage(ex, "", API_ERROR);
} catch (CWL.GsonBuildException ex) {
Expand Down Expand Up @@ -795,7 +797,7 @@ public void setupClientEnvironment(List<String> args) {
INIConfiguration config = getIniConfiguration(args);
// pull out the variables from the config
String token = config.getString("token", "");
String serverUrl = config.getString("server-url", "https://dockstore.org/api");
serverUrl = config.getString("server-url", "https://dockstore.org/api");
if (serverUrl.contains(":8443")) {
err(DEPRECATED_PORT_MESSAGE);
}
Expand Down
0