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

feat(batch): ComputeEnvironment implements IConnectable #21458

Merged
merged 10 commits into from
Aug 5, 2022
Merged

feat(batch): ComputeEnvironment implements IConnectable #21458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ad4dbd
feat(aws-batch): make ComputeEnvironment connectable
Aug 3, 2022
de70e41
Restore fargate integration tests
Aug 4, 2022
8fb31c4
doc: ComputeEnvironments are now connectable
Aug 4, 2022
c79b89d
doc: Added efs namespace to connectable example
Aug 4, 2022
75fccbf
Merge branch 'main' into connectableComputeEnvironment
tcutts Aug 4, 2022
2274990
Update packages/@aws-cdk/aws-batch/README.md
tcutts Aug 4, 2022
4e1d9eb
Added unit test for connectable ComputeEnvironment
Aug 4, 2022
74e6d49
Changes suggested in feedback for PR #21458
Aug 4, 2022
7a70ff8
Merge branch 'main' into connectableComputeEnvironment
tcutts Aug 4, 2022
375d4b7
Merge branch 'main' into connectableComputeEnvironment
mergify[bot] Aug 5, 2022
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
Prev Previous commit
Next Next commit
Restore fargate integration tests
  • Loading branch information
Tim Cutts committed Aug 4, 2022
commit de70e41e5877b7bdd5c5cf8e3614f1d339d8e910
140 changes: 140 additions & 0 deletions packages/@aws-cdk/aws-batch/test/batch-with-efs.integ.snapshot/batch-stack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,146 @@
},
"Timeout": {}
}
},
"batchsecret7CD5E4C6": {
"Type": "AWS::SecretsManager::Secret",
"Properties": {
"GenerateSecretString": {}
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"executionroleD9A39BE6": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "batch.amazonaws.com"
}
}
],
"Version": "2012-10-17"
}
}
},
"executionroleDefaultPolicy497F11A3": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"secretsmanager:DescribeSecret",
"secretsmanager:GetSecretValue"
],
"Effect": "Allow",
"Resource": {
"Ref": "batchsecret7CD5E4C6"
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "executionroleDefaultPolicy497F11A3",
"Roles": [
{
"Ref": "executionroleD9A39BE6"
}
]
}
},
"batchjobdeffargate7FE30059": {
"Type": "AWS::Batch::JobDefinition",
"Properties": {
"Type": "container",
"ContainerProperties": {
"Environment": [
{
"Name": "AWS_REGION",
"Value": {
"Ref": "AWS::Region"
}
},
{
"Name": "AWS_ACCOUNT",
"Value": {
"Ref": "AWS::AccountId"
}
}
],
"ExecutionRoleArn": {
"Fn::GetAtt": [
"executionroleD9A39BE6",
"Arn"
]
},
"FargatePlatformConfiguration": {
"PlatformVersion": "1.4.0"
},
"Image": "docker/whalesay",
"JobRoleArn": {
"Fn::GetAtt": [
"DefaultJobRole72A01394",
"Arn"
]
},
"MountPoints": [
{
"ContainerPath": "/mnt",
"ReadOnly": true,
"SourceVolume": "batchstackEFS25FF7B1E"
}
],
"Privileged": false,
"ReadonlyRootFilesystem": false,
"ResourceRequirements": [
{
"Type": "VCPU",
"Value": "0.25"
},
{
"Type": "MEMORY",
"Value": "512"
}
],
"Secrets": [
{
"Name": "SECRET",
"ValueFrom": {
"Ref": "batchsecret7CD5E4C6"
}
}
],
"Volumes": [
{
"EfsVolumeConfiguration": {
"AuthorizationConfig": {
"AccessPointId": {
"Ref": "EFSAccessPointA847C4A5"
},
"Iam": "ENABLED"
},
"FileSystemId": {
"Ref": "EFSF3301CFD"
},
"TransitEncryption": "ENABLED"
},
"Name": "batchstackEFS25FF7B1E"
}
]
},
"PlatformCapabilities": [
"FARGATE"
],
"RetryStrategy": {
"Attempts": 1
},
"Timeout": {}
}
}
}
}
24 changes: 24 additions & 0 deletions packages/@aws-cdk/aws-batch/test/batch-with-efs.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,30 @@
"type": "aws:cdk:logicalId",
"data": "batchjobdeffromecrE0E30DAD"
}
],
"/batch-stack/batch-secret/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "batchsecret7CD5E4C6"
}
],
"/batch-stack/execution-role/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "executionroleD9A39BE6"
}
],
"/batch-stack/execution-role/DefaultPolicy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "executionroleDefaultPolicy497F11A3"
}
],
"/batch-stack/batch-job-def-fargate/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "batchjobdeffargate7FE30059"
}
]
},
"displayName": "batch-stack"
Expand Down
Loading