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.

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

transitgateway_connect_peer: add bgp ip attribute references #31752

Merged
merged 22 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7030499
transitgateway_connect_peer: add bgp ip attribute references
kurochan Jun 3, 2023
a3126a9
add changelog
kurochan Jun 3, 2023
d148bee
fix code findings
kurochan Jun 3, 2023
0fa7960
specify elem
kurochan Jun 3, 2023
3fdd1c8
Tweak CHANGELOG entries.
ewbankkit Jun 6, 2023
b5f1784
Cosmetics.
ewbankkit Jun 6, 2023
d49431b
Acceptance test tweaks.
ewbankkit Jun 6, 2023
1a7eafc
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int'.
ewbankkit Jun 6, 2023
dc0059d
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
9d78778
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
8954d49
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
5d0116f
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
8f33fe2
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
67ae4c8
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
64894e1
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
c1e287f
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
f993974
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
4f9d34f
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
491e1cc
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
185e86e
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
cb2a5c8
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
7cefbed
Final argument to 'acctest.CheckResourceAttrGreaterThanValue' is 'int…
ewbankkit Jun 6, 2023
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
7 changes: 7 additions & 0 deletions .changelog/31752.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_ec2_transit_gateway_connect_peer: Add `bgp_peer_address` and `bgp_transit_gateway_addresses` attributes
```

```release-note:enhancement
data/aws_ec2_transit_gateway_connect_peer: Add `bgp_peer_address` and `bgp_transit_gateway_addresses` attributes
```
21 changes: 9 additions & 12 deletions internal/acctest/acctest.go
Original file line number Diff line number Diff line change
Expand Up @@ -2246,23 +2246,20 @@ func CheckCallerIdentityAccountID(n string) resource.TestCheckFunc {
}
}

func CheckResourceAttrGreaterThanValue(n, key, value string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
return fmt.Errorf("not found: %s", n)
}
func CheckResourceAttrGreaterThanValue(n, key string, val int) resource.TestCheckFunc {
return resource.TestCheckResourceAttrWith(n, key, func(value string) error {
v, err := strconv.Atoi(value)

if v, ok := rs.Primary.Attributes[key]; !ok || !(v > value) {
if !ok {
return fmt.Errorf("%s: Attribute %q not found", n, key)
}
if err != nil {
return err
}

return fmt.Errorf("%s: Attribute %q is not greater than %q, got %q", n, key, value, v)
if v <= val {
return fmt.Errorf("%s: Attribute %q is not greater than %d, got %d", n, key, val, v)
}

return nil
}
})
}

func CheckResourceAttrGreaterThanOrEqualValue(n, key string, val int) resource.TestCheckFunc {
Expand Down
4 changes: 2 additions & 2 deletions internal/service/acm/certificate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestAccACMCertificate_emailValidation(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "type", string(types.CertificateTypeAmazonIssued)),
resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)),
resource.TestCheckResourceAttr(resourceName, "renewal_summary.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "validation_emails.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "validation_emails.#", 0),
resource.TestMatchResourceAttr(resourceName, "validation_emails.0", regexp.MustCompile(`^[^@]+@.+$`)),
resource.TestCheckResourceAttr(resourceName, "validation_method", string(types.ValidationMethodEmail)),
resource.TestCheckResourceAttr(resourceName, "validation_option.#", "0"),
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestAccACMCertificate_validationOptions(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "status", string(types.CertificateStatusPendingValidation)),
resource.TestCheckResourceAttr(resourceName, "subject_alternative_names.#", "1"),
resource.TestCheckTypeSetElemAttr(resourceName, "subject_alternative_names.*", domain),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "validation_emails.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "validation_emails.#", 0),
resource.TestMatchResourceAttr(resourceName, "validation_emails.0", regexp.MustCompile(`^[^@]+@.+$`)),
resource.TestCheckResourceAttr(resourceName, "validation_method", string(types.ValidationMethodEmail)),
resource.TestCheckResourceAttr(resourceName, "validation_option.#", "1"),
Expand Down
6 changes: 3 additions & 3 deletions internal/service/budgets/budget_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func TestAccBudgetsBudget_autoAdjustDataForecast(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "auto_adjust_data.0.auto_adjust_type", "FORECAST"),
resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", 0),
resource.TestCheckResourceAttr(resourceName, "limit_unit", "USD"),
),
},
Expand Down Expand Up @@ -249,7 +249,7 @@ func TestAccBudgetsBudget_autoAdjustDataHistorical(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "time_unit", "MONTHLY"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", 0),
resource.TestCheckResourceAttr(resourceName, "limit_unit", "USD"),
),
},
Expand All @@ -270,7 +270,7 @@ func TestAccBudgetsBudget_autoAdjustDataHistorical(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "time_unit", "MONTHLY"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "limit_amount", 0),
resource.TestCheckResourceAttr(resourceName, "limit_unit", "USD"),
),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ func TestAccCloudFrontOriginAccessIdentitiesDataSource_all(t *testing.T) {
{
Config: testAccOriginAccessIdentitiesDataSourceConfig_noComments(rName),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "iam_arns.#", "1"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "1"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "s3_canonical_user_ids.#", "1"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "iam_arns.#", 1),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", 1),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "s3_canonical_user_ids.#", 1),
),
},
},
Expand Down
14 changes: 7 additions & 7 deletions internal/service/ds/directory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestAccDSDirectory_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", ""),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down Expand Up @@ -172,7 +172,7 @@ func TestAccDSDirectory_microsoft(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "2"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", "Enterprise"),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestAccDSDirectory_microsoftStandard(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "2"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", "Standard"),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down Expand Up @@ -270,12 +270,12 @@ func TestAccDSDirectory_connector(t *testing.T) {
resource.TestCheckResourceAttrSet(resourceName, "access_url"),
resource.TestCheckResourceAttrSet(resourceName, "alias"),
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "1"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "connect_settings.0.customer_dns_ips.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "connect_settings.0.customer_dns_ips.#", 0),
resource.TestCheckResourceAttr(resourceName, "connect_settings.0.customer_username", "Administrator"),
resource.TestCheckResourceAttr(resourceName, "connect_settings.0.subnet_ids.#", "2"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", ""),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down Expand Up @@ -327,7 +327,7 @@ func TestAccDSDirectory_withAliasAndSSO(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", ""),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down Expand Up @@ -389,7 +389,7 @@ func TestAccDSDirectory_desiredNumberOfDomainControllers(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "connect_settings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "desired_number_of_domain_controllers", "2"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(resourceName, "dns_ip_addresses.#", 0),
resource.TestCheckResourceAttr(resourceName, "edition", "Enterprise"),
resource.TestCheckResourceAttr(resourceName, "enable_sso", "false"),
resource.TestCheckResourceAttr(resourceName, "name", domainName),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccEC2EBSSnapshotIDsDataSource_basic(t *testing.T) {
{
Config: testAccEBSSnapshotIdsDataSourceConfig_basic(rName),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", 0),
resource.TestCheckTypeSetElemAttrPair(dataSourceName, "ids.*", "aws_ebs_snapshot.test", "id"),
),
},
Expand Down
4 changes: 2 additions & 2 deletions internal/service/ec2/ec2_ami_ids_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestAccEC2AMIIDsDataSource_basic(t *testing.T) {
{
Config: testAccAMIIDsDataSourceConfig_basic,
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(datasourceName, "ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(datasourceName, "ids.#", 0),
),
},
},
Expand Down Expand Up @@ -69,7 +69,7 @@ func TestAccEC2AMIIDsDataSource_includeDeprecated(t *testing.T) {
{
Config: testAccAMIIDsDataSourceConfig_includeDeprecated(true),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(datasourceName, "ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(datasourceName, "ids.#", 0),
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/service/ec2/ec2_eips_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccEC2EIPsDataSource_basic(t *testing.T) {
{
Config: testAccEIPsDataSourceConfig_basic(rName),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue("data.aws_eips.all", "allocation_ids.#", "1"),
acctest.CheckResourceAttrGreaterThanValue("data.aws_eips.all", "allocation_ids.#", 1),
resource.TestCheckResourceAttr("data.aws_eips.by_tags", "allocation_ids.#", "1"),
resource.TestCheckResourceAttr("data.aws_eips.by_tags", "public_ips.#", "1"),
resource.TestCheckResourceAttr("data.aws_eips.none", "allocation_ids.#", "0"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ func TestAccEC2InstanceTypeOfferingsDataSource_filter(t *testing.T) {
{
Config: testAccInstanceTypeOfferingsDataSourceConfig_filter(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "locations.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "location_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", 0),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "locations.#", 0),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "location_types.#", 0),
),
},
},
Expand All @@ -46,9 +46,9 @@ func TestAccEC2InstanceTypeOfferingsDataSource_locationType(t *testing.T) {
{
Config: testAccInstanceTypeOfferingsDataSourceConfig_location(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "locations.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "location_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", 0),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "locations.#", 0),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "location_types.#", 0),
),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/service/ec2/ec2_instance_types_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccEC2InstanceTypesDataSource_basic(t *testing.T) {
{
Config: testAccInstanceTypesDataSourceConfig_basic(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", 0),
),
},
},
Expand All @@ -43,7 +43,7 @@ func TestAccEC2InstanceTypesDataSource_filter(t *testing.T) {
{
Config: testAccInstanceTypesDataSourceConfig_filter(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "instance_types.#", 0),
),
},
},
Expand Down
4 changes: 2 additions & 2 deletions internal/service/ec2/ipam_pools_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ func TestAccIPAMPoolsDataSource_basic(t *testing.T) {
{
Config: testAccIPAMPoolsDataSourceConfig_basic,
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ipam_pools.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ipam_pools.#", 0),
),
},
{
Config: testAccIPAMPoolsDataSourceConfig_basicTwoPools,
Check: resource.ComposeAggregateTestCheckFunc(
// DS 1 finds all 3 pools
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ipam_pools.#", "2"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ipam_pools.#", 2),

// DS 2 filters on 1 specific pool to validate attributes
resource.TestCheckResourceAttr(dataSourceNameTwo, "ipam_pools.#", "1"),
Expand Down
4 changes: 2 additions & 2 deletions internal/service/ec2/outposts_coip_pool_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccEC2OutpostsCoIPPoolDataSource_filter(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)),
resource.TestMatchResourceAttr(dataSourceName, "pool_id", regexp.MustCompile(`^ipv4pool-coip-`)),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", 0),
),
},
},
Expand All @@ -45,7 +45,7 @@ func TestAccEC2OutpostsCoIPPoolDataSource_id(t *testing.T) {
resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexp.MustCompile(`^lgw-rtb-`)),
resource.TestMatchResourceAttr(dataSourceName, "pool_id", regexp.MustCompile(`^ipv4pool-coip-`)),
acctest.MatchResourceAttrRegionalARN(dataSourceName, "arn", "ec2", regexp.MustCompile(`coip-pool/ipv4pool-coip-.+$`)),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", 0),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccEC2OutpostsCoIPPoolsDataSource_basic(t *testing.T) {
{
Config: testAccOutpostsCoIPPoolsDataSourceConfig_basic(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_ids.#", 0),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccEC2OutpostsLocalGatewayRouteTablesDataSource_basic(t *testing.T) {
{
Config: testAccOutpostsLocalGatewayRouteTablesDataSourceConfig_basic(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", 0),
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestAccEC2OutpostsLocalGatewaysDataSource_basic(t *testing.T) {
{
Config: testAccOutpostsLocalGatewaysDataSourceConfig_basic(),
Check: resource.ComposeTestCheckFunc(
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", "0"),
acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "ids.#", 0),
),
},
},
Expand Down
17 changes: 16 additions & 1 deletion internal/service/ec2/transitgateway_connect_peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"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/slices"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
Expand Down Expand Up @@ -55,6 +56,15 @@ func ResourceTransitGatewayConnectPeer() *schema.Resource {
ForceNew: true,
ValidateFunc: verify.Valid4ByteASN,
},
"bgp_peer_address": {
Type: schema.TypeString,
Computed: true,
},
"bgp_transit_gateway_addresses": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"inside_cidr_blocks": {
Type: schema.TypeSet,
Required: true,
Expand Down Expand Up @@ -164,8 +174,13 @@ func resourceTransitGatewayConnectPeerRead(ctx context.Context, d *schema.Resour
AccountID: meta.(*conns.AWSClient).AccountID,
Resource: fmt.Sprintf("transit-gateway-connect-peer/%s", d.Id()),
}.String()
bgpConfigurations := transitGatewayConnectPeer.ConnectPeerConfiguration.BgpConfigurations
d.Set("arn", arn)
d.Set("bgp_asn", strconv.FormatInt(aws.Int64Value(transitGatewayConnectPeer.ConnectPeerConfiguration.BgpConfigurations[0].PeerAsn), 10))
d.Set("bgp_asn", strconv.FormatInt(aws.Int64Value(bgpConfigurations[0].PeerAsn), 10))
d.Set("bgp_peer_address", bgpConfigurations[0].PeerAddress)
d.Set("bgp_transit_gateway_addresses", slices.ApplyToAll(bgpConfigurations, func(v *ec2.TransitGatewayAttachmentBgpConfiguration) string {
return aws.StringValue(v.TransitGatewayAddress)
}))
d.Set("inside_cidr_blocks", aws.StringValueSlice(transitGatewayConnectPeer.ConnectPeerConfiguration.InsideCidrBlocks))
d.Set("peer_address", transitGatewayConnectPeer.ConnectPeerConfiguration.PeerAddress)
d.Set("transit_gateway_address", transitGatewayConnectPeer.ConnectPeerConfiguration.TransitGatewayAddress)
Expand Down
Loading