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

fix(glue): s3 path specified in --spark-event-logs-path needs to end with slash #29357

Merged
merged 10 commits into from
Mar 19, 2024
Merged

fix(glue): s3 path specified in --spark-event-logs-path needs to end with slash #29357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a595d9f
fix(glue): S3 path specified in needs to end with slash
moomindani Mar 4, 2024
fe3555f
Added trailingSlash option to s3UrlForObject
moomindani Mar 7, 2024
af84fd6
Fixed unit test for job
moomindani Mar 7, 2024
3ee4a9c
Resolved conflicts with PR #28625
moomindani Mar 11, 2024
074c130
Merge branch 'main' into fix-glue-sparkui
moomindani Mar 12, 2024
bebd67f
Revert S3 side change for s3UrlForObject
moomindani Mar 13, 2024
ffebc56
Made change in integ.job
moomindani Mar 13, 2024
0a1ce0c
Updated snapshot
moomindani Mar 13, 2024
2a16741
Update packages/@aws-cdk/aws-glue-alpha/lib/job.ts
scanlonp Mar 19, 2024
5cb1ef2
Merge branch 'main' into fix-glue-sparkui
scanlonp Mar 19, 2024
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 packages/@aws-cdk/aws-glue-alpha/lib/job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ export class Job extends JobBase {
bucket.grantReadWrite(role, this.cleanPrefixForGrant(props.prefix));
const args = {
'--enable-spark-ui': 'true',
'--spark-event-logs-path': bucket.s3UrlForObject(props.prefix),
'--spark-event-logs-path': bucket.s3UrlForObject(props.prefix).replace(/\/?$/, '/'), // path will always end with a slash
};

return {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.assets.json
View file
Open in desktop

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

174 changes: 171 additions & 3 deletions packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/aws-glue-job.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@
"s3://",
{
"Ref": "EtlJob20SparkUIBucketFD07FBD8"
}
},
"/"
]
]
},
Expand Down Expand Up @@ -267,6 +268,43 @@
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:Abort*",
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
"s3:PutObjectRetention",
"s3:PutObjectTagging",
"s3:PutObjectVersionTagging"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"StreamingJob20SparkUIBucket92EF3706",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"StreamingJob20SparkUIBucket92EF3706",
"Arn"
]
},
"/*"
]
]
}
]
},
{
"Action": [
"s3:GetBucket*",
Expand Down Expand Up @@ -319,6 +357,11 @@
]
}
},
"StreamingJob20SparkUIBucket92EF3706": {
"Type": "AWS::S3::Bucket",
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"StreamingJob20355B58C7": {
"Type": "AWS::Glue::Job",
"Properties": {
Expand All @@ -340,6 +383,19 @@
},
"DefaultArguments": {
"--job-language": "python",
"--enable-spark-ui": "true",
"--spark-event-logs-path": {
"Fn::Join": [
"",
[
"s3://",
{
"Ref": "StreamingJob20SparkUIBucket92EF3706"
},
"/"
]
]
},
"arg1": "value1",
"arg2": "value2"
},
Expand Down Expand Up @@ -520,7 +576,8 @@
"s3://",
{
"Ref": "EtlJob30SparkUIBucket9D789346"
}
},
"/"
]
]
},
Expand Down Expand Up @@ -625,6 +682,43 @@
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:Abort*",
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
"s3:PutObjectRetention",
"s3:PutObjectTagging",
"s3:PutObjectVersionTagging"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"StreamingJob30SparkUIBucketEFBF52D3",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"StreamingJob30SparkUIBucketEFBF52D3",
"Arn"
]
},
"/*"
]
]
}
]
},
{
"Action": [
"s3:GetBucket*",
Expand Down Expand Up @@ -677,6 +771,11 @@
]
}
},
"StreamingJob30SparkUIBucketEFBF52D3": {
"Type": "AWS::S3::Bucket",
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"StreamingJob30E005FBEB": {
"Type": "AWS::Glue::Job",
"Properties": {
Expand All @@ -698,6 +797,19 @@
},
"DefaultArguments": {
"--job-language": "python",
"--enable-spark-ui": "true",
"--spark-event-logs-path": {
"Fn::Join": [
"",
[
"s3://",
{
"Ref": "StreamingJob30SparkUIBucketEFBF52D3"
},
"/"
]
]
},
"arg1": "value1",
"arg2": "value2"
},
Expand Down Expand Up @@ -878,7 +990,8 @@
"s3://",
{
"Ref": "EtlJob40SparkUIBucket02F50B0D"
}
},
"/"
]
]
},
Expand Down Expand Up @@ -983,6 +1096,43 @@
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"s3:Abort*",
"s3:DeleteObject*",
"s3:GetBucket*",
"s3:GetObject*",
"s3:List*",
"s3:PutObject",
"s3:PutObjectLegalHold",
"s3:PutObjectRetention",
"s3:PutObjectTagging",
"s3:PutObjectVersionTagging"
],
"Effect": "Allow",
"Resource": [
{
"Fn::GetAtt": [
"StreamingJob40SparkUIBucketA97E24C6",
"Arn"
]
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"StreamingJob40SparkUIBucketA97E24C6",
"Arn"
]
},
"/*"
]
]
}
]
},
{
"Action": [
"s3:GetBucket*",
Expand Down Expand Up @@ -1035,6 +1185,11 @@
]
}
},
"StreamingJob40SparkUIBucketA97E24C6": {
"Type": "AWS::S3::Bucket",
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
},
"StreamingJob40E284A782": {
"Type": "AWS::Glue::Job",
"Properties": {
Expand All @@ -1056,6 +1211,19 @@
},
"DefaultArguments": {
"--job-language": "python",
"--enable-spark-ui": "true",
"--spark-event-logs-path": {
"Fn::Join": [
"",
[
"s3://",
{
"Ref": "StreamingJob40SparkUIBucketA97E24C6"
},
"/"
]
]
},
"arg1": "value1",
"arg2": "value2"
},
Expand Down
20 changes: 19 additions & 1 deletion packages/@aws-cdk/aws-glue-alpha/test/integ.job.js.snapshot/manifest.json
View file
Open in desktop

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

Loading