From bbb43dec8403985c96882d27b7549df10bd1f69a Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Tue, 24 Jan 2017 18:07:44 -0800 Subject: [PATCH] Revert "SAN-5654 GitHub Varnish" --- configs/.env | 2 -- lib/models/apis/docker.js | 2 +- lib/routes/actions/redirect.js | 2 +- lib/routes/contexts/versions/app-code-versions.js | 4 ++-- lib/routes/github/index.js | 3 ++- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/.env b/configs/.env index 7e79e5f30..006c523df 100644 --- a/configs/.env +++ b/configs/.env @@ -24,10 +24,8 @@ GITHUB_DEPLOY_KEY_BITS=2048 GITHUB_DEPLOY_KEYS_POOL_SIZE=10 GITHUB_HOOK_NAME=web GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME! -GITHUB_HOST=github.com GITHUB_PROXY_EXPIRATION=3600 GITHUB_SCOPE=user:email,read:org,repo,repo_deployment,read:repo_hook,repo:status -GITHUB_URL=https://github.com HASHIDS_LENGTH=6 HASHIDS_SALT=VvCCYj8x3xaHs44QiDp9 HELLO_RUNNABLE_GITHUB_ID=10224339 diff --git a/lib/models/apis/docker.js b/lib/models/apis/docker.js index eaf054ce4..24c14424b 100644 --- a/lib/models/apis/docker.js +++ b/lib/models/apis/docker.js @@ -393,7 +393,7 @@ Docker.prototype._createImageBuilderEnv = function (opts) { const commitishs = [] const deployKeys = [] contextVersion.appCodeVersions.forEach(function (acv) { - repoUrls.push(`git@${process.env.GITHUB_HOST}:${acv.repo}`) + repoUrls.push('git@github.com:' + acv.repo) // use either a commit, branch, or default to master commitishs.push(acv.commit || acv.branch || 'master') if (acv.privateKey) { diff --git a/lib/routes/actions/redirect.js b/lib/routes/actions/redirect.js index e04557517..e366bb2ca 100644 --- a/lib/routes/actions/redirect.js +++ b/lib/routes/actions/redirect.js @@ -18,7 +18,7 @@ app.get('/actions/redirect', return res.status(404).end() } var url = decodeURIComponent(req.query.url) - if (url.indexOf(process.env.GITHUB_URL) !== 0) { + if (url.indexOf('https://github.com/') !== 0) { return res.status(404).end() } res.redirect(302, url) diff --git a/lib/routes/contexts/versions/app-code-versions.js b/lib/routes/contexts/versions/app-code-versions.js index 699310520..f57747931 100644 --- a/lib/routes/contexts/versions/app-code-versions.js +++ b/lib/routes/contexts/versions/app-code-versions.js @@ -181,7 +181,7 @@ app.post('/contexts/:contextId/versions/:versionId/appCodeVersions/:appCodeVersi optimus.transform( { // optimus does not assume that it is coming from github should it? - repo: `git@${process.env.GITHUB_HOST}:${appCodeVersion.repo}`, + repo: 'git@github.com:' + appCodeVersion.repo, commitish: appCodeVersion.commit, rules: rules, deployKey: appCodeVersion.privateKey @@ -268,7 +268,7 @@ app.post('/contexts/:contextId/versions/:versionId/appCodeVersions/:appCodeVersi // Ask optimus for the results... optimus.transform( { - repo: `git@${process.env.GITHUB_HOST}:${appCodeVersion.repo}`, + repo: 'git@github.com:' + appCodeVersion.repo, commitish: appCodeVersion.commit, rules: rules, deployKey: appCodeVersion.privateKey diff --git a/lib/routes/github/index.js b/lib/routes/github/index.js index 3e3efb17f..cf96d63d7 100644 --- a/lib/routes/github/index.js +++ b/lib/routes/github/index.js @@ -41,9 +41,10 @@ var cacheOmitHeaders = [ ].concat(corsHeaders) var proxy = httpProxy.createProxy({ - target: 'http://' + process.env.GITHUB_VARNISH_HOST + ':' + process.env.GITHUB_VARNISH_PORT, + target: 'https://api.github.com', // github wants these headers headers: { + host: 'api.github.com', accept: 'application/vnd.github.v3+json' } })