From f13d70d5bee560916642ce80067eacaf63119c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Fri, 28 Jul 2023 10:53:07 +0200 Subject: [PATCH] Rename env vars --- .env | 12 +++++------ app/controllers/api/vcs.php | 40 ++++++++++++++++++------------------- app/workers/builds.php | 4 ++-- docker-compose.yml | 18 ++++++++--------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.env b/.env index ac81033ea..83146adc7 100644 --- a/.env +++ b/.env @@ -81,9 +81,9 @@ _APP_DOCKER_HUB_USERNAME= _APP_DOCKER_HUB_PASSWORD= _APP_CONSOLE_GITHUB_SECRET= _APP_CONSOLE_GITHUB_APP_ID= -VCS_GITHUB_APP_NAME= -VCS_GITHUB_PRIVATE_KEY="" -VCS_GITHUB_APP_ID= -VCS_GITHUB_CLIENT_ID= -VCS_GITHUB_CLIENT_SECRET= -VCS_GITHUB_WEBHOOK_SECRET= \ No newline at end of file +_APP_VCS_GITHUB_APP_NAME= +_APP_VCS_GITHUB_PRIVATE_KEY="" +_APP_VCS_GITHUB_APP_ID= +_APP_VCS_GITHUB_CLIENT_ID= +_APP_VCS_GITHUB_CLIENT_SECRET= +_APP_VCS_GITHUB_WEBHOOK_SECRET= \ No newline at end of file diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index 651435d2a..dd83cea7c 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -256,7 +256,7 @@ App::get('/v1/vcs/github/installations') $user->setAttribute('prefs', $prefs); $dbForConsole->updateDocument('users', $user->getId(), $user); - $appName = App::getEnv('VCS_GITHUB_APP_NAME'); + $appName = App::getEnv('_APP_VCS_GITHUB_APP_NAME'); $response ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0') ->addHeader('Pragma', 'no-cache') @@ -312,7 +312,7 @@ App::get('/v1/vcs/github/redirect') // OAuth Authroization 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) ?? ''; $refreshToken = $oauth2->getRefreshToken($code) ?? ''; $accessTokenExpiry = $oauth2->getAccessTokenExpiry($code) ?? ''; @@ -328,8 +328,8 @@ App::get('/v1/vcs/github/redirect') // Create / Update installation if (!empty($installationId)) { - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $owner = $github->getOwnerName($installationId) ?? ''; @@ -403,8 +403,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI } $installationId = $installation->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $owner = $github->getOwnerName($installationId); @@ -469,8 +469,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories') } $installationId = $installation->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $page = 1; @@ -564,7 +564,7 @@ App::post('/v1/vcs/github/installations/:installationId/repositories') } 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'); $refreshToken = $user->getAttribute('vcsGithubRefreshToken'); @@ -594,8 +594,8 @@ App::post('/v1/vcs/github/installations/:installationId/repositories') $repository = $oauth2->createRepository($accessToken, $name, $private); } else { $installationId = $installation->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $owner = $github->getOwnerName($installationId); @@ -636,8 +636,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI } $installationId = $installation->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $owner = $github->getOwnerName($installationId) ?? ''; @@ -683,8 +683,8 @@ App::get('/v1/vcs/github/installations/:installationId/repositories/:repositoryI } $installationId = $installation->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); $owner = $github->getOwnerName($installationId) ?? ''; @@ -718,7 +718,7 @@ App::post('/v1/vcs/github/events') $signature = $request->getHeader('x-hub-signature-256', ''); $payload = $request->getRawPayload(); - $signatureKey = App::getEnv('VCS_GITHUB_WEBHOOK_SECRET', ''); + $signatureKey = App::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', ''); $valid = $github->validateWebhookEvent($payload, $signature, $signatureKey); if (!$valid) { @@ -726,8 +726,8 @@ App::post('/v1/vcs/github/events') } $event = $request->getHeader('x-github-event', ''); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $parsedPayload = $github->getEvent($event, $payload); 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); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $installationId = $installation->getAttribute('installationId'); $github->initialiseVariables($installationId, $privateKey, $githubAppId); diff --git a/app/workers/builds.php b/app/workers/builds.php index 934650c04..9c5684679 100644 --- a/app/workers/builds.php +++ b/app/workers/builds.php @@ -156,8 +156,8 @@ class BuildsV1 extends Worker $vcsInstallations = Authorization::skip(fn () => $dbForConsole->getDocument('vcsInstallations', $vcsInstallationId)); $installationId = $vcsInstallations->getAttribute('installationId'); - $privateKey = App::getEnv('VCS_GITHUB_PRIVATE_KEY'); - $githubAppId = App::getEnv('VCS_GITHUB_APP_ID'); + $privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY'); + $githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID'); $tmpDirectory = '/tmp/builds/' . $buildId . '/code'; $rootDirectory = $function->getAttribute('vcsRootDirectory', ''); diff --git a/docker-compose.yml b/docker-compose.yml index 57a52096d..99c42aec5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -177,12 +177,12 @@ services: - _APP_REGION - _APP_CONSOLE_GITHUB_APP_ID - _APP_CONSOLE_GITHUB_SECRET - - VCS_GITHUB_APP_NAME - - VCS_GITHUB_PRIVATE_KEY - - VCS_GITHUB_APP_ID - - VCS_GITHUB_WEBHOOK_SECRET - - VCS_GITHUB_CLIENT_SECRET - - VCS_GITHUB_CLIENT_ID + - _APP_VCS_GITHUB_APP_NAME + - _APP_VCS_GITHUB_PRIVATE_KEY + - _APP_VCS_GITHUB_APP_ID + - _APP_VCS_GITHUB_WEBHOOK_SECRET + - _APP_VCS_GITHUB_CLIENT_SECRET + - _APP_VCS_GITHUB_CLIENT_ID appwrite-realtime: entrypoint: realtime @@ -420,9 +420,9 @@ services: - _APP_CONNECTIONS_STORAGE - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG - - VCS_GITHUB_APP_NAME - - VCS_GITHUB_PRIVATE_KEY - - VCS_GITHUB_APP_ID + - _APP_VCS_GITHUB_APP_NAME + - _APP_VCS_GITHUB_PRIVATE_KEY + - _APP_VCS_GITHUB_APP_ID - _APP_FUNCTIONS_TIMEOUT - _APP_FUNCTIONS_BUILD_TIMEOUT - _APP_FUNCTIONS_CPUS