Skip to content

Commit

Permalink
fix(stepfunctions-tasks): missing tags & perms for emr cluster creati…
Browse files Browse the repository at this point in the history
…on (#28327)

Per the [documentation](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-iam-policies.html#manually-tagged-resources):

* To use managed policies, pass the user tag `for-use-with-amazon-emr-managed-policies = true` when you provision a cluster with the CLI, SDK, or another method.
* For resources that are not created by Amazon EMR, you must add tags to those resources. For example, you must tag Amazon EC2 subnets, EC2 security groups (if not created by Amazon EMR), and VPCs (if you want Amazon EMR to create security groups).

Also, `AmazonEMRServicePolicy_v2` only has `iam:PassRole` on the default EMR roles and needs this on the cluster role created by the CDK.

Running the step function:

<img width="221" alt="Screenshot 2023-12-11 at 5 24 09 AM" src="https://github.com/aws/aws-cdk/assets/3310356/3b3b33c1-bcb8-4836-a1c0-123a8e7186ba">

<img width="661" alt="Screenshot 2023-12-11 at 5 24 03 AM" src="https://github.com/aws/aws-cdk/assets/3310356/c7f4fef9-0bce-42b9-a509-935cfe9a121b">

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
msambol committed Dec 11, 2023
1 parent f3dafa4 commit 14e5e50
Show file tree
Hide file tree
Showing 36 changed files with 3,944 additions and 634 deletions.

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.

Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
"Statement": [
{
"Action": "sts:AssumeRole",
"Condition": {
"StringEquals": {
"aws:RequestTag/for-use-with-amazon-emr-managed-policies": "true"
}
},
"Effect": "Allow",
"Principal": {
"Service": "elasticmapreduce.amazonaws.com"
Expand All @@ -36,6 +31,32 @@
]
}
},
"EmrCreateClusterServiceRoleDefaultPolicyA8B4FA32": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "iam:PassRole",
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"EmrCreateClusterInstanceRoleC80466F5",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "EmrCreateClusterServiceRoleDefaultPolicyA8B4FA32",
"Roles": [
{
"Ref": "EmrCreateClusterServiceRole5251910D"
}
]
}
},
"EmrCreateClusterInstanceRoleC80466F5": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -90,6 +111,7 @@
"Statement": [
{
"Action": [
"elasticmapreduce:AddTags",
"elasticmapreduce:DescribeCluster",
"elasticmapreduce:RunJobFlow",
"elasticmapreduce:TerminateJobFlows"
Expand Down Expand Up @@ -197,7 +219,7 @@
{
"Ref": "EmrCreateClusterServiceRole5251910D"
},
"\",\"ReleaseLabel\":\"emr-5.36.1\",\"Tags\":[{\"Key\":\"Key\",\"Value\":\"Value\"}],\"VisibleToAllUsers\":true}}}}"
"\",\"ReleaseLabel\":\"emr-5.36.1\",\"Tags\":[{\"Key\":\"Key\",\"Value\":\"Value\"},{\"Key\":\"for-use-with-amazon-emr-managed-policies\",\"Value\":\"true\"}],\"VisibleToAllUsers\":true}}}}"
]
]
},
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.

0 comments on commit 14e5e50

Please sign in to comment.