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.

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

chore(doc): Correct S3-bucket name #842

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion framework/API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
's3:GetObject',
],
resources: [
'arn:aws:s3:::aws-data-analytics-workshop',
'arn:aws:s3:::aws-data-analytics-workshop/*'],
'arn:aws:s3:::aws-data-analytics-workshops',
'arn:aws:s3:::aws-data-analytics-workshops/*'],
})],
});

Expand Down Expand Up @@ -73,4 +73,4 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
/// !hide

const app = new cdk.App();
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
's3:GetObject',
],
resources: [
'arn:aws:s3:::aws-data-analytics-workshop',
'arn:aws:s3:::aws-data-analytics-workshop/*'],
'arn:aws:s3:::aws-data-analytics-workshops',
'arn:aws:s3:::aws-data-analytics-workshops/*'],
})],
});

Expand Down Expand Up @@ -60,4 +60,4 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {


const app = new cdk.App();
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
actions: [
's3:GetObject',
],
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
})],
});

Expand Down Expand Up @@ -66,4 +66,4 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {


const app = new cdk.App();
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
actions: [
's3:GetObject',
],
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
})],
});

Expand Down Expand Up @@ -61,4 +61,4 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {


const app = new cdk.App();
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
new ExampleSparkEmrContainersStack(app, 'ExampleSparkEmrServerlessStack');
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import { DEFAULT_KARPENTER_VERSION } from '../../karpenter-releases';
* actions: [
* 's3:GetObject',
* ],
* resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
* resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
* })],
* });
*
Expand Down
2 changes: 1 addition & 1 deletion framework/test/e2e/spark-emr-containers.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const s3Read = new PolicyDocument({
actions: [
's3:GetObject',
],
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
})],
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const policy = new ManagedPolicy(emrEksClusterStack, 'testPolicy', {
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down
16 changes: 8 additions & 8 deletions framework/test/unit/processing/spark-runtime-containers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('With default configuration, the construct ', () => {
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down Expand Up @@ -514,7 +514,7 @@ describe('With default configuration, the construct ', () => {
Match.objectLike({
Action: 's3:GetObject',
Effect: 'Allow',
Resource: 'arn:aws:s3:::aws-data-analytics-workshop',
Resource: 'arn:aws:s3:::aws-data-analytics-workshops',
}),
]),
}),
Expand Down Expand Up @@ -969,7 +969,7 @@ describe('Test for interactive endpoint', () => {
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down Expand Up @@ -1039,7 +1039,7 @@ describe('Test for interactive endpoint without default karpenter nodepool', ()
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down Expand Up @@ -1088,7 +1088,7 @@ describe('Test for grant job execution', () => {
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down Expand Up @@ -1149,7 +1149,7 @@ describe('Remove resource when deletion protection is disable and set removal is
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand Down Expand Up @@ -1206,7 +1206,7 @@ describe('Retain resource when removal is set to retain', () => {
document: new PolicyDocument({
statements: [
new PolicyStatement({
resources: ['arn:aws:s3:::aws-data-analytics-workshop'],
resources: ['arn:aws:s3:::aws-data-analytics-workshops'],
actions: ['s3:GetObject'],
}),
],
Expand All @@ -1231,4 +1231,4 @@ describe('Retain resource when removal is set to retain', () => {
});
});

});
});
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class ExampleSparkEmrContainersStack extends cdk.Stack {
's3:GetObject',
],
resources: [
'arn:aws:s3:::aws-data-analytics-workshop',
'arn:aws:s3:::aws-data-analytics-workshop/*'],
'arn:aws:s3:::aws-data-analytics-workshops',
'arn:aws:s3:::aws-data-analytics-workshops/*'],
})],
});

Expand Down Expand Up @@ -112,7 +112,7 @@ class ExampleSparkEmrContainersStack(cdk.Stack):
statements=[PolicyStatement(
actions=["s3:GetObject"
],
resources=["arn:aws:s3:::aws-data-analytics-workshop", "arn:aws:s3:::aws-data-analytics-workshop/*"
resources=["arn:aws:s3:::aws-data-analytics-workshops", "arn:aws:s3:::aws-data-analytics-workshops/*"
]
)]
)
Expand Down
Loading