Rename env vars
This commit is contained in:
parent
bb2bf393ab
commit
f13d70d5be
12
.env
12
.env
|
@ -81,9 +81,9 @@ _APP_DOCKER_HUB_USERNAME=
|
||||||
_APP_DOCKER_HUB_PASSWORD=
|
_APP_DOCKER_HUB_PASSWORD=
|
||||||
_APP_CONSOLE_GITHUB_SECRET=
|
_APP_CONSOLE_GITHUB_SECRET=
|
||||||
_APP_CONSOLE_GITHUB_APP_ID=
|
_APP_CONSOLE_GITHUB_APP_ID=
|
||||||
VCS_GITHUB_APP_NAME=
|
_APP_VCS_GITHUB_APP_NAME=
|
||||||
VCS_GITHUB_PRIVATE_KEY=""
|
_APP_VCS_GITHUB_PRIVATE_KEY=""
|
||||||
VCS_GITHUB_APP_ID=
|
_APP_VCS_GITHUB_APP_ID=
|
||||||
VCS_GITHUB_CLIENT_ID=
|
_APP_VCS_GITHUB_CLIENT_ID=
|
||||||
VCS_GITHUB_CLIENT_SECRET=
|
_APP_VCS_GITHUB_CLIENT_SECRET=
|
||||||
VCS_GITHUB_WEBHOOK_SECRET=
|
_APP_VCS_GITHUB_WEBHOOK_SECRET=
|
|
@ -256,7 +256,7 @@ App::get('/v1/vcs/github/installations')
|
||||||
$user->setAttribute('prefs', $prefs);
|
$user->setAttribute('prefs', $prefs);
|
||||||
$dbForConsole->updateDocument('users', $user->getId(), $user);
|
$dbForConsole->updateDocument('users', $user->getId(), $user);
|
||||||
|
|
||||||
$appName = App::getEnv('VCS_GITHUB_APP_NAME');
|
$appName = App::getEnv('_APP_VCS_GITHUB_APP_NAME');
|
||||||
$response
|
$response
|
||||||
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
|
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
|
||||||
->addHeader('Pragma', 'no-cache')
|
->addHeader('Pragma', 'no-cache')
|
||||||
|
@ -312,7 +312,7 @@ App::get('/v1/vcs/github/redirect')
|
||||||
|
|
||||||
// OAuth Authroization
|
// OAuth Authroization
|
||||||
if (!empty($code)) {
|
if (!empty($code)) {
|
||||||
$oauth2 = new OAuth2Github(App::getEnv('VCS_GITHUB_CLIENT_ID', ''), App::getEnv('VCS_GITHUB_CLIENT_SECRET', ''), "");
|
$oauth2 = new OAuth2Github(App::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''), App::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''), "");
|
||||||
$accessToken = $oauth2->getAccessToken($code) ?? '';
|
$accessToken = $oauth2->getAccessToken($code) ?? '';
|
||||||
$refreshToken = $oauth2->getRefreshToken($code) ?? '';
|
$refreshToken = $oauth2->getRefreshToken($code) ?? '';
|
||||||
$accessTokenExpiry = $oauth2->getAccessTokenExpiry($code) ?? '';
|
$accessTokenExpiry = $oauth2->getAccessTokenExpiry($code) ?? '';
|
||||||
|
@ -328,8 +328,8 @@ App::get('/v1/vcs/github/redirect')
|
||||||
|
|
||||||
// Create / Update installation
|
// Create / Update installation
|
||||||
if (!empty($installationId)) {
|
if (!empty($installationId)) {
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
$owner = $github->getOwnerName($installationId) ?? '';
|
$owner = $github->getOwnerName($installationId) ?? '';
|
||||||
|
|
||||||
|
@ -403,8 +403,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI
|
||||||
}
|
}
|
||||||
|
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
|
|
||||||
$owner = $github->getOwnerName($installationId);
|
$owner = $github->getOwnerName($installationId);
|
||||||
|
@ -469,8 +469,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories')
|
||||||
}
|
}
|
||||||
|
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
|
|
||||||
$page = 1;
|
$page = 1;
|
||||||
|
@ -564,7 +564,7 @@ App::post('/v1/vcs/github/installations/:installationId/repositories')
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($installation->getAttribute('personal', false) === true) {
|
if ($installation->getAttribute('personal', false) === true) {
|
||||||
$oauth2 = new OAuth2Github(App::getEnv('VCS_GITHUB_CLIENT_ID', ''), App::getEnv('VCS_GITHUB_CLIENT_SECRET', ''), "");
|
$oauth2 = new OAuth2Github(App::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''), App::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''), "");
|
||||||
|
|
||||||
$accessToken = $user->getAttribute('vcsGithubAccessToken');
|
$accessToken = $user->getAttribute('vcsGithubAccessToken');
|
||||||
$refreshToken = $user->getAttribute('vcsGithubRefreshToken');
|
$refreshToken = $user->getAttribute('vcsGithubRefreshToken');
|
||||||
|
@ -594,8 +594,8 @@ App::post('/v1/vcs/github/installations/:installationId/repositories')
|
||||||
$repository = $oauth2->createRepository($accessToken, $name, $private);
|
$repository = $oauth2->createRepository($accessToken, $name, $private);
|
||||||
} else {
|
} else {
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
$owner = $github->getOwnerName($installationId);
|
$owner = $github->getOwnerName($installationId);
|
||||||
|
|
||||||
|
@ -636,8 +636,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI
|
||||||
}
|
}
|
||||||
|
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
|
|
||||||
$owner = $github->getOwnerName($installationId) ?? '';
|
$owner = $github->getOwnerName($installationId) ?? '';
|
||||||
|
@ -683,8 +683,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI
|
||||||
}
|
}
|
||||||
|
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
|
|
||||||
$owner = $github->getOwnerName($installationId) ?? '';
|
$owner = $github->getOwnerName($installationId) ?? '';
|
||||||
|
@ -718,7 +718,7 @@ App::post('/v1/vcs/github/events')
|
||||||
$signature = $request->getHeader('x-hub-signature-256', '');
|
$signature = $request->getHeader('x-hub-signature-256', '');
|
||||||
$payload = $request->getRawPayload();
|
$payload = $request->getRawPayload();
|
||||||
|
|
||||||
$signatureKey = App::getEnv('VCS_GITHUB_WEBHOOK_SECRET', '');
|
$signatureKey = App::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
|
||||||
|
|
||||||
$valid = $github->validateWebhookEvent($payload, $signature, $signatureKey);
|
$valid = $github->validateWebhookEvent($payload, $signature, $signatureKey);
|
||||||
if (!$valid) {
|
if (!$valid) {
|
||||||
|
@ -726,8 +726,8 @@ App::post('/v1/vcs/github/events')
|
||||||
}
|
}
|
||||||
|
|
||||||
$event = $request->getHeader('x-github-event', '');
|
$event = $request->getHeader('x-github-event', '');
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$parsedPayload = $github->getEvent($event, $payload);
|
$parsedPayload = $github->getEvent($event, $payload);
|
||||||
|
|
||||||
if ($event == $github::EVENT_PUSH) {
|
if ($event == $github::EVENT_PUSH) {
|
||||||
|
@ -985,8 +985,8 @@ App::patch('/v1/vcs/github/installations/:installationId/vcsRepositories/:vcsRep
|
||||||
|
|
||||||
$vcsRepository = $dbForConsole->updateDocument('vcsRepos', $vcsRepository->getId(), $vcsRepository);
|
$vcsRepository = $dbForConsole->updateDocument('vcsRepos', $vcsRepository->getId(), $vcsRepository);
|
||||||
|
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
$installationId = $installation->getAttribute('installationId');
|
$installationId = $installation->getAttribute('installationId');
|
||||||
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
$github->initialiseVariables($installationId, $privateKey, $githubAppId);
|
||||||
|
|
||||||
|
|
|
@ -156,8 +156,8 @@ class BuildsV1 extends Worker
|
||||||
$vcsInstallations = Authorization::skip(fn () => $dbForConsole->getDocument('vcsInstallations', $vcsInstallationId));
|
$vcsInstallations = Authorization::skip(fn () => $dbForConsole->getDocument('vcsInstallations', $vcsInstallationId));
|
||||||
$installationId = $vcsInstallations->getAttribute('installationId');
|
$installationId = $vcsInstallations->getAttribute('installationId');
|
||||||
|
|
||||||
$privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY');
|
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
|
||||||
$githubAppId = App::getEnv('VCS_GITHUB_APP_ID');
|
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');
|
||||||
|
|
||||||
$tmpDirectory = '/tmp/builds/' . $buildId . '/code';
|
$tmpDirectory = '/tmp/builds/' . $buildId . '/code';
|
||||||
$rootDirectory = $function->getAttribute('vcsRootDirectory', '');
|
$rootDirectory = $function->getAttribute('vcsRootDirectory', '');
|
||||||
|
|
|
@ -177,12 +177,12 @@ services:
|
||||||
- _APP_REGION
|
- _APP_REGION
|
||||||
- _APP_CONSOLE_GITHUB_APP_ID
|
- _APP_CONSOLE_GITHUB_APP_ID
|
||||||
- _APP_CONSOLE_GITHUB_SECRET
|
- _APP_CONSOLE_GITHUB_SECRET
|
||||||
- VCS_GITHUB_APP_NAME
|
- _APP_VCS_GITHUB_APP_NAME
|
||||||
- VCS_GITHUB_PRIVATE_KEY
|
- _APP_VCS_GITHUB_PRIVATE_KEY
|
||||||
- VCS_GITHUB_APP_ID
|
- _APP_VCS_GITHUB_APP_ID
|
||||||
- VCS_GITHUB_WEBHOOK_SECRET
|
- _APP_VCS_GITHUB_WEBHOOK_SECRET
|
||||||
- VCS_GITHUB_CLIENT_SECRET
|
- _APP_VCS_GITHUB_CLIENT_SECRET
|
||||||
- VCS_GITHUB_CLIENT_ID
|
- _APP_VCS_GITHUB_CLIENT_ID
|
||||||
|
|
||||||
appwrite-realtime:
|
appwrite-realtime:
|
||||||
entrypoint: realtime
|
entrypoint: realtime
|
||||||
|
@ -420,9 +420,9 @@ services:
|
||||||
- _APP_CONNECTIONS_STORAGE
|
- _APP_CONNECTIONS_STORAGE
|
||||||
- _APP_LOGGING_PROVIDER
|
- _APP_LOGGING_PROVIDER
|
||||||
- _APP_LOGGING_CONFIG
|
- _APP_LOGGING_CONFIG
|
||||||
- VCS_GITHUB_APP_NAME
|
- _APP_VCS_GITHUB_APP_NAME
|
||||||
- VCS_GITHUB_PRIVATE_KEY
|
- _APP_VCS_GITHUB_PRIVATE_KEY
|
||||||
- VCS_GITHUB_APP_ID
|
- _APP_VCS_GITHUB_APP_ID
|
||||||
- _APP_FUNCTIONS_TIMEOUT
|
- _APP_FUNCTIONS_TIMEOUT
|
||||||
- _APP_FUNCTIONS_BUILD_TIMEOUT
|
- _APP_FUNCTIONS_BUILD_TIMEOUT
|
||||||
- _APP_FUNCTIONS_CPUS
|
- _APP_FUNCTIONS_CPUS
|
||||||
|
|
Loading…
Reference in a new issue