Merge branch 'main' into add-neuron-plugin

aws · Dec 19, 2023 · 0497951 · 0497951
2 parents c3b3313 + 52a5579
commit 0497951
Show file tree

Hide file tree

Showing 43 changed files with 38,987 additions and 137 deletions.
diff --git a/...test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/aws-ecs-integ.assets.json b/...test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/aws-ecs-integ.assets.json
diff --git a/...st/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/aws-ecs-integ.template.json b/...st/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/aws-ecs-integ.template.json
@@ -18,9 +18,6 @@
  "VpcPublicSubnet1Subnet5C2D37C4": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  0,
@@ -44,21 +41,24 @@
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PublicSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPublicSubnet1RouteTable6C95E38E": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PublicSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPublicSubnet1RouteTableAssociation97140677": {
@@ -75,12 +75,12 @@
  "VpcPublicSubnet1DefaultRoute3DA9E72A": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VpcPublicSubnet1RouteTable6C95E38E"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "GatewayId": {
  "Ref": "VpcIGWD7BA715C"
+ },
+ "RouteTableId": {
+ "Ref": "VpcPublicSubnet1RouteTable6C95E38E"
  }
  },
  "DependsOn": [
@@ -102,15 +102,15 @@
  "VpcPublicSubnet1NATGateway4D7517AA": {
  "Type": "AWS::EC2::NatGateway",
  "Properties": {
- "SubnetId": {
- "Ref": "VpcPublicSubnet1Subnet5C2D37C4"
- },
  "AllocationId": {
  "Fn::GetAtt": [
  "VpcPublicSubnet1EIPD7E02669",
  "AllocationId"
  ]
  },
+ "SubnetId": {
+ "Ref": "VpcPublicSubnet1Subnet5C2D37C4"
+ },
  "Tags": [
  {
  "Key": "Name",
@@ -126,9 +126,6 @@
  "VpcPublicSubnet2Subnet691E08A3": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  1,
@@ -152,21 +149,24 @@
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PublicSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPublicSubnet2RouteTable94F7E489": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PublicSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPublicSubnet2RouteTableAssociationDD5762D8": {
@@ -183,12 +183,12 @@
  "VpcPublicSubnet2DefaultRoute97F91067": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VpcPublicSubnet2RouteTable94F7E489"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "GatewayId": {
  "Ref": "VpcIGWD7BA715C"
+ },
+ "RouteTableId": {
+ "Ref": "VpcPublicSubnet2RouteTable94F7E489"
  }
  },
  "DependsOn": [
@@ -210,15 +210,15 @@
  "VpcPublicSubnet2NATGateway9182C01D": {
  "Type": "AWS::EC2::NatGateway",
  "Properties": {
- "SubnetId": {
- "Ref": "VpcPublicSubnet2Subnet691E08A3"
- },
  "AllocationId": {
  "Fn::GetAtt": [
  "VpcPublicSubnet2EIP3C605A87",
  "AllocationId"
  ]
  },
+ "SubnetId": {
+ "Ref": "VpcPublicSubnet2Subnet691E08A3"
+ },
  "Tags": [
  {
  "Key": "Name",
@@ -234,9 +234,6 @@
  "VpcPrivateSubnet1Subnet536B997A": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  0,
@@ -260,21 +257,24 @@
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PrivateSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPrivateSubnet1RouteTableB2C5B500": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PrivateSubnet1"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPrivateSubnet1RouteTableAssociation70C59FA6": {
@@ -291,21 +291,18 @@
  "VpcPrivateSubnet1DefaultRouteBE02A9ED": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VpcPrivateSubnet1RouteTableB2C5B500"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "NatGatewayId": {
  "Ref": "VpcPublicSubnet1NATGateway4D7517AA"
+ },
+ "RouteTableId": {
+ "Ref": "VpcPrivateSubnet1RouteTableB2C5B500"
  }
  }
  },
  "VpcPrivateSubnet2Subnet3788AAA1": {
  "Type": "AWS::EC2::Subnet",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "AvailabilityZone": {
  "Fn::Select": [
  1,
@@ -329,21 +326,24 @@
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PrivateSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPrivateSubnet2RouteTableA678073B": {
  "Type": "AWS::EC2::RouteTable",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "Tags": [
  {
  "Key": "Name",
  "Value": "aws-ecs-integ/Vpc/PrivateSubnet2"
  }
- ]
+ ],
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
+ }
  }
  },
  "VpcPrivateSubnet2RouteTableAssociationA89CAD56": {
@@ -360,12 +360,12 @@
  "VpcPrivateSubnet2DefaultRoute060D2087": {
  "Type": "AWS::EC2::Route",
  "Properties": {
- "RouteTableId": {
- "Ref": "VpcPrivateSubnet2RouteTableA678073B"
- },
  "DestinationCidrBlock": "0.0.0.0/0",
  "NatGatewayId": {
  "Ref": "VpcPublicSubnet2NATGateway9182C01D"
+ },
+ "RouteTableId": {
+ "Ref": "VpcPrivateSubnet2RouteTableA678073B"
  }
  }
  },
@@ -383,11 +383,11 @@
  "VpcVPCGWBF912B6E": {
  "Type": "AWS::EC2::VPCGatewayAttachment",
  "Properties": {
- "VpcId": {
- "Ref": "Vpc8378EB38"
- },
  "InternetGatewayId": {
  "Ref": "VpcIGWD7BA715C"
+ },
+ "VpcId": {
+ "Ref": "Vpc8378EB38"
  }
  }
  },
@@ -421,7 +421,8 @@
  "logs:CreateLogGroup",
  "logs:CreateLogStream",
  "logs:DescribeLogStreams",
- "logs:PutLogEvents"
+ "logs:PutLogEvents",
+ "logs:PutRetentionPolicy"
  ],
  "Effect": "Allow",
  "Resource": "*"
@@ -453,7 +454,8 @@
  },
  "log_group_name": "ecs-integ-test",
  "auto_create_group": "true",
- "log_stream_prefix": "nginx"
+ "log_stream_prefix": "nginx",
+ "log_retention_days": "1"
  }
  },
  "Name": "nginx",

diff --git a/...g/framework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/cdk.out b/...g/framework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/cdk.out
diff --git a/...ramework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/integ.json b/...ramework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/integ.json
diff --git a/...ework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/manifest.json b/...ework-integ/test/aws-ecs/test/fargate/integ.firelens-cloudwatch.js.snapshot/manifest.json