honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci(aio): do not fail when re-deploying preview for the same PR/SHA 

Previously, when trying to upload the build artifacts for a PR/SHA that was
already successfully deployed (e.g. when re-running a Travis job), the preview
server would return a 403 and the build would fail.

Since we have other mechanisms to verify that the PR author is trusted and the
artifacts do indeed come from the specified PR and since the new artifacts
should be the same with the already deployed ones (same SHA), there is no reason
to fail the build. The preview server will reject the request with a special
HTTP status code (409 - Conflict), which the `deploy-preview` script will
recognize and exit with 0.
This commit is contained in:
Georgios Kalpakas 2017-04-13 00:38:21 +03:00 committed by Pete Bacon Darwin
parent 9cb5964b4d
commit d263595c63
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
View File

@ -26,7 +26,7 @@ export class BuildCreator extends EventEmitter {
all([this.exists(prDir), this.exists(shaDir)]). all([this.exists(prDir), this.exists(shaDir)]).
then(([prDirExisted, shaDirExisted]) => { then(([prDirExisted, shaDirExisted]) => {
if (shaDirExisted) { if (shaDirExisted) {
throw new UploadError(403, `Request to overwrite existing directory: ${shaDir}`); throw new UploadError(409, `Request to overwrite existing directory: ${shaDir}`);
} }
dirToRemoveOnError = prDirExisted ? shaDir : prDir; dirToRemoveOnError = prDirExisted ? shaDir : prDir;

2
aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/server-integration.e2e.ts
View File

@ -73,7 +73,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
h.createDummyArchive(pr9, sha9, archivePath); h.createDummyArchive(pr9, sha9, archivePath);
uploadBuild(pr9, sha9, archivePath). uploadBuild(pr9, sha9, archivePath).
then(h.verifyResponse(403)). then(h.verifyResponse(409)).
then(() => Promise.all([ then(() => Promise.all([
getFile(pr9, sha9, 'index.html').then(h.verifyResponse(200, idxContentRegex9)), getFile(pr9, sha9, 'index.html').then(h.verifyResponse(200, idxContentRegex9)),
getFile(pr9, sha9, 'foo/bar.js').then(h.verifyResponse(200, barContentRegex9)), getFile(pr9, sha9, 'foo/bar.js').then(h.verifyResponse(200, barContentRegex9)),

2
aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/upload-server.e2e.ts
View File

@ -101,7 +101,7 @@ describe('upload-server (on HTTP)', () => {
expect(h.readBuildFile(pr, sha9, 'index.html')).toBe('My content'); expect(h.readBuildFile(pr, sha9, 'index.html')).toBe('My content');
h.runCmd(`${curl} http://${host}/create-build/${pr}/${sha9}`). h.runCmd(`${curl} http://${host}/create-build/${pr}/${sha9}`).
then(h.verifyResponse(403, /^Request to overwrite existing directory/)). then(h.verifyResponse(409, /^Request to overwrite existing directory/)).
then(() => expect(h.readBuildFile(pr, sha9, 'index.html')).toBe('My content')). then(() => expect(h.readBuildFile(pr, sha9, 'index.html')).toBe('My content')).
then(done); then(done);
}); });

2
aio/aio-builds-setup/dockerbuild/scripts-js/test/upload-server/build-creator.spec.ts
View File

@ -66,7 +66,7 @@ describe('BuildCreator', () => {
it('should throw if the build does already exist', done => { it('should throw if the build does already exist', done => {
bcExistsSpy.and.returnValue(true); bcExistsSpy.and.returnValue(true);
bc.create(pr, sha, archive).catch(err => { bc.create(pr, sha, archive).catch(err => {
expectToBeUploadError(err, 403, `Request to overwrite existing directory: ${shaDir}`); expectToBeUploadError(err, 409, `Request to overwrite existing directory: ${shaDir}`);
done(); done();
}); });
}); });

5
aio/scripts/deploy-preview.sh
View File

@ -24,8 +24,9 @@ httpCode=$(
| sed 's/HTTP_CODE: //' | sed 's/HTTP_CODE: //'
) )
# Exit with an error if the request failed # Exit with an error if the request failed.
if [ $httpCode -lt 200 ] || [ $httpCode -ge 400 ]; then # (Ignore 409 failures, which mean trying to re-deploy for the same PR/SHA.)
if [ $httpCode -lt 200 ] || ([ $httpCode -ge 400 ] && [ $httpCode -ne 409 ]); then
exit 1 exit 1
fi fi