Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix build break caused by exported deprecated functions #17719

Merged
merged 1 commit into from
Nov 25, 2021
Merged

chore: fix build break caused by exported deprecated functions #17719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener-rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export class ApplicationListenerRule extends Construct {
* @internal
* @deprecated
*/
export function validateFixedResponse(fixedResponse: FixedResponse) {
function validateFixedResponse(fixedResponse: FixedResponse) {
if (fixedResponse.statusCode && !/^(2|4|5)\d\d$/.test(fixedResponse.statusCode)) {
throw new Error('`statusCode` must be 2XX, 4XX or 5XX.');
}
Expand All @@ -406,7 +406,7 @@ export function validateFixedResponse(fixedResponse: FixedResponse) {
* @internal
* @deprecated
*/
export function validateRedirectResponse(redirectResponse: RedirectResponse) {
function validateRedirectResponse(redirectResponse: RedirectResponse) {
if (redirectResponse.protocol && !/^(HTTPS?|#\{protocol\})$/i.test(redirectResponse.protocol)) {
throw new Error('`protocol` must be HTTP, HTTPS, or #{protocol}.');
}
Expand Down
28 changes: 25 additions & 3 deletions packages/@aws-cdk/aws-elasticloadbalancingv2/lib/alb/application-listener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { IListenerCertificate, ListenerCertificate } from '../shared/listener-ce
import { determineProtocolAndPort } from '../shared/util';
import { ListenerAction } from './application-listener-action';
import { ApplicationListenerCertificate } from './application-listener-certificate';
import { ApplicationListenerRule, FixedResponse, RedirectResponse, validateFixedResponse, validateRedirectResponse } from './application-listener-rule';
import { ApplicationListenerRule, FixedResponse, RedirectResponse } from './application-listener-rule';
import { IApplicationLoadBalancer } from './application-load-balancer';
import { ApplicationTargetGroup, IApplicationLoadBalancerTarget, IApplicationTargetGroup } from './application-target-group';
import { ListenerCondition } from './conditions';
Expand Down Expand Up @@ -377,7 +377,18 @@ export class ApplicationListener extends BaseListener implements IApplicationLis
messageBody: props.messageBody,
};

validateFixedResponse(fixedResponse);
/**
* NOTE - Copy/pasted from `application-listener-rule.ts#validateFixedResponse`.
* This was previously a deprecated, exported function, which caused issues with jsii's strip-deprecated functionality.
* Inlining the duplication functionality in v2 only (for now).
*/
if (fixedResponse.statusCode && !/^(2|4|5)\d\d$/.test(fixedResponse.statusCode)) {
throw new Error('`statusCode` must be 2XX, 4XX or 5XX.');
}

if (fixedResponse.messageBody && fixedResponse.messageBody.length > 1024) {
throw new Error('`messageBody` cannot have more than 1024 characters.');
}

if (props.priority) {
new ApplicationListenerRule(this, id + 'Rule', {
Expand Down Expand Up @@ -410,7 +421,18 @@ export class ApplicationListener extends BaseListener implements IApplicationLis
statusCode: props.statusCode,
};

validateRedirectResponse(redirectResponse);
/**
* NOTE - Copy/pasted from `application-listener-rule.ts#validateRedirectResponse`.
* This was previously a deprecated, exported function, which caused issues with jsii's strip-deprecated functionality.
* Inlining the duplication functionality in v2 only (for now).
*/
if (redirectResponse.protocol && !/^(HTTPS?|#\{protocol\})$/i.test(redirectResponse.protocol)) {
throw new Error('`protocol` must be HTTP, HTTPS, or #{protocol}.');
}

if (!redirectResponse.statusCode || !/^HTTP_30[12]$/.test(redirectResponse.statusCode)) {
throw new Error('`statusCode` must be HTTP_301 or HTTP_302.');
}

if (props.priority) {
new ApplicationListenerRule(this, id + 'Rule', {
Expand Down