Amazon Elastic Compute Cloud Update: VPC Flow Logs Service adds a new API, GetFlowLogsIntegrationTemplate, which generates CloudFormation templates for Athena. For more info, see https://docs.aws.amazon.com/console/vpc/flow-logs/athena

Author: AWS

.changes/next-release/feature-AmazonElasticComputeCloud-b70fcc4.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon Elastic Compute Cloud",
+    "contributor": "",
+    "description": "VPC Flow Logs Service adds a new API, GetFlowLogsIntegrationTemplate, which generates CloudFormation templates for Athena. For more info, see https://docs.aws.amazon.com/console/vpc/flow-logs/athena"
+}

services/ec2/src/main/resources/codegen-resources/service-2.json

@@ -3224,6 +3224,16 @@
       "output":{"shape":"GetEbsEncryptionByDefaultResult"},
       "documentation":"<p>Describes whether EBS encryption by default is enabled for your account in the current Region.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
+    "GetFlowLogsIntegrationTemplate":{
+      "name":"GetFlowLogsIntegrationTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetFlowLogsIntegrationTemplateRequest"},
+      "output":{"shape":"GetFlowLogsIntegrationTemplateResult"},
+      "documentation":"<p>Generates a CloudFormation template that streamlines and automates the integration of VPC flow logs with Amazon Athena. This make it easier for you to query and gain insights from VPC flow logs data. Based on the information that you provide, we configure resources in the template to do the following:</p> <ul> <li> <p>Create a table in Athena that maps fields to a custom log format</p> </li> <li> <p>Create a Lambda function that updates the table with new partitions on a daily, weekly, or monthly basis</p> </li> <li> <p>Create a table partitioned between two timestamps in the past</p> </li> <li> <p>Create a set of named queries in Athena that you can use to get started quickly</p> </li> </ul>"
+    },
     "GetGroupsForCapacityReservation":{
       "name":"GetGroupsForCapacityReservation",
       "http":{
@@ -5692,19 +5702,19 @@
     "AssociateSubnetCidrBlockRequest":{
       "type":"structure",
       "required":[
-        "SubnetId",
-        "Ipv6CidrBlock"
+        "Ipv6CidrBlock",
+        "SubnetId"
       ],
       "members":{
-        "SubnetId":{
-          "shape":"SubnetId",
-          "documentation":"<p>The ID of your subnet.</p>",
-          "locationName":"subnetId"
-        },
         "Ipv6CidrBlock":{
           "shape":"String",
           "documentation":"<p>The IPv6 CIDR block for your subnet. The subnet must have a /64 prefix length.</p>",
           "locationName":"ipv6CidrBlock"
+        },
+        "SubnetId":{
+          "shape":"SubnetId",
+          "documentation":"<p>The ID of your subnet.</p>",
+          "locationName":"subnetId"
         }
       }
     },
@@ -5930,6 +5940,41 @@
         "disassociated"
       ]
     },
+    "AthenaIntegration":{
+      "type":"structure",
+      "required":[
+        "IntegrationResultS3DestinationArn",
+        "PartitionLoadFrequency"
+      ],
+      "members":{
+        "IntegrationResultS3DestinationArn":{
+          "shape":"String",
+          "documentation":"<p>The location in Amazon S3 to store the generated CloudFormation template.</p>"
+        },
+        "PartitionLoadFrequency":{
+          "shape":"PartitionLoadFrequency",
+          "documentation":"<p>The schedule for adding new partitions to the table.</p>"
+        },
+        "PartitionStartDate":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The start date for the partition.</p>"
+        },
+        "PartitionEndDate":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The end date for the partition.</p>"
+        }
+      },
+      "documentation":"<p>Describes integration options for Amazon Athena.</p>"
+    },
+    "AthenaIntegrationsSet":{
+      "type":"list",
+      "member":{
+        "shape":"AthenaIntegration",
+        "locationName":"item"
+      },
+      "max":10,
+      "min":1
+    },
     "AttachClassicLinkVpcRequest":{
       "type":"structure",
       "required":[
@@ -10331,8 +10376,8 @@
     "CreateSubnetRequest":{
       "type":"structure",
       "required":[
-        "VpcId",
-        "CidrBlock"
+        "CidrBlock",
+        "VpcId"
       ],
       "members":{
         "TagSpecifications":{
@@ -10348,6 +10393,10 @@
           "shape":"String",
           "documentation":"<p>The AZ ID or the Local Zone ID of the subnet.</p>"
         },
+        "CidrBlock":{
+          "shape":"String",
+          "documentation":"<p>The IPv4 network range for the subnet, in CIDR notation. For example, <code>10.0.0.0/24</code>. We modify the specified CIDR block to its canonical form; for example, if you specify <code>100.68.0.18/18</code>, we modify it to <code>100.68.0.0/18</code>.</p>"
+        },
         "Ipv6CidrBlock":{
           "shape":"String",
           "documentation":"<p>The IPv6 network range for the subnet, in CIDR notation. The subnet size must use a /64 prefix length.</p>"
@@ -10364,10 +10413,6 @@
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
-        },
-        "CidrBlock":{
-          "shape":"String",
-          "documentation":"<p>The IPv4 network range for the subnet, in CIDR notation. For example, <code>10.0.0.0/24</code>. We modify the specified CIDR block to its canonical form; for example, if you specify <code>100.68.0.18/18</code>, we modify it to <code>100.68.0.0/18</code>.</p>"
         }
       }
     },
@@ -17254,7 +17299,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>availability-zone</code> - The Availability Zone for the subnet. You can also use <code>availabilityZone</code> as the filter name.</p> </li> <li> <p> <code>availability-zone-id</code> - The ID of the Availability Zone for the subnet. You can also use <code>availabilityZoneId</code> as the filter name.</p> </li> <li> <p> <code>available-ip-address-count</code> - The number of IPv4 addresses in the subnet that are available.</p> </li> <li> <p> <code>cidr-block</code> - The IPv4 CIDR block of the subnet. The CIDR block you specify must exactly match the subnet's CIDR block for information to be returned for the subnet. You can also use <code>cidr</code> or <code>cidrBlock</code> as the filter names.</p> </li> <li> <p> <code>default-for-az</code> - Indicates whether this is the default subnet for the Availability Zone. You can also use <code>defaultForAz</code> as the filter name.</p> </li> <li> <p> <code>ipv6-cidr-block-association.ipv6-cidr-block</code> - An IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>ipv6-cidr-block-association.association-id</code> - An association ID for an IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>ipv6-cidr-block-association.state</code> - The state of an IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>owner-id</code> - The ID of the AWS account that owns the subnet.</p> </li> <li> <p> <code>state</code> - The state of the subnet (<code>pending</code> | <code>available</code>).</p> </li> <li> <p> <code>subnet-arn</code> - The Amazon Resource Name (ARN) of the subnet.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC for the subnet.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>availability-zone</code> - The Availability Zone for the subnet. You can also use <code>availabilityZone</code> as the filter name.</p> </li> <li> <p> <code>availability-zone-id</code> - The ID of the Availability Zone for the subnet. You can also use <code>availabilityZoneId</code> as the filter name.</p> </li> <li> <p> <code>available-ip-address-count</code> - The number of IPv4 addresses in the subnet that are available.</p> </li> <li> <p> <code>cidr-block</code> - The IPv4 CIDR block of the subnet. The CIDR block you specify must exactly match the subnet's CIDR block for information to be returned for the subnet. You can also use <code>cidr</code> or <code>cidrBlock</code> as the filter names.</p> </li> <li> <p> <code>default-for-az</code> - Indicates whether this is the default subnet for the Availability Zone. You can also use <code>defaultForAz</code> as the filter name.</p> </li> <li> <p> <code>ipv6-cidr-block-association.ipv6-cidr-block</code> - An IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>ipv6-cidr-block-association.association-id</code> - An association ID for an IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>ipv6-cidr-block-association.state</code> - The state of an IPv6 CIDR block associated with the subnet.</p> </li> <li> <p> <code>outpost-arn</code> - The Amazon Resource Name (ARN) of the Outpost.</p> </li> <li> <p> <code>owner-id</code> - The ID of the AWS account that owns the subnet.</p> </li> <li> <p> <code>state</code> - The state of the subnet (<code>pending</code> | <code>available</code>).</p> </li> <li> <p> <code>subnet-arn</code> - The Amazon Resource Name (ARN) of the subnet.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC for the subnet.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "SubnetIds":{
@@ -22093,6 +22138,43 @@
         }
       }
     },
+    "GetFlowLogsIntegrationTemplateRequest":{
+      "type":"structure",
+      "required":[
+        "FlowLogId",
+        "ConfigDeliveryS3DestinationArn",
+        "IntegrateServices"
+      ],
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "FlowLogId":{
+          "shape":"VpcFlowLogId",
+          "documentation":"<p>The ID of the flow log.</p>"
+        },
+        "ConfigDeliveryS3DestinationArn":{
+          "shape":"String",
+          "documentation":"<p>To store the CloudFormation template in Amazon S3, specify the location in Amazon S3.</p>"
+        },
+        "IntegrateServices":{
+          "shape":"IntegrateServices",
+          "documentation":"<p>Information about the service integration.</p>",
+          "locationName":"IntegrateService"
+        }
+      }
+    },
+    "GetFlowLogsIntegrationTemplateResult":{
+      "type":"structure",
+      "members":{
+        "Result":{
+          "shape":"String",
+          "documentation":"<p>The generated CloudFormation template.</p>",
+          "locationName":"result"
+        }
+      }
+    },
     "GetGroupsForCapacityReservationRequest":{
       "type":"structure",
       "required":["CapacityReservationId"],
@@ -26197,6 +26279,17 @@
       }
     },
     "Integer":{"type":"integer"},
+    "IntegrateServices":{
+      "type":"structure",
+      "members":{
+        "AthenaIntegrations":{
+          "shape":"AthenaIntegrationsSet",
+          "documentation":"<p>Information about the integration with Amazon Athena.</p>",
+          "locationName":"AthenaIntegration"
+        }
+      },
+      "documentation":"<p>Describes service integrations with VPC Flow logs.</p>"
+    },
     "InterfacePermissionType":{
       "type":"string",
       "enum":[
@@ -31431,6 +31524,15 @@
         "locationName":"Owner"
       }
     },
+    "PartitionLoadFrequency":{
+      "type":"string",
+      "enum":[
+        "none",
+        "daily",
+        "weekly",
+        "monthly"
+      ]
+    },
     "PathComponent":{
       "type":"structure",
       "members":{