-
Notifications
You must be signed in to change notification settings - Fork 1k
sfn-manage-batch-job-tf: Update AWS Provider to v6 #3271
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
Open
kakakakakku
wants to merge
4
commits into
aws-samples:main
Choose a base branch
from
kakakakakku:sfn-manage-batch-job-tf
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f0a630c
sfn-manage-batch-job-tf: Update AWS Provider to v6
kakakakakku c9107bd
sfn-manage-batch-job-tf: Fix deprecated managed_policy_arns argument
kakakakakku 5652f60
sfn-manage-batch-job-tf: Fix deprecated aws_batch resource attribute
kakakakakku 017d10a
sfn-manage-batch-job-tf: Fix README
kakakakakku File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ terraform { | |
| required_providers { | ||
| aws = { | ||
| source = "hashicorp/aws" | ||
| version = "~>4.0" | ||
| version = "~> 6.0" | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -218,7 +218,11 @@ resource "aws_iam_role" "batch_role" { | |
| }, | ||
| ] | ||
| }) | ||
| managed_policy_arns = ["arn:aws:iam::aws:policy/service-role/AWSBatchServiceRole"] | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| } | ||
|
|
||
| resource "aws_iam_role_policy_attachment" "batch_role" { | ||
| role = aws_iam_role.batch_role.name | ||
| policy_arn = "arn:aws:iam::aws:policy/service-role/AWSBatchServiceRole" | ||
| } | ||
|
|
||
| #Create the ECS instance role | ||
|
|
@@ -236,7 +240,11 @@ resource "aws_iam_role" "batch_ecs_role" { | |
| }, | ||
| ] | ||
| }) | ||
| managed_policy_arns = ["arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceforEC2Role"] | ||
| } | ||
|
|
||
| resource "aws_iam_role_policy_attachment" "batch_ecs_role" { | ||
| role = aws_iam_role.batch_ecs_role.name | ||
| policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceforEC2Role" | ||
| } | ||
|
|
||
| # Create the ECS instance profile | ||
|
|
@@ -246,7 +254,7 @@ resource "aws_iam_instance_profile" "ecs_profile" { | |
| } | ||
|
|
||
| resource "aws_batch_compute_environment" "batch_compute_env" { | ||
| compute_environment_name = "BatchComputeEnvironment-${random_string.random.result}" | ||
| name = "BatchComputeEnvironment-${random_string.random.result}" | ||
| type = "MANAGED" | ||
| service_role = aws_iam_role.batch_role.arn | ||
| compute_resources { | ||
|
|
@@ -264,20 +272,21 @@ resource "aws_batch_compute_environment" "batch_compute_env" { | |
| ] | ||
| } | ||
| depends_on = [ | ||
| aws_iam_role.batch_ecs_role, | ||
| aws_iam_role_policy_attachment.batch_ecs_role, | ||
| aws_subnet.subnet, | ||
| aws_security_group.batch_sg, | ||
| aws_iam_role.batch_role | ||
| aws_iam_role_policy_attachment.batch_role | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_batch_job_queue" "batch_job_queue" { | ||
| name = "StepFunctions-BatchJobManagementQueue-${random_string.random.result}" | ||
| state = "ENABLED" | ||
| priority = 1 | ||
| compute_environments = [ | ||
| aws_batch_compute_environment.batch_compute_env.arn | ||
| ] | ||
| compute_environment_order { | ||
| order = 1 | ||
| compute_environment = aws_batch_compute_environment.batch_compute_env.arn | ||
| } | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| } | ||
|
|
||
| resource "aws_iam_role" "sfn_batch_job_role" { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: This pattern use Terraform not AWS SAM!