Merge branch 'main' into merge-back/2.131.0

nmussy · Mar 1, 2024 · 74f447c · 74f447c
2 parents 92b912d + ebe2adf
commit 74f447c
Show file tree

Hide file tree

Showing 23 changed files with 1,160 additions and 181 deletions.
diff --git a/...ng/framework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/manifest.json b/...ng/framework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/manifest.json
diff --git a/...ramework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/stack.assets.json b/...ramework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/stack.assets.json
diff --git a/...mework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/stack.template.json b/...mework-integ/test/aws-batch/test/integ.ecs-job-definition.js.snapshot/stack.template.json
@@ -997,6 +997,106 @@
     "Timeout": {},
     "Type": "container"
    }
+  },
+  "WindowsFargateContainerExecutionRoleAE15A6C1": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "ecs-tasks.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    }
+   }
+  },
+  "WindowsFargateContainerExecutionRoleDefaultPolicyA16F3283": {
+   "Type": "AWS::IAM::Policy",
+   "Properties": {
+    "PolicyDocument": {
+     "Statement": [
+      {
+       "Action": [
+        "logs:CreateLogStream",
+        "logs:PutLogEvents"
+       ],
+       "Effect": "Allow",
+       "Resource": {
+        "Fn::Join": [
+         "",
+         [
+          "arn:",
+          {
+           "Ref": "AWS::Partition"
+          },
+          ":logs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":",
+          {
+           "Ref": "AWS::AccountId"
+          },
+          ":log-group:/aws/batch/job:*"
+         ]
+        ]
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "PolicyName": "WindowsFargateContainerExecutionRoleDefaultPolicyA16F3283",
+    "Roles": [
+     {
+      "Ref": "WindowsFargateContainerExecutionRoleAE15A6C1"
+     }
+    ]
+   }
+  },
+  "WindowsJobDefinitio0652E08A": {
+   "Type": "AWS::Batch::JobDefinition",
+   "Properties": {
+    "ContainerProperties": {
+     "Environment": [],
+     "ExecutionRoleArn": {
+      "Fn::GetAtt": [
+       "WindowsFargateContainerExecutionRoleAE15A6C1",
+       "Arn"
+      ]
+     },
+     "FargatePlatformConfiguration": {},
+     "Image": "mcr.microsoft.com/dotnet/framework/runtime:4.7.2",
+     "NetworkConfiguration": {
+      "AssignPublicIp": "DISABLED"
+     },
+     "ResourceRequirements": [
+      {
+       "Type": "MEMORY",
+       "Value": "8192"
+      },
+      {
+       "Type": "VCPU",
+       "Value": "2"
+      }
+     ],
+     "RuntimePlatform": {
+      "CpuArchitecture": "X86_64",
+      "OperatingSystemFamily": "WINDOWS_SERVER_2019_FULL"
+     }
+    },
+    "JobDefinitionName": "windows-job-definition",
+    "PlatformCapabilities": [
+     "FARGATE"
+    ],
+    "RetryStrategy": {},
+    "Timeout": {},
+    "Type": "container"
+   }
   }
  },
  "Parameters": {