Skip to content

Commit

Permalink
fix(glue): S3 path specified in needs to end with slash
Browse files Browse the repository at this point in the history
  • Loading branch information
moomindani committed Mar 4, 2024
1 parent b19f822 commit a595d9f
Show file tree
Hide file tree
Showing 8 changed files with 326 additions and 319 deletions.
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-glue-alpha/lib/job.ts
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,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(/\/?$/, '/'),
};

return {
Expand Down

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 @@ -149,12 +149,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"EtlJob20ServiceRoleD520CA20",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"--enable-continuous-cloudwatch-log": "true",
Expand All @@ -168,7 +162,8 @@
"s3://",
{
"Ref": "EtlJob20SparkUIBucketFD07FBD8"
}
},
"/"
]
]
},
Expand All @@ -187,6 +182,12 @@
"NotifyDelayAfter": 1
},
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"EtlJob20ServiceRoleD520CA20",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -338,12 +339,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"StreamingJob20ServiceRole491E0FFF",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
Expand All @@ -352,6 +347,12 @@
"GlueVersion": "2.0",
"Name": "StreamingJob2.0",
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"StreamingJob20ServiceRole491E0FFF",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -507,12 +508,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"EtlJob30ServiceRole8E675579",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"--enable-continuous-cloudwatch-log": "true",
Expand All @@ -526,7 +521,8 @@
"s3://",
{
"Ref": "EtlJob30SparkUIBucket9D789346"
}
},
"/"
]
]
},
Expand All @@ -545,6 +541,12 @@
"NotifyDelayAfter": 1
},
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"EtlJob30ServiceRole8E675579",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -696,12 +698,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"StreamingJob30ServiceRole443B2FDE",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
Expand All @@ -710,6 +706,12 @@
"GlueVersion": "3.0",
"Name": "StreamingJob3.0",
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"StreamingJob30ServiceRole443B2FDE",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -865,12 +867,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"EtlJob40ServiceRoleBDD9998A",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"--enable-continuous-cloudwatch-log": "true",
Expand All @@ -884,7 +880,8 @@
"s3://",
{
"Ref": "EtlJob40SparkUIBucket02F50B0D"
}
},
"/"
]
]
},
Expand All @@ -903,6 +900,12 @@
"NotifyDelayAfter": 1
},
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"EtlJob40ServiceRoleBDD9998A",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -1054,12 +1057,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"StreamingJob40ServiceRole034BDEBD",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
Expand All @@ -1068,6 +1065,12 @@
"GlueVersion": "4.0",
"Name": "StreamingJob4.0",
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"StreamingJob40ServiceRole034BDEBD",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -1181,19 +1184,19 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"ShellJobServiceRoleCF97BC4B",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
"arg2": "value2"
},
"GlueVersion": "1.0",
"Name": "ShellJob",
"Role": {
"Fn::GetAtt": [
"ShellJobServiceRoleCF97BC4B",
"Arn"
]
},
"Tags": {
"key": "value"
}
Expand Down Expand Up @@ -1306,19 +1309,19 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"ShellJob39ServiceRole2F6F3768",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
"arg2": "value2"
},
"GlueVersion": "1.0",
"Name": "ShellJob39",
"Role": {
"Fn::GetAtt": [
"ShellJob39ServiceRole2F6F3768",
"Arn"
]
},
"Tags": {
"key": "value"
}
Expand Down Expand Up @@ -1432,12 +1435,6 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"RayJobServiceRole51433C3D",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python",
"arg1": "value1",
Expand All @@ -1446,6 +1443,12 @@
"GlueVersion": "4.0",
"Name": "RayJob",
"NumberOfWorkers": 2,
"Role": {
"Fn::GetAtt": [
"RayJobServiceRole51433C3D",
"Arn"
]
},
"Tags": {
"key": "value"
},
Expand Down Expand Up @@ -1559,19 +1562,19 @@
]
}
},
"Role": {
"Fn::GetAtt": [
"EtlJobWithFLEXServiceRoleBA7C99A5",
"Arn"
]
},
"DefaultArguments": {
"--job-language": "python"
},
"ExecutionClass": "FLEX",
"GlueVersion": "3.0",
"Name": "EtlJobWithFLEX",
"NumberOfWorkers": 10,
"Role": {
"Fn::GetAtt": [
"EtlJobWithFLEXServiceRoleBA7C99A5",
"Arn"
]
},
"WorkerType": "G.1X"
}
}
Expand Down

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

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

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

Loading

0 comments on commit a595d9f

Please sign in to comment.