Skip to content

fix: order mismatch between config and api #96

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

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

fix: order mismatch between config and api #96

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const getPublicAccessBlock = block => block === true
? { BlockPublicAcls: true, BlockPublicPolicy: true, IgnorePublicAcls: true, RestrictPublicBuckets: true }
: { BlockPublicAcls: false, BlockPublicPolicy: false, IgnorePublicAcls: false, RestrictPublicBuckets: false }

const sortObject = obj => typeof obj === 'object'
? Object.fromEntries(Object.entries(obj).sort())
: obj

class DeploymentBucketPlugin {
constructor(serverless, options) {
this.serverless = serverless
Expand Down Expand Up @@ -242,7 +246,7 @@ class DeploymentBucketPlugin {
try {
const config = getPublicAccessBlock(blockPublicAccess)
const response = await this.provider.request('S3', 'getPublicAccessBlock', { Bucket: name })
return response && JSON.stringify(response.PublicAccessBlockConfiguration) !== JSON.stringify(config)
return response && JSON.stringify(sortObject(response.PublicAccessBlockConfiguration)) !== JSON.stringify(sortObject(config))
} catch (e) {
return blockPublicAccess
}
Expand Down
2 changes: 1 addition & 1 deletion lib/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ describe('DeploymentBucketPlugin', () => {
.mockResolvedValueOnce({}) // S3.getBucketAccelerateConfiguration()
.mockResolvedValueOnce({
PublicAccessBlockConfiguration: {
BlockPublicAcls: true, BlockPublicPolicy: true, IgnorePublicAcls: true, RestrictPublicBuckets: true
BlockPublicAcls: true, IgnorePublicAcls: true, BlockPublicPolicy: true, RestrictPublicBuckets: true
}
}) // S3.getPublicAccessBlock()

Expand Down