-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(amplify): Add Amplify asset deployment resource (#16922)
This change adds a custom resource that allows users to publish S3 assets to AWS Amplify. fixes #16208 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
Showing
11 changed files
with
1,429 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
packages/@aws-cdk/aws-amplify/lib/asset-deployment-handler/common.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
export interface AmplifyJobId { | ||
/** | ||
* If this field is included in an event passed to "IsComplete", it means we | ||
* initiated an Amplify deployment that should be monitored using | ||
* amplify:GetJob | ||
*/ | ||
AmplifyJobId?: string; | ||
} | ||
|
||
export type ResourceEvent = AWSLambda.CloudFormationCustomResourceEvent & AmplifyJobId; | ||
|
||
export interface IsCompleteResponse { | ||
/** | ||
* Indicates if the resource operation is complete or should we retry. | ||
*/ | ||
readonly IsComplete: boolean; | ||
|
||
/** | ||
* Additional/changes to resource attributes. | ||
*/ | ||
readonly Data?: { [name: string]: any }; | ||
}; | ||
|
||
export abstract class ResourceHandler { | ||
protected readonly requestId: string; | ||
protected readonly logicalResourceId: string; | ||
protected readonly requestType: 'Create' | 'Update' | 'Delete'; | ||
protected readonly physicalResourceId?: string; | ||
protected readonly event: ResourceEvent; | ||
|
||
constructor(event: ResourceEvent) { | ||
this.requestType = event.RequestType; | ||
this.requestId = event.RequestId; | ||
this.logicalResourceId = event.LogicalResourceId; | ||
this.physicalResourceId = (event as any).PhysicalResourceId; | ||
this.event = event; | ||
} | ||
|
||
public onEvent() { | ||
switch (this.requestType) { | ||
case 'Create': | ||
return this.onCreate(); | ||
case 'Update': | ||
return this.onUpdate(); | ||
case 'Delete': | ||
return this.onDelete(); | ||
} | ||
|
||
throw new Error(`Invalid request type ${this.requestType}`); | ||
} | ||
|
||
public isComplete() { | ||
switch (this.requestType) { | ||
case 'Create': | ||
return this.isCreateComplete(); | ||
case 'Update': | ||
return this.isUpdateComplete(); | ||
case 'Delete': | ||
return this.isDeleteComplete(); | ||
} | ||
|
||
throw new Error(`Invalid request type ${this.requestType}`); | ||
} | ||
|
||
protected log(x: any) { | ||
// eslint-disable-next-line no-console | ||
console.log(JSON.stringify(x, undefined, 2)); | ||
} | ||
|
||
protected abstract async onCreate(): Promise<AmplifyJobId>; | ||
protected abstract async onDelete(): Promise<void>; | ||
protected abstract async onUpdate(): Promise<AmplifyJobId>; | ||
protected abstract async isCreateComplete(): Promise<IsCompleteResponse>; | ||
protected abstract async isDeleteComplete(): Promise<IsCompleteResponse>; | ||
protected abstract async isUpdateComplete(): Promise<IsCompleteResponse>; | ||
} |
136 changes: 136 additions & 0 deletions
136
packages/@aws-cdk/aws-amplify/lib/asset-deployment-handler/handler.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
// aws-sdk available at runtime for lambdas | ||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import { Amplify, S3 } from 'aws-sdk'; | ||
import { AmplifyJobId, IsCompleteResponse, ResourceEvent, ResourceHandler } from './common'; | ||
|
||
export interface AmplifyAssetDeploymentProps { | ||
AppId: string; | ||
BranchName: string; | ||
S3BucketName: string; | ||
S3ObjectKey: string; | ||
TimeoutSeconds: number; | ||
} | ||
|
||
export class AmplifyAssetDeploymentHandler extends ResourceHandler { | ||
private readonly props: AmplifyAssetDeploymentProps; | ||
protected readonly amplify: Amplify; | ||
protected readonly s3: S3; | ||
|
||
constructor(amplify: Amplify, s3: S3, event: ResourceEvent) { | ||
super(event); | ||
|
||
this.props = parseProps(this.event.ResourceProperties); | ||
this.amplify = amplify; | ||
this.s3 = s3; | ||
} | ||
|
||
// ------ | ||
// CREATE | ||
// ------ | ||
|
||
protected async onCreate(): Promise<AmplifyJobId> { | ||
// eslint-disable-next-line no-console | ||
console.log('deploying to Amplify with options:', JSON.stringify(this.props, undefined, 2)); | ||
|
||
// Verify no jobs are currently running. | ||
const jobs = await this.amplify | ||
.listJobs({ | ||
appId: this.props.AppId, | ||
branchName: this.props.BranchName, | ||
maxResults: 1, | ||
}) | ||
.promise(); | ||
|
||
if ( | ||
jobs.jobSummaries && | ||
jobs.jobSummaries.find(summary => summary.status === 'PENDING') | ||
) { | ||
return Promise.reject('Amplify job already running. Aborting deployment.'); | ||
} | ||
|
||
// Create a pre-signed get URL of the asset so Amplify can retrieve it. | ||
const assetUrl = this.s3.getSignedUrl('getObject', { | ||
Bucket: this.props.S3BucketName, | ||
Key: this.props.S3ObjectKey, | ||
}); | ||
|
||
// Deploy the asset to Amplify. | ||
const deployment = await this.amplify | ||
.startDeployment({ | ||
appId: this.props.AppId, | ||
branchName: this.props.BranchName, | ||
sourceUrl: assetUrl, | ||
}) | ||
.promise(); | ||
|
||
return { | ||
AmplifyJobId: deployment.jobSummary.jobId, | ||
}; | ||
} | ||
|
||
protected async isCreateComplete() { | ||
return this.isActive(this.event.AmplifyJobId); | ||
} | ||
|
||
// ------ | ||
// DELETE | ||
// ------ | ||
|
||
protected async onDelete(): Promise<void> { | ||
// We can't delete this resource as it's a deployment. | ||
return; | ||
} | ||
|
||
protected async isDeleteComplete(): Promise<IsCompleteResponse> { | ||
// We can't delete this resource as it's a deployment. | ||
return { | ||
IsComplete: true, | ||
}; | ||
} | ||
|
||
// ------ | ||
// UPDATE | ||
// ------ | ||
|
||
protected async onUpdate() { | ||
return this.onCreate(); | ||
} | ||
|
||
protected async isUpdateComplete() { | ||
return this.isActive(this.event.AmplifyJobId); | ||
} | ||
|
||
private async isActive(jobId?: string): Promise<IsCompleteResponse> { | ||
if (!jobId) { | ||
throw new Error('Unable to determine Amplify job status without job id'); | ||
} | ||
|
||
const job = await this.amplify | ||
.getJob({ | ||
appId: this.props.AppId, | ||
branchName: this.props.BranchName, | ||
jobId: jobId, | ||
}) | ||
.promise(); | ||
|
||
if (job.job.summary.status === 'SUCCEED') { | ||
return { | ||
IsComplete: true, | ||
Data: { | ||
JobId: jobId, | ||
Status: job.job.summary.status, | ||
}, | ||
}; | ||
} if (job.job.summary.status === 'FAILED' || job.job.summary.status === 'CANCELLED') { | ||
throw new Error(`Amplify job failed with status: ${job.job.summary.status}`); | ||
} else { | ||
return { | ||
IsComplete: false, | ||
}; | ||
} | ||
} | ||
} | ||
|
||
function parseProps(props: any): AmplifyAssetDeploymentProps { | ||
return props; | ||
} |
35 changes: 35 additions & 0 deletions
35
packages/@aws-cdk/aws-amplify/lib/asset-deployment-handler/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import { IsCompleteResponse } from '@aws-cdk/custom-resources/lib/provider-framework/types'; | ||
// aws-sdk available at runtime for lambdas | ||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import { Amplify, S3, config } from 'aws-sdk'; | ||
import { ResourceEvent } from './common'; | ||
import { AmplifyAssetDeploymentHandler } from './handler'; | ||
|
||
const AMPLIFY_ASSET_DEPLOYMENT_RESOURCE_TYPE = 'Custom::AmplifyAssetDeployment'; | ||
|
||
config.logger = console; | ||
|
||
const amplify = new Amplify(); | ||
const s3 = new S3({ signatureVersion: 'v4' }); | ||
|
||
export async function onEvent(event: ResourceEvent) { | ||
const provider = createResourceHandler(event); | ||
return provider.onEvent(); | ||
} | ||
|
||
export async function isComplete( | ||
event: ResourceEvent, | ||
): Promise<IsCompleteResponse> { | ||
const provider = createResourceHandler(event); | ||
return provider.isComplete(); | ||
} | ||
|
||
function createResourceHandler(event: ResourceEvent) { | ||
switch (event.ResourceType) { | ||
case AMPLIFY_ASSET_DEPLOYMENT_RESOURCE_TYPE: | ||
return new AmplifyAssetDeploymentHandler(amplify, s3, event); | ||
default: | ||
throw new Error(`Unsupported resource type "${event.ResourceType}"`); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.