Skip to content

Commit 94d0344

Browse files
committed
Replace 'internal/endpoints' with top-level 'endpoints' package.
1 parent 1b1dd67 commit 94d0344

File tree

4 files changed

+12
-176
lines changed

4 files changed

+12
-176
lines changed

Diff for: aws_config.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
2525
"github.com/aws/smithy-go/middleware"
2626
"github.com/hashicorp/aws-sdk-go-base/v2/diag"
27+
"github.com/hashicorp/aws-sdk-go-base/v2/endpoints"
2728
"github.com/hashicorp/aws-sdk-go-base/v2/internal/awsconfig"
2829
"github.com/hashicorp/aws-sdk-go-base/v2/internal/constants"
29-
"github.com/hashicorp/aws-sdk-go-base/v2/internal/endpoints"
3030
"github.com/hashicorp/aws-sdk-go-base/v2/logging"
3131
"github.com/hashicorp/terraform-plugin-log/tflog"
3232
)
@@ -337,7 +337,9 @@ func GetAwsAccountIDAndPartition(ctx context.Context, awsConfig aws.Config, c *C
337337
"Errors: %w", err))
338338
}
339339

340-
return "", endpoints.PartitionForRegion(awsConfig.Region), nil
340+
partition, _ := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), awsConfig.Region)
341+
342+
return "", partition.ID(), nil
341343
}
342344

343345
func commonLoadOptions(ctx context.Context, c *Config) ([]func(*config.LoadOptions) error, error) {

Diff for: internal/endpoints/endpoints.go

-129
This file was deleted.

Diff for: internal/endpoints/endpoints_test.go

-37
This file was deleted.

Diff for: validation/region.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@ package validation
55

66
import (
77
"fmt"
8+
"slices"
89

9-
"github.com/hashicorp/aws-sdk-go-base/v2/internal/endpoints"
10+
"github.com/hashicorp/aws-sdk-go-base/v2/endpoints"
1011
)
1112

1213
type InvalidRegionError struct {
1314
region string
1415
}
1516

1617
func (e *InvalidRegionError) Error() string {
17-
return fmt.Sprintf("Invalid AWS Region: %s", e.region)
18+
return fmt.Sprintf("invalid AWS Region: %s", e.region)
1819
}
1920

2021
// SupportedRegion checks if the given region is a valid AWS region.
2122
func SupportedRegion(region string) error {
22-
for _, partition := range endpoints.Partitions() {
23-
for _, partitionRegion := range partition.Regions() {
24-
if region == partitionRegion {
25-
return nil
26-
}
27-
}
23+
if slices.ContainsFunc(endpoints.DefaultPartitions(), func(p endpoints.Partition) bool {
24+
_, ok := p.Regions()[region]
25+
return ok
26+
}) {
27+
return nil
2828
}
2929

3030
return &InvalidRegionError{

0 commit comments

Comments
 (0)