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

fix(s3): missing http on website url #4189

Merged
merged 3 commits into from
Sep 22, 2019
Merged

fix(s3): missing http on website url #4189

merged 3 commits into from
Sep 22, 2019

Conversation

hoegertn
Copy link
Contributor

fixes #4113

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

@hoegertn hoegertn requested a review from eladb as a code owner September 21, 2019 20:19
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2019

Thanks so much for taking the time to contribute to the AWS CDK ❤️

We will shortly assign someone to review this pull request and help get it
merged. In the meantime, please take a minute to make sure you follow this
checklist:

  • PR title type(scope): text
    • type: fix, feat, refactor go into CHANGELOG, chore is hidden
    • scope: name of module without aws- or cdk- prefix or postfix (e.g. s3 instead of aws-s3-deployment)
    • text: use all lower-case, do not end with a period, do not include issue refs
  • PR Description
    • Rationale: describe rationale of change and approach taken
    • Issues: indicate issues fixed via: fixes #xxx or closes #xxx
    • Breaking?: last paragraph: BREAKING CHANGE: <describe what changed + link for details>
  • Testing
    • Unit test added. Prefer to add a new test rather than modify existing tests
    • CLI or init templates change? Re-run/add CLI integration tests
  • Documentation
    • README: update module README to describe new features
    • API docs: public APIs must be documented. Copy from official AWS docs when possible
    • Design: for significant features, follow design process

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

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

eladb
eladb previously requested changes Sep 22, 2019
View reviewed changes
packages/@aws-cdk/aws-s3/lib/bucket.ts Outdated
public readonly bucketWebsiteUrl = attrs.bucketWebsiteUrl || websiteUrl;
public readonly bucketWebsiteDomainName = Fn.select(2, Fn.split('/', attrs.bucketWebsiteUrl || websiteUrl));
public readonly bucketWebsiteUrl = attrs.bucketWebsiteUrl || `http://${websiteDomain}`;
public readonly bucketWebsiteDomainName = attrs.bucketWebsiteUrl ? attrs.bucketWebsiteUrl.split('/')[2] : websiteDomain;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you don't know if attrs.bucketWebsiteUrl is a token or a concrete value, use Fn.split and Fn.select to parse it. Otherwise, it will fail if bucketWebsiteUrl is a token.

@hoegertn hoegertn requested a review from shivlaks as a code owner September 22, 2019 09:04
@mergify mergify bot dismissed eladb’s stale review September 22, 2019 09:05

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor

mergify bot commented Sep 22, 2019

Thank you for contributing! Your pull request is now being automatically merged.

@eladb eladb self-assigned this Sep 22, 2019
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit 960d71f into aws:master Sep 22, 2019
@hoegertn hoegertn deleted the bucket-website-url branch September 22, 2019 13:03
eladb pushed a commit that referenced this pull request Sep 23, 2019
@hoegertn
fix(s3): missing http on website url (#4189)
f1d2b03 
* fix(s3): missing http on website url

* review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eladb eladb eladb approved these changes

@shivlaks shivlaks Awaiting requested review from shivlaks

Assignees

@eladb eladb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

s3: Bucket property websiteUrl has invalid value on imported buckets
3 participants
@hoegertn @aws-cdk-automation @eladb