Skip to content

Commit

Permalink
Use HTTPS ingest api url (#120)
Browse files Browse the repository at this point in the history
* Use https ingest api url
  • Loading branch information
samanehsan authored and rexwangcc committed Jan 23, 2019
1 parent fde765e commit 2fcaef7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions deploy/config_files/config.sh.ctmpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

export DSS_URL="https://dss.staging.data.humancellatlas.org/v1"
export SCHEMA_URL="http://schema.staging.data.humancellatlas.org/"
export INGEST_URL="http://api.ingest.staging.data.humancellatlas.org/"
export INGEST_URL="https://api.ingest.staging.data.humancellatlas.org/"
export DOMAIN="pipelines.staging.data.humancellatlas.org"
{{end}}

Expand All @@ -90,7 +90,7 @@

export DSS_URL="https://dss.data.humancellatlas.org/v1"
export SCHEMA_URL="https://schema.humancellatlas.org/"
export INGEST_URL="http://api.ingest.data.humancellatlas.org/"
export INGEST_URL="https://api.ingest.data.humancellatlas.org/"
export DOMAIN="pipelines.data.humancellatlas.org"

{{end}}
Expand Down
2 changes: 1 addition & 1 deletion lira/test/data/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"notification_token": "test",
"MAX_CONTENT_LENGTH": 10000,
"dss_url": "https://dss.dev.data.humancellatlas.org/v1",
"ingest_url": "http://api.ingest.dev.data.humancellatlas.org/",
"ingest_url": "https://api.ingest.dev.data.humancellatlas.org/",
"schema_url": "https://schema.humancellatlas.org",
"submit_wdl": "https://raw.githubusercontent.com/HumanCellAtlas/pipeline-tools/v0.1.5/adapter_pipelines/submit.wdl",
"wdls": [
Expand Down
2 changes: 1 addition & 1 deletion lira/test/test_get_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_get_version_can_fetch_correct_settings_info(self):
self.assertEqual(response.status_code, 200)
self.assertEqual(json_response.get('settings_info').get('launch_time'), '2018-01-01 00:59:59 +00:00')
self.assertEqual(json_response.get('settings_info').get('run_mode'), 'live_run')
self.assertEqual(json_response.get('settings_info').get('ingest_url'), 'http://api.ingest.dev.data.humancellatlas.org/')
self.assertEqual(json_response.get('settings_info').get('ingest_url'), 'https://api.ingest.dev.data.humancellatlas.org/')
self.assertEqual(json_response.get('settings_info').get('data_store_url'), 'https://dss.dev.data.humancellatlas.org/v1')
self.assertEqual(json_response.get('settings_info').get('cromwell_url'), 'https://cromwell.mint-dev.broadinstitute.org/api/workflows/v1')
self.assertEqual(json_response.get('settings_info').get('max_cromwell_retries'), 0)
Expand Down
2 changes: 1 addition & 1 deletion lira/test/test_lira_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ def test_compose_inputs(self):
self.assertEqual(inputs['foo.bundle_version'], 'baz')
self.assertEqual(inputs['foo.runtime_environment'], 'dev')
self.assertEqual(inputs['foo.dss_url'], 'https://dss.dev.data.humancellatlas.org/v1')
self.assertEqual(inputs['foo.submit_url'], 'http://api.ingest.dev.data.humancellatlas.org/')
self.assertEqual(inputs['foo.submit_url'], 'https://api.ingest.dev.data.humancellatlas.org/')
self.assertEqual(inputs['foo.use_caas'], False)
self.assertEqual(inputs['foo.cromwell_url'], 'https://cromwell.mint-dev.broadinstitute.org/api/workflows/v1')

Expand Down

0 comments on commit 2fcaef7

Please sign in to comment.