Commit 97ede50

authored

Fix handling of concurrent deployments (#24)

It seems AWS changed the error message emitted when another deployment is already active. Fixes #22.

1 parent 0e6395e commit 97ede50Copy full SHA for 97ede50

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,16 @@ exports.createDeployment = async function(applicationName, fullRepositoryName, b`
`138`	`138`	`break;`
`139`	`139`	`} catch (e) {`
`140`	`140`	`if (e.code == 'DeploymentLimitExceededException') {`
`141`		`- var [, otherDeployment] = e.message.toString().match(/isalreadydeployingdeployment\'(d-\w+)\'/);`
	`141`	`+ let message = e.message.toString();`
	`142`	`+ let found = message.match(/(?:isalreadydeploying\|alreadyhasanactiveDeployment)\'(d-\w+)\'/);`
	`143`	`+`
	`144`	`+ if (!found) {`
	`145`	+ console.log(`🐞 Unexpected exception message: ${message}`);
	`146`	`+ core.setFailed('Aborting');`
	`147`	`+ throw e;`
	`148`	`+ }`
	`149`	`+`
	`150`	`+ let [, otherDeployment] = found;`
`142`	`151`	console.log(`😶 Waiting for another pending deployment ${otherDeployment}`);
`143`	`152`	`try {`
`144`	`153`	`await codeDeploy.waitFor('deploymentSuccessful', {deploymentId: otherDeployment}).promise();`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,16 @@ exports.createDeployment = async function(applicationName, fullRepositoryName, b`
`154`	`154`	`break;`
`155`	`155`	`} catch (e) {`
`156`	`156`	`if (e.code == 'DeploymentLimitExceededException') {`
`157`		`- var [, otherDeployment] = e.message.toString().match(/is already deploying deployment \'(d-\w+)\'/);`
	`157`	`+ let message = e.message.toString();`
	`158`	`+ let found = message.match(/(?:is already deploying\|already has an active Deployment) \'(d-\w+)\'/);`
	`159`	`+`
	`160`	`+ if (!found) {`
	`161`	+ console.log(`🐞 Unexpected exception message: ${message}`);
	`162`	`+ core.setFailed('Aborting');`
	`163`	`+ throw e;`
	`164`	`+ }`
	`165`	`+`
	`166`	`+ let [, otherDeployment] = found;`
`158`	`167`	console.log(`😶 Waiting for another pending deployment ${otherDeployment}`);
`159`	`168`	`try {`
`160`	`169`	`await codeDeploy.waitFor('deploymentSuccessful', {deploymentId: otherDeployment}).promise();`

Comments

(0)