Skip to content

Commit

Permalink
feat(KUI-1323): rename env variable KURS_INFO_API_... to KURSINFO_API…
Browse files Browse the repository at this point in the history
…_...
  • Loading branch information
karlandindrakryggen committed May 20, 2024
1 parent 54362f2 commit 28a9392
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .azure/prod.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"APPLICATIONINSIGHTS_CONNECTION_STRING",
"KURSPLAN_API_KEY",
"KURSPLAN_API_URI",
"KURS_INFO_API_KEY",
"KURSINFO_API_KEY",
"KURS_PM_DATA_API_KEY",
"REDIS_URI",
"SESSION_KEY",
Expand All @@ -24,7 +24,7 @@
"CONSOLE_ENABLED": "false",
"IMAGE_STORAGE_URI": "https://kursinfostorageprod.blob.core.windows.net/kursinfo-image-container/",
"KOPPS_URI": "https://api.kth.se/api/kopps/v2/?defaultTimeout=60000",
"KURS_INFO_API_URI": "https://api.kth.se/api/kursinfo?defaultTimeout=10000",
"KURSINFO_API_URI": "https://api.kth.se/api/kursinfo?defaultTimeout=10000",
"KURS_PM_DATA_API_URI": "https://api.kth.se/api/kurs-pm-data?defaultTimeout=10000",
"LOGGING_ACCESS_LOG": "true",
"LOGGING_LEVEL": "INFO",
Expand Down
4 changes: 2 additions & 2 deletions .azure/ref.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"APPLICATIONINSIGHTS_CONNECTION_STRING",
"KURSPLAN_API_KEY",
"KURSPLAN_API_URI",
"KURS_INFO_API_KEY",
"KURSINFO_API_KEY",
"KURS_PM_DATA_API_KEY",
"REDIS_URI",
"SESSION_KEY",
Expand All @@ -24,7 +24,7 @@
"CONSOLE_LOG": "true",
"IMAGE_STORAGE_URI": "https://kursinfostoragestage.blob.core.windows.net/kursinfo-image-container/",
"KOPPS_URI": "https://api-r.referens.sys.kth.se/api/kopps/v2/?defaultTimeout=60000",
"KURS_INFO_API_URI": "https://app-r.referens.sys.kth.se/api/kursinfo?defaultTimeout=10000",
"KURSINFO_API_URI": "https://app-r.referens.sys.kth.se/api/kursinfo?defaultTimeout=10000",
"KURS_PM_DATA_API_URI": "https://api-r.referens.sys.kth.se/api/kurs-pm-data?defaultTimeout=10000",
"LOGGING_ACCESS_LOG": "true",
"LOGGING_LEVEL": "TRACE",
Expand Down
2 changes: 1 addition & 1 deletion .env.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KURS_PM_DATA_API_KEY=[Available in Azure KeyVault]
KURS_INFO_API_KEY=[Available in Azure KeyVault]
KURSINFO_API_KEY=[Available in Azure KeyVault]
KURSPLAN_API_KEY=[Available in Azure KeyVault]

REDIS_URI=[Available in Azure KeyVault]
4 changes: 2 additions & 2 deletions config/serverSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ module.exports = {
// API keys
apiKey: {
kursPmDataApi: getEnv('KURS_PM_DATA_API_KEY', devDefaults('1234')),
kursInfoApi: getEnv('KURS_INFO_API_KEY', devDefaults('1234')),
kursInfoApi: getEnv('KURSINFO_API_KEY', devDefaults('1234')),
kursplanApi: getEnv('KURSPLAN_API_KEY', devDefaults('5678')),
},

// Service API's
nodeApi: {
kursPmDataApi: unpackNodeApiConfig('KURS_PM_DATA_API_URI', devKursPmDataApi),
kursInfoApi: unpackNodeApiConfig('KURS_INFO_API_URI', devKursInfoApi),
kursInfoApi: unpackNodeApiConfig('KURSINFO_API_URI', devKursInfoApi),
kursplanApi: unpackNodeApiConfig('KURSPLAN_API_URI', devKursplanApi),
},

Expand Down
4 changes: 2 additions & 2 deletions docker-compose-integration-tests-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ services:
- LOGGING_ACCESS_LOG=true
- KURS_PM_DATA_API_URI=http://mock-api:3000/kurs-pm
- KURS_PM_DATA_API_KEY=secretpassword
- KURS_INFO_API_URI=http://mock-api:3000/kursinfo
- KURS_INFO_API_KEY=secretpassword
- KURSINFO_API_URI=http://mock-api:3000/kursinfo
- KURSINFO_API_KEY=secretpassword
- KURSPLAN_API_URI=http://mock-api:3000/kursplan
- KURSPLAN_API_KEY=secretpassword
- REDIS_URI=redis://redis:6379
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-performance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ services:
LOGGING_ACCESS_LOG: 'false'
KURS_PM_DATA_API_URI: 'http://mock-api:3000/kurs-pm'
KURS_PM_DATA_API_KEY: 'secretpassword'
KURS_INFO_API_URI: 'http://mock-api:3000/kursinfo'
KURS_INFO_API_KEY: 'secretpassword'
KURSINFO_API_URI: 'http://mock-api:3000/kursinfo'
KURSINFO_API_KEY: 'secretpassword'
KURSPLAN_API_URI: 'http://mock-api:3000/kursplan'
KURSPLAN_API_KEY: 'secretpassword'
REDIS_URI: 'redis://redis:6379'
Expand Down

0 comments on commit 28a9392

Please sign in to comment.