fix(codepipeline-actions): use token as CodeCommitSourceAction branch

[alanraison]

When using the EVENTS trigger, an event is created based on the branch name of
the event, however this is not possible if the branch name is an unresolved
value. Therefore generate a unique event name if this is the case.

Fixes #10263

---

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

[skinny85]

Thanks for the PR @alanraison ! There's a bug lurking in the current proposal, so we need to address it before merging it in 🙂

[skinny85]

I have a hard time keeping up with this code. For example, branchIdDisambiguator sounds to me like it should be just the branch-changing part of the ID, but somehow it's the entire thing.

What do you think of this instead?

Suggested change

	private generateEventId(stage: codepipeline.IStage): string {
	let branchIdDisambiguator: string;
	let baseId = stage.pipeline.node.uniqueId;
	if (this.branch === 'master') {
	branchIdDisambiguator = baseId;
	} else if (Token.isUnresolved(this.branch)) {
	let candidate = baseId;
	let counter = 0;
	while (this.props.repository.node.tryFindChild(candidate) !== undefined) {
	counter += 1;
	candidate = `${baseId}-Branch${counter}-`;
	}
	branchIdDisambiguator = candidate;
	} else {
	branchIdDisambiguator = `${baseId}-${this.branch}-`;
	}
	return `${branchIdDisambiguator}EventRule`;
	}
	private generateEventId(stage: codepipeline.IStage): string {
	const baseId = stage.pipeline.node.uniqueId;
	if (Token.isUnresolved(this.branch)) {
	let candidate = '';
	let counter = 0;
	do {
	candidate = this.eventIdFromPrefix(`${baseId}-${counter}`);
	counter += 1;
	} while (this.props.repository.node.tryFindChild(candidate) !== undefined);
	return candidate;
	} else {
	const branchIdDisambiguator = this.branch === 'master' ? '' : '-${this.branch}-';
	return this.eventIdFromPrefix(`${baseId}${branchIdDisambiguator}`);
	}
	}
	private eventIdFromPrefix(eventIdPrefix: string) {
	return `${eventIdPrefix}EventRule`;
	}

(Notice the different loop; the current one actually checks the wrong ID, without the EvenRule suffix!)

[alanraison]

Oops, thanks for spotting that! I think that your naming scheme with the counter needs a slight tweak though, so I will just update my branch with that.

[gotodeploy]

@skinny85 This might have a bug:

# Use buckticks instead
'-${this.branch}-' => `-${this.branch}-`

P.S. I opened #10665

Pull request has been modified.

[skinny85]

Thanks for the fix @alanraison !

Pull request has been modified.

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[aws-cdk-automation]

AWS CodeBuild CI Report

• CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
• Commit ID: a678aa1
• Result: SUCCEEDED
• Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).