agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13274 from overleaf/csh-issue-13004-cleanup-custom-code

Browse Source 
Remove apiScheme from GCS

GitOrigin-RevId: c948287cb00c7bc432c797bfdfa92a79b84d1bed
This commit is contained in:
Christopher Hoskin
2023-06-02 08:05:10 +00:00
committed by Copybot
parent 9ddc27d919
commit 5fbd5e21a2
15 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/docstore/config/settings.defaults.js
-1
View File
@@ -67,7 +67,6 @@ if (
if (process.env.GCS_API_ENDPOINT) {
Settings.docstore.gcs.endpoint = {
apiEndpoint: process.env.GCS_API_ENDPOINT,
apiScheme: process.env.GCS_API_SCHEME,
projectId: process.env.GCS_PROJECT_ID,
}
}
services/docstore/docker-compose.ci.yml
+1 -2
View File
@@ -27,8 +27,7 @@ services:
ANALYTICS_QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
services/docstore/docker-compose.yml
+1 -2
View File
@@ -36,8 +36,7 @@ services:
ANALYTICS_QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
services/filestore/config/settings.defaults.js
-1
View File
@@ -53,7 +53,6 @@ const settings = {
endpoint: process.env.GCS_API_ENDPOINT
? {
apiEndpoint: process.env.GCS_API_ENDPOINT,
apiScheme: process.env.GCS_API_SCHEME,
projectId: process.env.GCS_PROJECT_ID,
}
: undefined,
services/filestore/docker-compose.ci.yml
+1 -2
View File
@@ -28,8 +28,7 @@ services:
AWS_S3_PATH_STYLE: 'true'
AWS_ACCESS_KEY_ID: fake
AWS_SECRET_ACCESS_KEY: fake
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
services/filestore/docker-compose.yml
+1 -2
View File
@@ -43,8 +43,7 @@ services:
AWS_S3_PATH_STYLE: 'true'
AWS_ACCESS_KEY_ID: fake
AWS_SECRET_ACCESS_KEY: fake
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
services/filestore/test/acceptance/js/TestConfig.js
-1
View File
@@ -23,7 +23,6 @@ function gcsConfig() {
return {
endpoint: {
apiEndpoint: process.env.GCS_API_ENDPOINT,
apiScheme: process.env.GCS_API_SCHEME,
projectId: 'fake',
},
directoryKeyRegex: /^[0-9a-fA-F]{24}\/[0-9a-fA-F]{24}/,
services/history-v1/config/custom-environment-variables.json
-1
View File
@@ -18,7 +18,6 @@
"unlockBeforeDelete": "GCS_UNLOCK_BEFORE_DELETE",
"endpoint": {
"apiEndpoint": "GCS_API_ENDPOINT",
"apiScheme": "GCS_API_SCHEME",
"projectId": "GCS_PROJECT_ID"
}
},
services/history-v1/config/development.json
+1 -2
View File
@@ -8,8 +8,7 @@
"gcs": {
"unsignedUrls": "true",
"endpoint": {
"apiEndpoint": "fake-gcs:9090",
"apiScheme": "http",
"apiEndpoint": "http://fake-gcs:9090",
"projectId": "fake"
}
}
services/history-v1/config/test.json
+1 -2
View File
@@ -5,8 +5,7 @@
"gcs": {
"unsignedUrls": "true",
"endpoint": {
"apiEndpoint": "gcs:9090",
"apiScheme": "http",
"apiEndpoint": "http://gcs:9090",
"projectId": "fake"
}
}
services/history-v1/docker-compose.ci.yml
+1 -2
View File
@@ -24,8 +24,7 @@ services:
ANALYTICS_QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
services/history-v1/docker-compose.yml
+1 -2
View File
@@ -33,8 +33,7 @@ services:
ANALYTICS_QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
GCS_API_ENDPOINT: gcs:9090
GCS_API_SCHEME: http
GCS_API_ENDPOINT: http://gcs:9090
GCS_PROJECT_ID: fake
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}