Skip to content

Commit

Permalink
Add AWS endpoint url preference
Browse files Browse the repository at this point in the history
  • Loading branch information
jrobinso committed Jan 16, 2025
1 parent 816c97e commit 67c0777
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/main/java/org/broad/igv/prefs/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,12 @@ private Constants() {
public static final String DB_NAME = "DB_NAME";
public static final String DB_PORT = "DB_PORT";

// OAuth provisioning
// OAuth and AWS
public static final String PROVISIONING_URL = "PROVISIONING.URL";
public static final String PROVISIONING_URL_DEFAULT = "PROVISIONING_URL_DEFAULT";

public static final String AWS_ENDPOINT_URL = "AWS_ENDPOINT_URL";

// JBrowse circular view integration
public static final String CIRC_VIEW_ENABLED = "CIRC_VIEW_ENABLED";
public static final String CIRC_VIEW_PORT = "CIRC_VIEW_PORT";
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/broad/igv/util/AmazonUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.broad.igv.oauth.OAuthUtils;
import org.broad.igv.logging.LogManager;
import org.broad.igv.logging.Logger;
import org.broad.igv.prefs.Constants;
import org.broad.igv.prefs.PreferencesManager;
import org.broad.igv.ui.IGVMenuBar;
import software.amazon.awssdk.auth.credentials.*;
Expand Down Expand Up @@ -590,7 +591,7 @@ private static String getEndpointURL() throws IOException {
if ("UNKNOWN".equals(endpointURL)) {

// IGV preference
endpointURL = PreferencesManager.getPreferences().get("endpoint_url");
endpointURL = PreferencesManager.getPreferences().get(Constants.AWS_ENDPOINT_URL);
if (endpointURL != null) {
return endpointURL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/org/broad/igv/prefs/preferences.tab
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ MASTER_RESOURCE_FILE_KEY Data registry URL string https://igv.org/genomes/regist
---
PROVISIONING.URL OAuth provisioning URL string null
---

BLAT_URL BLAT URL String https://genome.ucsc.edu/cgi-bin/hgBlat
BLAT_URL BLAT URL string https://genome.ucsc.edu/cgi-bin/hgBlat
---
AWS_ENDPOINT_URL AWS endpoint URL string null

## Tooltip
TOOLTIP.INITIAL_DELAY Tooltip inital delay (ms) integer 50
Expand Down

0 comments on commit 67c0777

Please sign in to comment.