From ef0ce09d0bf138e3b41e7db1c38d225b75053624 Mon Sep 17 00:00:00 2001 From: Jordan Singer Date: Fri, 3 Feb 2023 14:04:23 -0600 Subject: [PATCH 1/2] payloads bucket name cant be sanitized --- pkg/infra/pulumi_aws/deploylib.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/infra/pulumi_aws/deploylib.ts b/pkg/infra/pulumi_aws/deploylib.ts index 101a6b3aa..c029be834 100755 --- a/pkg/infra/pulumi_aws/deploylib.ts +++ b/pkg/infra/pulumi_aws/deploylib.ts @@ -113,12 +113,8 @@ export class CloudCCLib { if (this.createVPC) { this.getVpcSgSubnets() } - const resolvedBucketName = this.account.accountId.apply( - (accountId) => - sanitized( - AwsSanitizer.S3.bucket.nameValidation() - )`${accountId}${physicalPayloadsBucketName}` - ) + // Right now we sanitize this bucket name in the compiler go code so we do not need to here. + const resolvedBucketName = pulumi.interpolate`${this.account.accountId}${physicalPayloadsBucketName}` this.createBuckets([resolvedBucketName], true) this.addSharedPolicyStatement({ Effect: 'Allow', From a7b3508b8fb4d57f27ee2a5b16c287f32f558a2e Mon Sep 17 00:00:00 2001 From: Jordan Singer Date: Fri, 3 Feb 2023 14:10:15 -0600 Subject: [PATCH 2/2] update comment --- pkg/infra/pulumi_aws/deploylib.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/infra/pulumi_aws/deploylib.ts b/pkg/infra/pulumi_aws/deploylib.ts index c029be834..a863bfff3 100755 --- a/pkg/infra/pulumi_aws/deploylib.ts +++ b/pkg/infra/pulumi_aws/deploylib.ts @@ -113,7 +113,7 @@ export class CloudCCLib { if (this.createVPC) { this.getVpcSgSubnets() } - // Right now we sanitize this bucket name in the compiler go code so we do not need to here. + // Right now we sanitize this bucket name in the compiler go code so we do not need to here (issue #188 & pro#51) const resolvedBucketName = pulumi.interpolate`${this.account.accountId}${physicalPayloadsBucketName}` this.createBuckets([resolvedBucketName], true) this.addSharedPolicyStatement({