Skip to content

Commit

Permalink
Changed bucket names to wookworm-code and bookworm-photos
Browse files Browse the repository at this point in the history
  • Loading branch information
rimutaka committed Dec 23, 2024
1 parent 526917f commit 571039b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
aws-region: us-east-1

- name: Deploy static site to S3 bucket
run: aws s3 sync ./build/ s3://bookwormfood.com --delete
run: aws s3 sync ./build/ s3://bookworm-code --delete
2 changes: 1 addition & 1 deletion rust/lambdas/index-html-server/src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub(crate) async fn get_index_from_s3() -> Result<String, Error> {
let config = aws_config::load_from_env().await;
let client = Client::new(&config);

let bucket = std::env::var("BUCKET_NAME").unwrap_or_else(|_e| "bookwormfood.com".to_string());
let bucket = std::env::var("BUCKET_NAME").unwrap_or_else(|_e| "bookworm-photos".to_string());
let response = match client
.get_object()
.bucket(bucket)
Expand Down
4 changes: 2 additions & 2 deletions rust/types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ pub const USER_PHOTOS_BASE_URL: &str = "https://bookworm.im/";
pub const USER_BOOKS_TABLE_NAME: &str = "user_books";

/// Name of S3 bucket for storing user photos
/// Value: `bookwormfood.com`.
pub const USER_PHOTOS_BUCKET_NAME: &str = "bookwormfood.com";
/// Value: `bookworm-photos`.
pub const USER_PHOTOS_BUCKET_NAME: &str = "bookworm-photos";
/// The path within the bucket where the user photos are stored.
/// Must include trailing slash.
/// Value: `photos/`.
Expand Down
2 changes: 1 addition & 1 deletion rust/wasm_mod/src/photos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pub(crate) async fn get_shared_photo_urls(runtime: &Window, share_id: &str, isbn

/// Extracts the photo ID from a presigned URL.
/// URL example:
/// https://s3.us-east-1.amazonaws.com/bookwormfood.com/photos/2be54aceee5f0f64203861eee7938f594bb0304d84cab1583a0032dec8dcb80d-9780143107712-1727129470.jpg?x-id=PutObject&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ASIAXORZMZKEHELYM43R%2F20240923%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240923T221110Z&X-Amz-Expires=300&X-Amz-SignedHeaders=host&X-Amz-Signature=8aabb59f938b19dacd229cef4d8913eb9077ebabf72158b22fec879ed925cd4f&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEI%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEaCXVzLWVhc3QtMSJGMEQCIALfb811Irwf%2FoYuc6TfFdIHSbL7HdXn0S1izQgQ0nGnAiBVmFy%2BtpNhXrsc%2Fb4eCRuwfG%2BdkQIH9%2Fz%2FvqVhnvquSSrzAgjH%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F8BEAMaDDUxMjI5NTIyNTk5MiIMqXqpz4uIv9Toz1vvKscCT30Uco7kb8nk6z2h6qOSgejf399XrU1Iq2vInGksOoU8jTh%2FGxoM3P2Wm7CJwak342PySOGntqEbnlLZeB2AsM6LuN8gh5PgNvMCWTF%2FUEW8%2B3g%2FybWmXqFKyyimdRfY%2Bd5w8BjSMOtQ8iA43GAsi4gqKT2LkDCKyRowbvMaLQngHIMPrOLUvOOKUP4WDd8yS%2BFosdf02DzeJ92vUGPLmB34%2FkIebNUxwAxfZxEFYtoyEol%2FF2ATEy5WaxJO7H1820CjeqDGJ0Ve90eEbKOjAf3umI46j0hjYOI%2Ftbdjr7OWEaiXywr5A6tH8Xjt3vXyLGqf8Gi1jpD%2F6DhcFJFf7I9T6wzzIfWuWIzsF94R0DNrUL7SfPQ4Gj10xbGJijlbiKs0iptAj2mIbSVisb0be3LUzVwbk1ubfEuuFUkjjwQ4%2FRlzscWCMOXOx7cGOp8By6DMeJCalUeG2BXIUyfYE2hfzbfLRtYOj3TjSLJ8ER9mfb56UG27vj8I9ualCUSfEMH2FdCoQowO%2F5iKANWDUGWvLL2VbtFhIJpcsCl7i%2BIpleYl7VpQf1Nav%2BB7B%2BhI2OBQttHlcMDU2boKP0d7Q6ektHL4W9Y6IWE7CI5SVqH%2F%2BEqnuTztoxPzRhri5tjDAiMLL%2Flspz%2BJjakFCn9Q
/// https://s3.us-east-1.amazonaws.com/bookworm-photos/photos/2be54aceee5f0f64203861eee7938f594bb0304d84cab1583a0032dec8dcb80d-9780143107712-1727129470.jpg?x-id=PutObject&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ASIAXORZMZKEHELYM43R%2F20240923%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240923T221110Z&X-Amz-Expires=300&X-Amz-SignedHeaders=host&X-Amz-Signature=8aabb59f938b19dacd229cef4d8913eb9077ebabf72158b22fec879ed925cd4f&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEI%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2FwEaCXVzLWVhc3QtMSJGMEQCIALfb811Irwf%2FoYuc6TfFdIHSbL7HdXn0S1izQgQ0nGnAiBVmFy%2BtpNhXrsc%2Fb4eCRuwfG%2BdkQIH9%2Fz%2FvqVhnvquSSrzAgjH%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F8BEAMaDDUxMjI5NTIyNTk5MiIMqXqpz4uIv9Toz1vvKscCT30Uco7kb8nk6z2h6qOSgejf399XrU1Iq2vInGksOoU8jTh%2FGxoM3P2Wm7CJwak342PySOGntqEbnlLZeB2AsM6LuN8gh5PgNvMCWTF%2FUEW8%2B3g%2FybWmXqFKyyimdRfY%2Bd5w8BjSMOtQ8iA43GAsi4gqKT2LkDCKyRowbvMaLQngHIMPrOLUvOOKUP4WDd8yS%2BFosdf02DzeJ92vUGPLmB34%2FkIebNUxwAxfZxEFYtoyEol%2FF2ATEy5WaxJO7H1820CjeqDGJ0Ve90eEbKOjAf3umI46j0hjYOI%2Ftbdjr7OWEaiXywr5A6tH8Xjt3vXyLGqf8Gi1jpD%2F6DhcFJFf7I9T6wzzIfWuWIzsF94R0DNrUL7SfPQ4Gj10xbGJijlbiKs0iptAj2mIbSVisb0be3LUzVwbk1ubfEuuFUkjjwQ4%2FRlzscWCMOXOx7cGOp8By6DMeJCalUeG2BXIUyfYE2hfzbfLRtYOj3TjSLJ8ER9mfb56UG27vj8I9ualCUSfEMH2FdCoQowO%2F5iKANWDUGWvLL2VbtFhIJpcsCl7i%2BIpleYl7VpQf1Nav%2BB7B%2BhI2OBQttHlcMDU2boKP0d7Q6ektHL4W9Y6IWE7CI5SVqH%2F%2BEqnuTztoxPzRhri5tjDAiMLL%2Flspz%2BJjakFCn9Q
fn get_photo_id_from_presigned_url(url: &str) -> Result<String> {
let end = url
.find(".jpg?")
Expand Down

0 comments on commit 571039b

Please sign in to comment.