Skip to content

fix(aws-s3): remove bucket name validation #628

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

Merged
rix0rrr merged 2 commits into from
Sep 3, 2018
Merged

fix(aws-s3): remove bucket name validation #628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8021faf
fix(aws-s3): remove bucket name validation
Aug 27, 2018
f6d277b
Merge remote-tracking branch 'origin/master' into huijbers/bucket-nam…
Sep 3, 2018
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: 1 addition & 3 deletions packages/@aws-cdk/aws-s3/lib/bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BucketNotifications } from './notifications-resource';
import perms = require('./perms');
import { LifecycleRule } from './rule';
import { BucketArn, BucketDomainName, BucketDualStackDomainName, cloudformation } from './s3.generated';
import { parseBucketArn, parseBucketName, validateBucketName } from './util';
import { parseBucketArn, parseBucketName } from './util';

/**
* A reference to a bucket. The easiest way to instantiate is to call
Expand Down Expand Up @@ -348,8 +348,6 @@ export class Bucket extends BucketRef {
constructor(parent: cdk.Construct, name: string, props: BucketProps = {}) {
super(parent, name);

validateBucketName(props && props.bucketName);

const { bucketEncryption, encryptionKey } = this.parseEncryption(props);

const resource = new cloudformation.BucketResource(this, 'Resource', {
Expand Down
10 changes: 0 additions & 10 deletions packages/@aws-cdk/aws-s3/lib/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
import { Arn } from '@aws-cdk/cdk';
import { BucketRefProps } from './bucket';

export function validateBucketName(bucketName?: string) {
if (!bucketName) {
return;
}

if (bucketName.search(/[^a-z0-9.-]/g) !== -1) {
throw new Error('Bucket name contains invalid characters: ' + bucketName);
}
}

export function parseBucketArn(props: BucketRefProps) {

// if we have an explicit bucket ARN, use it.
Expand Down