From 0b568a9f96b76a7b563708230b3bec691a009339 Mon Sep 17 00:00:00 2001 From: drewmullen Date: Tue, 18 Jan 2022 15:03:34 -0500 Subject: [PATCH 1/5] data source to preview cidr --- internal/provider/provider.go | 1 + .../vpc_ipam_preview_next_cidr_data_source.go | 91 ++++++++++ ...ipam_preview_next_cidr_data_source_test.go | 168 ++++++++++++++++++ .../vpc_ipam_preview_next_cidr.html.markdown | 52 ++++++ 4 files changed, 312 insertions(+) create mode 100644 internal/service/ec2/vpc_ipam_preview_next_cidr_data_source.go create mode 100644 internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go create mode 100644 website/docs/d/vpc_ipam_preview_next_cidr.html.markdown diff --git a/internal/provider/provider.go b/internal/provider/provider.go index b05196f8a35..cbc877adc5d 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -484,6 +484,7 @@ func Provider() *schema.Provider { "aws_vpc_endpoint_service": ec2.DataSourceVPCEndpointService(), "aws_vpc_endpoint": ec2.DataSourceVPCEndpoint(), "aws_vpc_ipam_pool": ec2.DataSourceVPCIpamPool(), + "aws_vpc_ipam_preview_next_cidr": ec2.DataSourceVPCIpamPreviewNextCidr(), "aws_vpc_peering_connection": ec2.DataSourceVPCPeeringConnection(), "aws_vpc_peering_connections": ec2.DataSourceVPCPeeringConnections(), "aws_vpc": ec2.DataSourceVPC(), diff --git a/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source.go b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source.go new file mode 100644 index 00000000000..3fa0ffd3469 --- /dev/null +++ b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source.go @@ -0,0 +1,91 @@ +package ec2 + +import ( + "fmt" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/verify" +) + +func DataSourceVPCIpamPreviewNextCidr() *schema.Resource { + return &schema.Resource{ + Read: dataSourceVPCIpamPreviewNextCidrRead, + + Schema: map[string]*schema.Schema{ + "cidr": { + Type: schema.TypeString, + Computed: true, + }, + "disallowed_cidrs": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateFunc: validation.Any( + verify.ValidIPv4CIDRNetworkAddress, + // Follow the numbers used for netmask_length + validation.IsCIDRNetwork(0, 32), + ), + }, + }, + "ipam_pool_id": { + Type: schema.TypeString, + Required: true, + }, + "netmask_length": { + // Possible netmask lengths for IPv4 addresses are 0 - 32. + // AllocateIpamPoolCidr API + // - If there is no DefaultNetmaskLength allocation rule set on the pool, + // you must specify either the NetmaskLength or the CIDR. + // - If the DefaultNetmaskLength allocation rule is set on the pool, + // you can specify either the NetmaskLength or the CIDR and the + // DefaultNetmaskLength allocation rule will be ignored. + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(0, 32), + }, + }, + } +} + +func dataSourceVPCIpamPreviewNextCidrRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*conns.AWSClient).EC2Conn + poolId := d.Get("ipam_pool_id").(string) + + input := &ec2.AllocateIpamPoolCidrInput{ + ClientToken: aws.String(resource.UniqueId()), + IpamPoolId: aws.String(poolId), + PreviewNextCidr: aws.Bool(true), + } + + if v, ok := d.GetOk("disallowed_cidrs"); ok && v.(*schema.Set).Len() > 0 { + input.DisallowedCidrs = flex.ExpandStringSet(v.(*schema.Set)) + } + + if v, ok := d.GetOk("netmask_length"); ok { + input.NetmaskLength = aws.Int64(int64(v.(int))) + } + + output, err := conn.AllocateIpamPoolCidr(input) + + if err != nil { + return fmt.Errorf("Error previewing next cidr from IPAM pool (%s): %w", d.Get("ipam_pool_id").(string), err) + } + + if output == nil || output.IpamPoolAllocation == nil { + return fmt.Errorf("error previewing next cidr from ipam pool (%s): empty response", poolId) + } + + cidr := output.IpamPoolAllocation.Cidr + + d.Set("cidr", cidr) + d.SetId(encodeVPCIpamPreviewNextCidrID(aws.StringValue(cidr), poolId)) + + return nil +} diff --git a/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go new file mode 100644 index 00000000000..327c3dc07a9 --- /dev/null +++ b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go @@ -0,0 +1,168 @@ +package ec2_test + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" +) + +func TestAccDataSourceVPCIpamPreviewNextCidr_ipv4Basic(t *testing.T) { + datasourceName := "data.aws_vpc_ipam_preview_next_cidr.test" + netmaskLength := "28" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(t); testAccIPAMPreCheck(t) }, + ErrorCheck: acctest.ErrorCheck(t, ec2.EndpointsID), + Providers: acctest.Providers, + CheckDestroy: nil, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceVPCIpamPreviewNextCidrIpv4Basic(netmaskLength), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet(datasourceName, "cidr"), + resource.TestCheckResourceAttrPair(datasourceName, "ipam_pool_id", "aws_vpc_ipam_pool.test", "id"), + resource.TestCheckResourceAttr(datasourceName, "netmask_length", netmaskLength), + ), + }, + }, + }) +} + +func TestAccDataSourceVPCIpamPreviewNextCidr_ipv4Allocated(t *testing.T) { + datasourceName := "data.aws_vpc_ipam_preview_next_cidr.test" + netmaskLength := "28" + allocatedCidr := "172.2.0.0/28" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(t); testAccIPAMPreCheck(t) }, + ErrorCheck: acctest.ErrorCheck(t, ec2.EndpointsID), + Providers: acctest.Providers, + CheckDestroy: nil, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceVPCIpamPreviewNextCidrIpv4Basic(netmaskLength), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(datasourceName, "cidr", allocatedCidr), + resource.TestCheckResourceAttrPair(datasourceName, "ipam_pool_id", "aws_vpc_ipam_pool.test", "id"), + resource.TestCheckResourceAttr(datasourceName, "netmask_length", netmaskLength), + ), + }, + { + Config: testAccDataSourceVPCIpamPreviewNextCidrIpv4Allocated(netmaskLength), + Check: resource.ComposeTestCheckFunc( + // cidr should not change even after allocation + resource.TestCheckResourceAttr(datasourceName, "cidr", allocatedCidr), + resource.TestCheckResourceAttrPair(datasourceName, "ipam_pool_id", "aws_vpc_ipam_pool.test", "id"), + resource.TestCheckResourceAttr(datasourceName, "netmask_length", netmaskLength), + ), + }, + }, + }) +} + +func TestAccDataSourceVPCIpamPreviewNextCidr_ipv4DisallowedCidr(t *testing.T) { + datasourceName := "data.aws_vpc_ipam_preview_next_cidr.test" + disallowedCidr := "172.2.0.0/28" + netmaskLength := "28" + expectedCidr := "172.2.0.16/28" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(t); testAccIPAMPreCheck(t) }, + ErrorCheck: acctest.ErrorCheck(t, ec2.EndpointsID), + Providers: acctest.Providers, + CheckDestroy: nil, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceVPCIpamPreviewNextCidrIpv4DisallowedCidr(netmaskLength, disallowedCidr), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(datasourceName, "cidr", expectedCidr), + resource.TestCheckResourceAttr(datasourceName, "disallowed_cidrs.#", "1"), + resource.TestCheckResourceAttr(datasourceName, "disallowed_cidrs.0", disallowedCidr), + resource.TestCheckResourceAttrPair(datasourceName, "ipam_pool_id", "aws_vpc_ipam_pool.test", "id"), + resource.TestCheckResourceAttr(datasourceName, "netmask_length", netmaskLength), + ), + }, + }, + }) +} + +const testAccDataSourceVPCIpamPreviewNextCidrIpv4Base = ` +data "aws_region" "current" {} + +resource "aws_vpc_ipam" "test" { + description = "test" + operating_regions { + region_name = data.aws_region.current.name + } +} + +resource "aws_vpc_ipam_pool" "test" { + address_family = "ipv4" + ipam_scope_id = aws_vpc_ipam.test.private_default_scope_id + locale = data.aws_region.current.name +} + +resource "aws_vpc_ipam_pool_cidr" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + cidr = "172.2.0.0/24" +} +` + +func testAccDataSourceVPCIpamPreviewNextCidrIpv4Basic(netmaskLength string) string { + return acctest.ConfigCompose( + testAccDataSourceVPCIpamPreviewNextCidrIpv4Base, + fmt.Sprintf(` +data "aws_vpc_ipam_preview_next_cidr" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + netmask_length = %[1]q + + depends_on = [ + aws_vpc_ipam_pool_cidr.test + ] +} +`, netmaskLength)) +} + +func testAccDataSourceVPCIpamPreviewNextCidrIpv4Allocated(netmaskLength string) string { + return acctest.ConfigCompose( + testAccDataSourceVPCIpamPreviewNextCidrIpv4Base, + fmt.Sprintf(` +data "aws_vpc_ipam_preview_next_cidr" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + netmask_length = %[1]q + + depends_on = [ + aws_vpc_ipam_pool_cidr.test + ] +} + +resource "aws_vpc_ipam_pool_cidr_allocation" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + cidr = data.aws_vpc_ipam_preview_next_cidr.test.cidr + + lifecycle { + ignore_changes = [cidr] + } +} +`, netmaskLength)) +} + +func testAccDataSourceVPCIpamPreviewNextCidrIpv4DisallowedCidr(netmaskLength, disallowedCidr string) string { + return testAccDataSourceVPCIpamPreviewNextCidrIpv4Base + fmt.Sprintf(` +data "aws_vpc_ipam_preview_next_cidr" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + netmask_length = %[1]q + + disallowed_cidrs = [ + %[2]q + ] + + depends_on = [ + aws_vpc_ipam_pool_cidr.test + ] +} +`, netmaskLength, disallowedCidr) +} diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown new file mode 100644 index 00000000000..321740f583f --- /dev/null +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -0,0 +1,52 @@ +--- +subcategory: "VPC" +layout: "aws" +page_title: "AWS: aws_vpc_ipam_preview_next_cidr" +description: |- + Previews a CIDR from an IPAM address pool. +--- + +# Data Source: aws_vpc_ipam_preview_next_cidr + +Previews a CIDR from an IPAM address pool. Only works for private IPv4. + +~> **NOTE:** This functionality is also encapsulated in a resource sharing the same name. The data source can be used when you need to use the cidr in a calculation of the same Root module, `count` for example. However, once a cidr range has been allocated that was previewed, the next refresh will find a **new** cidr and may force new resources downstream. Make sure to use Terraform's lifecycle `ignore_changes` policy if this is undesirable. + +## Example Usage + +Basic usage: + +```terraform +data "aws_vpc_ipam_preview_next_cidr" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + netmask_length = 28 + + depends_on = [ + aws_vpc_ipam_pool_cidr.test + ] +} + +resource "aws_vpc_ipam_pool_cidr_allocation" "test" { + ipam_pool_id = aws_vpc_ipam_pool.test.id + cidr = data.aws_vpc_ipam_preview_next_cidr.test.cidr + + lifecycle { + ignore_changes = [cidr] + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `disallowed_cidrs` - (Optional) Exclude a particular CIDR range from being returned by the pool. +* `ipam_pool_id` - (Required) The ID of the pool to which you want to assign a CIDR. +* `netmask_length` - (Optional) The netmask length of the CIDR you would like to preview from the IPAM pool. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `cidr` - The previewed CIDR from the pool. +* `id` - The ID of the preview. From 1a3f571e37fe0042633fd5198fd61b16779b3431 Mon Sep 17 00:00:00 2001 From: drewmullen Date: Tue, 18 Jan 2022 15:08:30 -0500 Subject: [PATCH 2/5] add new data source preview_cidr --- .changelog/22643.txt | 3 +++ .../service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go | 2 +- website/docs/d/vpc_ipam_preview_next_cidr.html.markdown | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .changelog/22643.txt diff --git a/.changelog/22643.txt b/.changelog/22643.txt new file mode 100644 index 00000000000..fa2f940e219 --- /dev/null +++ b/.changelog/22643.txt @@ -0,0 +1,3 @@ +```release-note:new-data-source +aws_vpc_ipam_preview_next_cidr +``` diff --git a/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go index 327c3dc07a9..fdf1cadc329 100644 --- a/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go +++ b/internal/service/ec2/vpc_ipam_preview_next_cidr_data_source_test.go @@ -136,7 +136,7 @@ data "aws_vpc_ipam_preview_next_cidr" "test" { depends_on = [ aws_vpc_ipam_pool_cidr.test - ] + ] } resource "aws_vpc_ipam_pool_cidr_allocation" "test" { diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index 321740f583f..74e45c9c508 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -23,7 +23,7 @@ data "aws_vpc_ipam_preview_next_cidr" "test" { depends_on = [ aws_vpc_ipam_pool_cidr.test - ] +] } resource "aws_vpc_ipam_pool_cidr_allocation" "test" { From 4148f43a68b54fc031ea9bf90bd8243c07ceb5bf Mon Sep 17 00:00:00 2001 From: drewmullen Date: Wed, 19 Jan 2022 09:17:52 -0500 Subject: [PATCH 3/5] terrafmt from prior PRs --- website/docs/d/appmesh_mesh.html.markdown | 2 +- website/docs/d/ec2_instance_type_offerings.html.markdown | 2 +- website/docs/d/key_pair.html.markdown | 2 +- website/docs/d/kms_key.html.markdown | 2 +- website/docs/d/msk_broker_nodes.html.markdown | 2 +- website/docs/d/route53_resolver_endpoint.html.markdown | 2 +- website/docs/d/subnet.html.markdown | 2 +- website/docs/d/vpc_ipam_preview_next_cidr.html.markdown | 2 +- website/docs/r/chime_voice_connector_termination.html.markdown | 2 +- website/docs/r/cloud9_environment_membership.markdown | 2 +- .../r/cloudfront_field_level_encryption_config.html.markdown | 2 +- .../r/cloudfront_field_level_encryption_profile.html.markdown | 2 +- website/docs/r/codebuild_project.html.markdown | 2 +- website/docs/r/default_subnet.html.markdown | 2 +- website/docs/r/devicefarm_device_pool.html.markdown | 2 +- website/docs/r/ebs_encryption_by_default.html.markdown | 2 +- website/docs/r/ec2_subnet_cidr_reservation.html.markdown | 2 +- website/docs/r/ecr_replication_configuration.html.markdown | 2 +- website/docs/r/fsx_ontap_volume.html.markdown | 2 +- website/docs/r/fsx_openzfs_volume.html.markdown | 2 +- website/docs/r/glue_dev_endpoint.markdown | 2 +- website/docs/r/kinesis_stream_consumer.html.markdown | 2 +- website/docs/r/main_route_table_association.html.markdown | 2 +- website/docs/r/s3control_bucket.html.markdown | 2 +- website/docs/r/vpn_gateway_route_propagation.html.markdown | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/website/docs/d/appmesh_mesh.html.markdown b/website/docs/d/appmesh_mesh.html.markdown index 9ccad2bdc77..c64a68ff542 100644 --- a/website/docs/d/appmesh_mesh.html.markdown +++ b/website/docs/d/appmesh_mesh.html.markdown @@ -51,4 +51,4 @@ In addition to all arguments above, the following attributes are exported: ### Egress Filter -* `type` - The egress filter type. \ No newline at end of file +* `type` - The egress filter type. diff --git a/website/docs/d/ec2_instance_type_offerings.html.markdown b/website/docs/d/ec2_instance_type_offerings.html.markdown index 041191d3ff5..984ea1dc748 100644 --- a/website/docs/d/ec2_instance_type_offerings.html.markdown +++ b/website/docs/d/ec2_instance_type_offerings.html.markdown @@ -49,4 +49,4 @@ In addition to all arguments above, the following attributes are exported: * `locations` - List of locations. * `location_types` - List of location types. -Note that the indexes of Instance Type Offering instance types, locations and location types correspond. \ No newline at end of file +Note that the indexes of Instance Type Offering instance types, locations and location types correspond. diff --git a/website/docs/d/key_pair.html.markdown b/website/docs/d/key_pair.html.markdown index 577a47f0b82..061ae3d681c 100644 --- a/website/docs/d/key_pair.html.markdown +++ b/website/docs/d/key_pair.html.markdown @@ -60,4 +60,4 @@ In addition to all arguments above, the following attributes are exported: * `id` - ID of the Key Pair. * `arn` - The ARN of the Key Pair. * `fingerprint` - The SHA-1 digest of the DER encoded private key. -* `tags` - Any tags assigned to the Key Pair. \ No newline at end of file +* `tags` - Any tags assigned to the Key Pair. diff --git a/website/docs/d/kms_key.html.markdown b/website/docs/d/kms_key.html.markdown index 62272ea0161..0d5762a3ab1 100644 --- a/website/docs/d/kms_key.html.markdown +++ b/website/docs/d/kms_key.html.markdown @@ -70,4 +70,4 @@ The `multi_region_configuration` object supports the following: The `primary_key` and `replica_keys` objects support the following: * `arn`: The key ARN of a primary or replica key of a multi-Region key. -* `region`: The AWS Region of a primary or replica key in a multi-Region key. \ No newline at end of file +* `region`: The AWS Region of a primary or replica key in a multi-Region key. diff --git a/website/docs/d/msk_broker_nodes.html.markdown b/website/docs/d/msk_broker_nodes.html.markdown index 43993892601..bf491282f68 100644 --- a/website/docs/d/msk_broker_nodes.html.markdown +++ b/website/docs/d/msk_broker_nodes.html.markdown @@ -37,4 +37,4 @@ In addition to all arguments above, the following attributes are exported: * `client_subnet` - The client subnet to which this broker node belongs * `client_vpc_ip_address` - The client virtual private cloud (VPC) IP address * `endpoints` - Set of endpoints for accessing the broker. This does not include ports -* `node_arn` - The Amazon Resource Name (ARN) of the node \ No newline at end of file +* `node_arn` - The Amazon Resource Name (ARN) of the node diff --git a/website/docs/d/route53_resolver_endpoint.html.markdown b/website/docs/d/route53_resolver_endpoint.html.markdown index f6dc2fc2374..1e86aa02d7d 100644 --- a/website/docs/d/route53_resolver_endpoint.html.markdown +++ b/website/docs/d/route53_resolver_endpoint.html.markdown @@ -44,4 +44,4 @@ In addition to all arguments above, the following attributes are exported: * `status` - The current status of the Resolver Endpoint. * `vpc_id` - The ID of the Host VPC that the Resolver Endpoint resides in. -[1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_Filter.html \ No newline at end of file +[1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_Filter.html diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index 90ea40386ec..9471bb94532 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -91,4 +91,4 @@ In addition to the attributes above, the following attributes are exported: * `map_public_ip_on_launch` - Whether public IP addresses are assigned on instance launch. * `outpost_arn` - ARN of the Outpost. * `owner_id` - ID of the AWS account that owns the subnet. -* `private_dns_hostname_type_on_launch` - The type of hostnames assigned to instances in the subnet at launch. \ No newline at end of file +* `private_dns_hostname_type_on_launch` - The type of hostnames assigned to instances in the subnet at launch. diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index 74e45c9c508..0b6902aac94 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -23,7 +23,7 @@ data "aws_vpc_ipam_preview_next_cidr" "test" { depends_on = [ aws_vpc_ipam_pool_cidr.test -] + ] } resource "aws_vpc_ipam_pool_cidr_allocation" "test" { diff --git a/website/docs/r/chime_voice_connector_termination.html.markdown b/website/docs/r/chime_voice_connector_termination.html.markdown index 1af66b506cd..c7f6e1c5e26 100644 --- a/website/docs/r/chime_voice_connector_termination.html.markdown +++ b/website/docs/r/chime_voice_connector_termination.html.markdown @@ -50,4 +50,4 @@ Chime Voice Connector Termination can be imported using the `voice_connector_id` ``` $ terraform import aws_chime_voice_connector_termination.default abcdef1ghij2klmno3pqr4 -``` \ No newline at end of file +``` diff --git a/website/docs/r/cloud9_environment_membership.markdown b/website/docs/r/cloud9_environment_membership.markdown index 50aaa06771c..3569f24420b 100644 --- a/website/docs/r/cloud9_environment_membership.markdown +++ b/website/docs/r/cloud9_environment_membership.markdown @@ -50,4 +50,4 @@ Cloud9 environment membership can be imported using the `environment-id#user-arn ``` $ terraform import aws_cloud9_environment_membership.test environment-id#user-arn -``` \ No newline at end of file +``` diff --git a/website/docs/r/cloudfront_field_level_encryption_config.html.markdown b/website/docs/r/cloudfront_field_level_encryption_config.html.markdown index 3c0eb63db82..d2769fc7833 100644 --- a/website/docs/r/cloudfront_field_level_encryption_config.html.markdown +++ b/website/docs/r/cloudfront_field_level_encryption_config.html.markdown @@ -83,4 +83,4 @@ Cloudfront Field Level Encryption Config can be imported using the `id`, e.g. ``` $ terraform import aws_cloudfront_field_level_encryption_config.config E74FTE3AEXAMPLE -``` \ No newline at end of file +``` diff --git a/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown b/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown index 2f4a5f2172f..be514957ef3 100644 --- a/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown +++ b/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown @@ -64,4 +64,4 @@ Cloudfront Field Level Encryption Profile can be imported using the `id`, e.g. ``` $ terraform import aws_cloudfront_field_level_encryption_profile.profile K3D5EWEUDCCXON -``` \ No newline at end of file +``` diff --git a/website/docs/r/codebuild_project.html.markdown b/website/docs/r/codebuild_project.html.markdown index b855c33a9b3..de53d164876 100755 --- a/website/docs/r/codebuild_project.html.markdown +++ b/website/docs/r/codebuild_project.html.markdown @@ -423,4 +423,4 @@ CodeBuild Project can be imported using the `name`, e.g., ``` $ terraform import aws_codebuild_project.name project-name -``` \ No newline at end of file +``` diff --git a/website/docs/r/default_subnet.html.markdown b/website/docs/r/default_subnet.html.markdown index d18c58dc1e3..719b3e24900 100644 --- a/website/docs/r/default_subnet.html.markdown +++ b/website/docs/r/default_subnet.html.markdown @@ -57,4 +57,4 @@ Subnets can be imported using the `subnet id`, e.g., ``` $ terraform import aws_default_subnet.public_subnet subnet-9d4a7b6c -``` \ No newline at end of file +``` diff --git a/website/docs/r/devicefarm_device_pool.html.markdown b/website/docs/r/devicefarm_device_pool.html.markdown index 79e4419cfd6..43fe11e2527 100644 --- a/website/docs/r/devicefarm_device_pool.html.markdown +++ b/website/docs/r/devicefarm_device_pool.html.markdown @@ -53,4 +53,4 @@ DeviceFarm Device Pools can be imported by their arn: ``` $ terraform import aws_devicefarm_device_pool.example arn:aws:devicefarm:us-west-2:123456789012:devicepool:4fa784c7-ccb4-4dbf-ba4f-02198320daa1/4fa784c7-ccb4-4dbf-ba4f-02198320daa1 -``` \ No newline at end of file +``` diff --git a/website/docs/r/ebs_encryption_by_default.html.markdown b/website/docs/r/ebs_encryption_by_default.html.markdown index 9b51739fc31..ff21b5c0bfa 100644 --- a/website/docs/r/ebs_encryption_by_default.html.markdown +++ b/website/docs/r/ebs_encryption_by_default.html.markdown @@ -36,4 +36,4 @@ Default EBS encryption state can be imported, e.g., ``` $ terraform import aws_ebs_encryption_by_default.example default -``` \ No newline at end of file +``` diff --git a/website/docs/r/ec2_subnet_cidr_reservation.html.markdown b/website/docs/r/ec2_subnet_cidr_reservation.html.markdown index 4fe98caa7c0..2fafd716d26 100644 --- a/website/docs/r/ec2_subnet_cidr_reservation.html.markdown +++ b/website/docs/r/ec2_subnet_cidr_reservation.html.markdown @@ -42,4 +42,4 @@ Existing CIDR reservations can be imported using `SUBNET_ID:RESERVATION_ID`, e.g ``` $ terraform import aws_ec2_subnet_cidr_reservation.example subnet-01llsxvsxabqiymcz:scr-4mnvz6wb7otksjcs9 -``` \ No newline at end of file +``` diff --git a/website/docs/r/ecr_replication_configuration.html.markdown b/website/docs/r/ecr_replication_configuration.html.markdown index ca63660e242..d1eabf92f97 100644 --- a/website/docs/r/ecr_replication_configuration.html.markdown +++ b/website/docs/r/ecr_replication_configuration.html.markdown @@ -114,4 +114,4 @@ ECR Replication Configuration can be imported using the `registry_id`, e.g., ``` $ terraform import aws_ecr_replication_configuration.service 012345678912 -``` \ No newline at end of file +``` diff --git a/website/docs/r/fsx_ontap_volume.html.markdown b/website/docs/r/fsx_ontap_volume.html.markdown index b8545ce7090..9686a6f1064 100644 --- a/website/docs/r/fsx_ontap_volume.html.markdown +++ b/website/docs/r/fsx_ontap_volume.html.markdown @@ -92,4 +92,4 @@ FSx ONTAP volume can be imported using the `id`, e.g., ``` $ terraform import aws_fsx_ontap_volume.example fsvol-12345678abcdef123 -``` \ No newline at end of file +``` diff --git a/website/docs/r/fsx_openzfs_volume.html.markdown b/website/docs/r/fsx_openzfs_volume.html.markdown index 576136430c6..b70471be0ec 100644 --- a/website/docs/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/r/fsx_openzfs_volume.html.markdown @@ -74,4 +74,4 @@ FSx Volumes can be imported using the `id`, e.g., ``` $ terraform import aws_fsx_openzfs_volume.example fsvol-543ab12b1ca672f33 -``` \ No newline at end of file +``` diff --git a/website/docs/r/glue_dev_endpoint.markdown b/website/docs/r/glue_dev_endpoint.markdown index 447467b3340..352ac827a13 100644 --- a/website/docs/r/glue_dev_endpoint.markdown +++ b/website/docs/r/glue_dev_endpoint.markdown @@ -84,4 +84,4 @@ A Glue Development Endpoint can be imported using the `name`, e.g., ``` $ terraform import aws_glue_dev_endpoint.example foo -``` \ No newline at end of file +``` diff --git a/website/docs/r/kinesis_stream_consumer.html.markdown b/website/docs/r/kinesis_stream_consumer.html.markdown index 05bb4f0839c..1f0f9f99561 100644 --- a/website/docs/r/kinesis_stream_consumer.html.markdown +++ b/website/docs/r/kinesis_stream_consumer.html.markdown @@ -51,4 +51,4 @@ Kinesis Stream Consumers can be imported using the Amazon Resource Name (ARN) e. $ terraform import aws_kinesis_stream_consumer.example arn:aws:kinesis:us-west-2:123456789012:stream/example/consumer/example:1616044553 ``` -[1]: https://docs.aws.amazon.com/streams/latest/dev/amazon-kinesis-consumers.html \ No newline at end of file +[1]: https://docs.aws.amazon.com/streams/latest/dev/amazon-kinesis-consumers.html diff --git a/website/docs/r/main_route_table_association.html.markdown b/website/docs/r/main_route_table_association.html.markdown index 0963c7d1fec..b06ee283a6b 100644 --- a/website/docs/r/main_route_table_association.html.markdown +++ b/website/docs/r/main_route_table_association.html.markdown @@ -48,4 +48,4 @@ the `main_route_table_association` delete to work properly. [aws-route-tables]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html#Route_Replacing_Main_Table [tf-route-tables]: /docs/providers/aws/r/route_table.html -[tf-default-route-table]: /docs/providers/aws/r/default_route_table.html \ No newline at end of file +[tf-default-route-table]: /docs/providers/aws/r/default_route_table.html diff --git a/website/docs/r/s3control_bucket.html.markdown b/website/docs/r/s3control_bucket.html.markdown index 27db1e7e109..ea42e4afde4 100644 --- a/website/docs/r/s3control_bucket.html.markdown +++ b/website/docs/r/s3control_bucket.html.markdown @@ -45,4 +45,4 @@ S3 Control Buckets can be imported using Amazon Resource Name (ARN), e.g., ``` $ terraform import aws_s3control_bucket.example arn:aws:s3-outposts:us-east-1:123456789012:outpost/op-12345678/bucket/example -``` \ No newline at end of file +``` diff --git a/website/docs/r/vpn_gateway_route_propagation.html.markdown b/website/docs/r/vpn_gateway_route_propagation.html.markdown index 0764c2b36e5..d434b6e2321 100644 --- a/website/docs/r/vpn_gateway_route_propagation.html.markdown +++ b/website/docs/r/vpn_gateway_route_propagation.html.markdown @@ -39,4 +39,4 @@ No additional attributes are exported. `aws_vpn_gateway_route_propagation` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - `create` - (Default `2 minutes`) Used for propagation creation -- `delete` - (Default `2 minutes`) Used for propagation deletion \ No newline at end of file +- `delete` - (Default `2 minutes`) Used for propagation deletion From f0f9a6b73579696aca1b5d1c228365e927b69e5f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jan 2022 07:56:02 -0500 Subject: [PATCH 4/5] Revert "terrafmt from prior PRs" This reverts commit 4148f43a68b54fc031ea9bf90bd8243c07ceb5bf. --- website/docs/d/appmesh_mesh.html.markdown | 2 +- website/docs/d/ec2_instance_type_offerings.html.markdown | 2 +- website/docs/d/key_pair.html.markdown | 2 +- website/docs/d/kms_key.html.markdown | 2 +- website/docs/d/msk_broker_nodes.html.markdown | 2 +- website/docs/d/route53_resolver_endpoint.html.markdown | 2 +- website/docs/d/subnet.html.markdown | 2 +- website/docs/d/vpc_ipam_preview_next_cidr.html.markdown | 2 +- website/docs/r/chime_voice_connector_termination.html.markdown | 2 +- website/docs/r/cloud9_environment_membership.markdown | 2 +- .../r/cloudfront_field_level_encryption_config.html.markdown | 2 +- .../r/cloudfront_field_level_encryption_profile.html.markdown | 2 +- website/docs/r/codebuild_project.html.markdown | 2 +- website/docs/r/default_subnet.html.markdown | 2 +- website/docs/r/devicefarm_device_pool.html.markdown | 2 +- website/docs/r/ebs_encryption_by_default.html.markdown | 2 +- website/docs/r/ec2_subnet_cidr_reservation.html.markdown | 2 +- website/docs/r/ecr_replication_configuration.html.markdown | 2 +- website/docs/r/fsx_ontap_volume.html.markdown | 2 +- website/docs/r/fsx_openzfs_volume.html.markdown | 2 +- website/docs/r/glue_dev_endpoint.markdown | 2 +- website/docs/r/kinesis_stream_consumer.html.markdown | 2 +- website/docs/r/main_route_table_association.html.markdown | 2 +- website/docs/r/s3control_bucket.html.markdown | 2 +- website/docs/r/vpn_gateway_route_propagation.html.markdown | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/website/docs/d/appmesh_mesh.html.markdown b/website/docs/d/appmesh_mesh.html.markdown index c64a68ff542..9ccad2bdc77 100644 --- a/website/docs/d/appmesh_mesh.html.markdown +++ b/website/docs/d/appmesh_mesh.html.markdown @@ -51,4 +51,4 @@ In addition to all arguments above, the following attributes are exported: ### Egress Filter -* `type` - The egress filter type. +* `type` - The egress filter type. \ No newline at end of file diff --git a/website/docs/d/ec2_instance_type_offerings.html.markdown b/website/docs/d/ec2_instance_type_offerings.html.markdown index 984ea1dc748..041191d3ff5 100644 --- a/website/docs/d/ec2_instance_type_offerings.html.markdown +++ b/website/docs/d/ec2_instance_type_offerings.html.markdown @@ -49,4 +49,4 @@ In addition to all arguments above, the following attributes are exported: * `locations` - List of locations. * `location_types` - List of location types. -Note that the indexes of Instance Type Offering instance types, locations and location types correspond. +Note that the indexes of Instance Type Offering instance types, locations and location types correspond. \ No newline at end of file diff --git a/website/docs/d/key_pair.html.markdown b/website/docs/d/key_pair.html.markdown index 061ae3d681c..577a47f0b82 100644 --- a/website/docs/d/key_pair.html.markdown +++ b/website/docs/d/key_pair.html.markdown @@ -60,4 +60,4 @@ In addition to all arguments above, the following attributes are exported: * `id` - ID of the Key Pair. * `arn` - The ARN of the Key Pair. * `fingerprint` - The SHA-1 digest of the DER encoded private key. -* `tags` - Any tags assigned to the Key Pair. +* `tags` - Any tags assigned to the Key Pair. \ No newline at end of file diff --git a/website/docs/d/kms_key.html.markdown b/website/docs/d/kms_key.html.markdown index 0d5762a3ab1..62272ea0161 100644 --- a/website/docs/d/kms_key.html.markdown +++ b/website/docs/d/kms_key.html.markdown @@ -70,4 +70,4 @@ The `multi_region_configuration` object supports the following: The `primary_key` and `replica_keys` objects support the following: * `arn`: The key ARN of a primary or replica key of a multi-Region key. -* `region`: The AWS Region of a primary or replica key in a multi-Region key. +* `region`: The AWS Region of a primary or replica key in a multi-Region key. \ No newline at end of file diff --git a/website/docs/d/msk_broker_nodes.html.markdown b/website/docs/d/msk_broker_nodes.html.markdown index bf491282f68..43993892601 100644 --- a/website/docs/d/msk_broker_nodes.html.markdown +++ b/website/docs/d/msk_broker_nodes.html.markdown @@ -37,4 +37,4 @@ In addition to all arguments above, the following attributes are exported: * `client_subnet` - The client subnet to which this broker node belongs * `client_vpc_ip_address` - The client virtual private cloud (VPC) IP address * `endpoints` - Set of endpoints for accessing the broker. This does not include ports -* `node_arn` - The Amazon Resource Name (ARN) of the node +* `node_arn` - The Amazon Resource Name (ARN) of the node \ No newline at end of file diff --git a/website/docs/d/route53_resolver_endpoint.html.markdown b/website/docs/d/route53_resolver_endpoint.html.markdown index 1e86aa02d7d..f6dc2fc2374 100644 --- a/website/docs/d/route53_resolver_endpoint.html.markdown +++ b/website/docs/d/route53_resolver_endpoint.html.markdown @@ -44,4 +44,4 @@ In addition to all arguments above, the following attributes are exported: * `status` - The current status of the Resolver Endpoint. * `vpc_id` - The ID of the Host VPC that the Resolver Endpoint resides in. -[1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_Filter.html +[1]: https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_Filter.html \ No newline at end of file diff --git a/website/docs/d/subnet.html.markdown b/website/docs/d/subnet.html.markdown index 9471bb94532..90ea40386ec 100644 --- a/website/docs/d/subnet.html.markdown +++ b/website/docs/d/subnet.html.markdown @@ -91,4 +91,4 @@ In addition to the attributes above, the following attributes are exported: * `map_public_ip_on_launch` - Whether public IP addresses are assigned on instance launch. * `outpost_arn` - ARN of the Outpost. * `owner_id` - ID of the AWS account that owns the subnet. -* `private_dns_hostname_type_on_launch` - The type of hostnames assigned to instances in the subnet at launch. +* `private_dns_hostname_type_on_launch` - The type of hostnames assigned to instances in the subnet at launch. \ No newline at end of file diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index 0b6902aac94..74e45c9c508 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -23,7 +23,7 @@ data "aws_vpc_ipam_preview_next_cidr" "test" { depends_on = [ aws_vpc_ipam_pool_cidr.test - ] +] } resource "aws_vpc_ipam_pool_cidr_allocation" "test" { diff --git a/website/docs/r/chime_voice_connector_termination.html.markdown b/website/docs/r/chime_voice_connector_termination.html.markdown index c7f6e1c5e26..1af66b506cd 100644 --- a/website/docs/r/chime_voice_connector_termination.html.markdown +++ b/website/docs/r/chime_voice_connector_termination.html.markdown @@ -50,4 +50,4 @@ Chime Voice Connector Termination can be imported using the `voice_connector_id` ``` $ terraform import aws_chime_voice_connector_termination.default abcdef1ghij2klmno3pqr4 -``` +``` \ No newline at end of file diff --git a/website/docs/r/cloud9_environment_membership.markdown b/website/docs/r/cloud9_environment_membership.markdown index 3569f24420b..50aaa06771c 100644 --- a/website/docs/r/cloud9_environment_membership.markdown +++ b/website/docs/r/cloud9_environment_membership.markdown @@ -50,4 +50,4 @@ Cloud9 environment membership can be imported using the `environment-id#user-arn ``` $ terraform import aws_cloud9_environment_membership.test environment-id#user-arn -``` +``` \ No newline at end of file diff --git a/website/docs/r/cloudfront_field_level_encryption_config.html.markdown b/website/docs/r/cloudfront_field_level_encryption_config.html.markdown index d2769fc7833..3c0eb63db82 100644 --- a/website/docs/r/cloudfront_field_level_encryption_config.html.markdown +++ b/website/docs/r/cloudfront_field_level_encryption_config.html.markdown @@ -83,4 +83,4 @@ Cloudfront Field Level Encryption Config can be imported using the `id`, e.g. ``` $ terraform import aws_cloudfront_field_level_encryption_config.config E74FTE3AEXAMPLE -``` +``` \ No newline at end of file diff --git a/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown b/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown index be514957ef3..2f4a5f2172f 100644 --- a/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown +++ b/website/docs/r/cloudfront_field_level_encryption_profile.html.markdown @@ -64,4 +64,4 @@ Cloudfront Field Level Encryption Profile can be imported using the `id`, e.g. ``` $ terraform import aws_cloudfront_field_level_encryption_profile.profile K3D5EWEUDCCXON -``` +``` \ No newline at end of file diff --git a/website/docs/r/codebuild_project.html.markdown b/website/docs/r/codebuild_project.html.markdown index de53d164876..b855c33a9b3 100755 --- a/website/docs/r/codebuild_project.html.markdown +++ b/website/docs/r/codebuild_project.html.markdown @@ -423,4 +423,4 @@ CodeBuild Project can be imported using the `name`, e.g., ``` $ terraform import aws_codebuild_project.name project-name -``` +``` \ No newline at end of file diff --git a/website/docs/r/default_subnet.html.markdown b/website/docs/r/default_subnet.html.markdown index 719b3e24900..d18c58dc1e3 100644 --- a/website/docs/r/default_subnet.html.markdown +++ b/website/docs/r/default_subnet.html.markdown @@ -57,4 +57,4 @@ Subnets can be imported using the `subnet id`, e.g., ``` $ terraform import aws_default_subnet.public_subnet subnet-9d4a7b6c -``` +``` \ No newline at end of file diff --git a/website/docs/r/devicefarm_device_pool.html.markdown b/website/docs/r/devicefarm_device_pool.html.markdown index 43fe11e2527..79e4419cfd6 100644 --- a/website/docs/r/devicefarm_device_pool.html.markdown +++ b/website/docs/r/devicefarm_device_pool.html.markdown @@ -53,4 +53,4 @@ DeviceFarm Device Pools can be imported by their arn: ``` $ terraform import aws_devicefarm_device_pool.example arn:aws:devicefarm:us-west-2:123456789012:devicepool:4fa784c7-ccb4-4dbf-ba4f-02198320daa1/4fa784c7-ccb4-4dbf-ba4f-02198320daa1 -``` +``` \ No newline at end of file diff --git a/website/docs/r/ebs_encryption_by_default.html.markdown b/website/docs/r/ebs_encryption_by_default.html.markdown index ff21b5c0bfa..9b51739fc31 100644 --- a/website/docs/r/ebs_encryption_by_default.html.markdown +++ b/website/docs/r/ebs_encryption_by_default.html.markdown @@ -36,4 +36,4 @@ Default EBS encryption state can be imported, e.g., ``` $ terraform import aws_ebs_encryption_by_default.example default -``` +``` \ No newline at end of file diff --git a/website/docs/r/ec2_subnet_cidr_reservation.html.markdown b/website/docs/r/ec2_subnet_cidr_reservation.html.markdown index 2fafd716d26..4fe98caa7c0 100644 --- a/website/docs/r/ec2_subnet_cidr_reservation.html.markdown +++ b/website/docs/r/ec2_subnet_cidr_reservation.html.markdown @@ -42,4 +42,4 @@ Existing CIDR reservations can be imported using `SUBNET_ID:RESERVATION_ID`, e.g ``` $ terraform import aws_ec2_subnet_cidr_reservation.example subnet-01llsxvsxabqiymcz:scr-4mnvz6wb7otksjcs9 -``` +``` \ No newline at end of file diff --git a/website/docs/r/ecr_replication_configuration.html.markdown b/website/docs/r/ecr_replication_configuration.html.markdown index d1eabf92f97..ca63660e242 100644 --- a/website/docs/r/ecr_replication_configuration.html.markdown +++ b/website/docs/r/ecr_replication_configuration.html.markdown @@ -114,4 +114,4 @@ ECR Replication Configuration can be imported using the `registry_id`, e.g., ``` $ terraform import aws_ecr_replication_configuration.service 012345678912 -``` +``` \ No newline at end of file diff --git a/website/docs/r/fsx_ontap_volume.html.markdown b/website/docs/r/fsx_ontap_volume.html.markdown index 9686a6f1064..b8545ce7090 100644 --- a/website/docs/r/fsx_ontap_volume.html.markdown +++ b/website/docs/r/fsx_ontap_volume.html.markdown @@ -92,4 +92,4 @@ FSx ONTAP volume can be imported using the `id`, e.g., ``` $ terraform import aws_fsx_ontap_volume.example fsvol-12345678abcdef123 -``` +``` \ No newline at end of file diff --git a/website/docs/r/fsx_openzfs_volume.html.markdown b/website/docs/r/fsx_openzfs_volume.html.markdown index b70471be0ec..576136430c6 100644 --- a/website/docs/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/r/fsx_openzfs_volume.html.markdown @@ -74,4 +74,4 @@ FSx Volumes can be imported using the `id`, e.g., ``` $ terraform import aws_fsx_openzfs_volume.example fsvol-543ab12b1ca672f33 -``` +``` \ No newline at end of file diff --git a/website/docs/r/glue_dev_endpoint.markdown b/website/docs/r/glue_dev_endpoint.markdown index 352ac827a13..447467b3340 100644 --- a/website/docs/r/glue_dev_endpoint.markdown +++ b/website/docs/r/glue_dev_endpoint.markdown @@ -84,4 +84,4 @@ A Glue Development Endpoint can be imported using the `name`, e.g., ``` $ terraform import aws_glue_dev_endpoint.example foo -``` +``` \ No newline at end of file diff --git a/website/docs/r/kinesis_stream_consumer.html.markdown b/website/docs/r/kinesis_stream_consumer.html.markdown index 1f0f9f99561..05bb4f0839c 100644 --- a/website/docs/r/kinesis_stream_consumer.html.markdown +++ b/website/docs/r/kinesis_stream_consumer.html.markdown @@ -51,4 +51,4 @@ Kinesis Stream Consumers can be imported using the Amazon Resource Name (ARN) e. $ terraform import aws_kinesis_stream_consumer.example arn:aws:kinesis:us-west-2:123456789012:stream/example/consumer/example:1616044553 ``` -[1]: https://docs.aws.amazon.com/streams/latest/dev/amazon-kinesis-consumers.html +[1]: https://docs.aws.amazon.com/streams/latest/dev/amazon-kinesis-consumers.html \ No newline at end of file diff --git a/website/docs/r/main_route_table_association.html.markdown b/website/docs/r/main_route_table_association.html.markdown index b06ee283a6b..0963c7d1fec 100644 --- a/website/docs/r/main_route_table_association.html.markdown +++ b/website/docs/r/main_route_table_association.html.markdown @@ -48,4 +48,4 @@ the `main_route_table_association` delete to work properly. [aws-route-tables]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html#Route_Replacing_Main_Table [tf-route-tables]: /docs/providers/aws/r/route_table.html -[tf-default-route-table]: /docs/providers/aws/r/default_route_table.html +[tf-default-route-table]: /docs/providers/aws/r/default_route_table.html \ No newline at end of file diff --git a/website/docs/r/s3control_bucket.html.markdown b/website/docs/r/s3control_bucket.html.markdown index ea42e4afde4..27db1e7e109 100644 --- a/website/docs/r/s3control_bucket.html.markdown +++ b/website/docs/r/s3control_bucket.html.markdown @@ -45,4 +45,4 @@ S3 Control Buckets can be imported using Amazon Resource Name (ARN), e.g., ``` $ terraform import aws_s3control_bucket.example arn:aws:s3-outposts:us-east-1:123456789012:outpost/op-12345678/bucket/example -``` +``` \ No newline at end of file diff --git a/website/docs/r/vpn_gateway_route_propagation.html.markdown b/website/docs/r/vpn_gateway_route_propagation.html.markdown index d434b6e2321..0764c2b36e5 100644 --- a/website/docs/r/vpn_gateway_route_propagation.html.markdown +++ b/website/docs/r/vpn_gateway_route_propagation.html.markdown @@ -39,4 +39,4 @@ No additional attributes are exported. `aws_vpn_gateway_route_propagation` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options: - `create` - (Default `2 minutes`) Used for propagation creation -- `delete` - (Default `2 minutes`) Used for propagation deletion +- `delete` - (Default `2 minutes`) Used for propagation deletion \ No newline at end of file From 05c38f9dea58a273a0f3975a4a6309bc281684d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 20 Jan 2022 08:03:11 -0500 Subject: [PATCH 5/5] Fix terrafmt errors. --- website/docs/d/vpc_ipam_preview_next_cidr.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown index 74e45c9c508..0b6902aac94 100644 --- a/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown +++ b/website/docs/d/vpc_ipam_preview_next_cidr.html.markdown @@ -23,7 +23,7 @@ data "aws_vpc_ipam_preview_next_cidr" "test" { depends_on = [ aws_vpc_ipam_pool_cidr.test -] + ] } resource "aws_vpc_ipam_pool_cidr_allocation" "test" {