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

AWS-TS-NEXTJS - Fix broken image handling, region handling + resource upgrade #1499

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AWS-TS-NEXTJS - Fix broken image handling, region handling + resource upgrade #1499

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
10 changes: 6 additions & 4 deletions aws-ts-nextjs/nextjs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import * as glob from "glob";
import * as mime from "mime";
import * as path from "path";

const region = pulumi.output(aws.getRegion());

export interface NexJsSiteArgs {
path?: string;
environment?: Record<string, pulumi.Input<string>>;
Expand Down Expand Up @@ -61,7 +63,7 @@ export class NextJsSite extends pulumi.ComponentResource {
const cacheControlUnversioned = "public,max-age=0,s-maxage=31536000,must-revalidate";
const hex = computeHexHash(file);
const key = path.join("_assets", file);
const object = new aws.s3.BucketObject(`${name}-bucket-object-${hex}`, {
const object = new aws.s3.BucketObjectv2(`${name}-bucket-object-${hex}`, {
bucket: bucket.id,
key: key,
source: new pulumi.asset.FileAsset(path.resolve(this.path, ".open-next/assets", file)),
Expand Down Expand Up @@ -235,9 +237,9 @@ export class NextJsSite extends pulumi.ComponentResource {
variables: {
"CACHE_BUCKET_NAME": bucket.bucket,
"CACHE_BUCKET_KEY_PREFIX": "_cache",
"CACHE_BUCKET_REGION": "us-west-2",
"CACHE_BUCKET_REGION": region.name,
"REVALIDATION_QUEUE_URL": queue.id,
"REVALIDATION_QUEUE_REGION": "us-west-2",
"REVALIDATION_QUEUE_REGION": region.name,
...this.environment,
},
},
Expand Down Expand Up @@ -274,7 +276,7 @@ export class NextJsSite extends pulumi.ComponentResource {
timeout: 25,
environment: {
variables: {
"BUCKET_NAME": bucket.arn,
"BUCKET_NAME": bucket.bucket,
"BUCKET_KEY_PREFIX": "_assets",
},
},
Expand Down