chore(aws): upgrade aws dependencies
This commit is contained in:
19
vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md
generated
vendored
19
vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md
generated
vendored
@ -1,3 +1,22 @@
|
||||
# v1.10.1 (2021-11-12)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.10.0 (2021-11-06)
|
||||
|
||||
* **Feature**: The SDK now supports configuration of FIPS and DualStack endpoints using environment variables, shared configuration, or programmatically.
|
||||
* **Feature**: Updated `github.com/aws/smithy-go` to latest version
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.9.0 (2021-10-21)
|
||||
|
||||
* **Feature**: Updated to latest version
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.8.3 (2021-10-11)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.8.2 (2021-09-17)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
86
vendor/github.com/aws/aws-sdk-go-v2/config/env_config.go
generated
vendored
86
vendor/github.com/aws/aws-sdk-go-v2/config/env_config.go
generated
vendored
@ -59,6 +59,10 @@ const (
|
||||
awsEc2MetadataDisabled = "AWS_EC2_METADATA_DISABLED"
|
||||
|
||||
awsS3DisableMultiRegionAccessPointEnvVar = "AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS"
|
||||
|
||||
awsUseDualStackEndpoint = "AWS_USE_DUALSTACK_ENDPOINT"
|
||||
|
||||
awsUseFIPSEndpoint = "AWS_USE_FIPS_ENDPOINT"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -210,6 +214,18 @@ type EnvConfig struct {
|
||||
//
|
||||
// AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS=true
|
||||
S3DisableMultiRegionAccessPoints *bool
|
||||
|
||||
// Specifies that SDK clients must resolve a dual-stack endpoint for
|
||||
// services.
|
||||
//
|
||||
// AWS_USE_DUALSTACK_ENDPOINT=true
|
||||
UseDualStackEndpoint aws.DualStackEndpointState
|
||||
|
||||
// Specifies that SDK clients must resolve a FIPS endpoint for
|
||||
// services.
|
||||
//
|
||||
// AWS_USE_FIPS_ENDPOINT=true
|
||||
UseFIPSEndpoint aws.FIPSEndpointState
|
||||
}
|
||||
|
||||
// loadEnvConfig reads configuration values from the OS's environment variables.
|
||||
@ -268,6 +284,14 @@ func NewEnvConfig() (EnvConfig, error) {
|
||||
return cfg, err
|
||||
}
|
||||
|
||||
if err := setUseDualStackEndpointFromEnvVal(&cfg.UseDualStackEndpoint, []string{awsUseDualStackEndpoint}); err != nil {
|
||||
return cfg, err
|
||||
}
|
||||
|
||||
if err := setUseFIPSEndpointFromEnvVal(&cfg.UseFIPSEndpoint, []string{awsUseFIPSEndpoint}); err != nil {
|
||||
return cfg, err
|
||||
}
|
||||
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
@ -385,6 +409,26 @@ func (c EnvConfig) GetS3DisableMultRegionAccessPoints(ctx context.Context) (valu
|
||||
return *c.S3DisableMultiRegionAccessPoints, true, nil
|
||||
}
|
||||
|
||||
// GetUseDualStackEndpoint returns whether the service's dual-stack endpoint should be
|
||||
// used for requests.
|
||||
func (c EnvConfig) GetUseDualStackEndpoint(ctx context.Context) (value aws.DualStackEndpointState, found bool, err error) {
|
||||
if c.UseDualStackEndpoint == aws.DualStackEndpointStateUnset {
|
||||
return aws.DualStackEndpointStateUnset, false, nil
|
||||
}
|
||||
|
||||
return c.UseDualStackEndpoint, true, nil
|
||||
}
|
||||
|
||||
// GetUseFIPSEndpoint returns whether the service's FIPS endpoint should be
|
||||
// used for requests.
|
||||
func (c EnvConfig) GetUseFIPSEndpoint(ctx context.Context) (value aws.FIPSEndpointState, found bool, err error) {
|
||||
if c.UseFIPSEndpoint == aws.FIPSEndpointStateUnset {
|
||||
return aws.FIPSEndpointStateUnset, false, nil
|
||||
}
|
||||
|
||||
return c.UseFIPSEndpoint, true, nil
|
||||
}
|
||||
|
||||
func setStringFromEnvVal(dst *string, keys []string) {
|
||||
for _, k := range keys {
|
||||
if v := os.Getenv(k); len(v) > 0 {
|
||||
@ -444,6 +488,48 @@ func setEndpointDiscoveryTypeFromEnvVal(dst *aws.EndpointDiscoveryEnableState, k
|
||||
return nil
|
||||
}
|
||||
|
||||
func setUseDualStackEndpointFromEnvVal(dst *aws.DualStackEndpointState, keys []string) error {
|
||||
for _, k := range keys {
|
||||
value := os.Getenv(k)
|
||||
if len(value) == 0 {
|
||||
continue // skip if empty
|
||||
}
|
||||
|
||||
switch {
|
||||
case strings.EqualFold(value, "true"):
|
||||
*dst = aws.DualStackEndpointStateEnabled
|
||||
case strings.EqualFold(value, "false"):
|
||||
*dst = aws.DualStackEndpointStateDisabled
|
||||
default:
|
||||
return fmt.Errorf(
|
||||
"invalid value for environment variable, %s=%s, need true, false",
|
||||
k, value)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func setUseFIPSEndpointFromEnvVal(dst *aws.FIPSEndpointState, keys []string) error {
|
||||
for _, k := range keys {
|
||||
value := os.Getenv(k)
|
||||
if len(value) == 0 {
|
||||
continue // skip if empty
|
||||
}
|
||||
|
||||
switch {
|
||||
case strings.EqualFold(value, "true"):
|
||||
*dst = aws.FIPSEndpointStateEnabled
|
||||
case strings.EqualFold(value, "false"):
|
||||
*dst = aws.FIPSEndpointStateDisabled
|
||||
default:
|
||||
return fmt.Errorf(
|
||||
"invalid value for environment variable, %s=%s, need true, false",
|
||||
k, value)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetEnableEndpointDiscovery returns resolved value for EnableEndpointDiscovery env variable setting.
|
||||
func (c EnvConfig) GetEnableEndpointDiscovery(ctx context.Context) (value aws.EndpointDiscoveryEnableState, found bool, err error) {
|
||||
if c.EnableEndpointDiscovery == aws.EndpointDiscoveryUnset {
|
||||
|
2
vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package config
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.8.2"
|
||||
const goModuleVersion = "1.10.1"
|
||||
|
44
vendor/github.com/aws/aws-sdk-go-v2/config/load_options.go
generated
vendored
44
vendor/github.com/aws/aws-sdk-go-v2/config/load_options.go
generated
vendored
@ -137,6 +137,14 @@ type LoadOptions struct {
|
||||
|
||||
// Specifies the EC2 Instance Metadata Service endpoint to use. If specified it overrides EC2IMDSEndpointMode.
|
||||
EC2IMDSEndpoint string
|
||||
|
||||
// Specifies that SDK clients must resolve a dual-stack endpoint for
|
||||
// services.
|
||||
UseDualStackEndpoint aws.DualStackEndpointState
|
||||
|
||||
// Specifies that SDK clients must resolve a FIPS endpoint for
|
||||
// services.
|
||||
UseFIPSEndpoint aws.FIPSEndpointState
|
||||
}
|
||||
|
||||
// getRegion returns Region from config's LoadOptions
|
||||
@ -704,3 +712,39 @@ func WithEC2IMDSEndpoint(v string) LoadOptionsFunc {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// WithUseDualStackEndpoint is a helper function to construct
|
||||
// functional options that can be used to set UseDualStackEndpoint on LoadOptions.
|
||||
func WithUseDualStackEndpoint(v aws.DualStackEndpointState) LoadOptionsFunc {
|
||||
return func(o *LoadOptions) error {
|
||||
o.UseDualStackEndpoint = v
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// GetUseDualStackEndpoint returns whether the service's dual-stack endpoint should be
|
||||
// used for requests.
|
||||
func (o LoadOptions) GetUseDualStackEndpoint(ctx context.Context) (value aws.DualStackEndpointState, found bool, err error) {
|
||||
if o.UseDualStackEndpoint == aws.DualStackEndpointStateUnset {
|
||||
return aws.DualStackEndpointStateUnset, false, nil
|
||||
}
|
||||
return o.UseDualStackEndpoint, true, nil
|
||||
}
|
||||
|
||||
// WithUseFIPSEndpoint is a helper function to construct
|
||||
// functional options that can be used to set UseFIPSEndpoint on LoadOptions.
|
||||
func WithUseFIPSEndpoint(v aws.FIPSEndpointState) LoadOptionsFunc {
|
||||
return func(o *LoadOptions) error {
|
||||
o.UseFIPSEndpoint = v
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// GetUseFIPSEndpoint returns whether the service's FIPS endpoint should be
|
||||
// used for requests.
|
||||
func (o LoadOptions) GetUseFIPSEndpoint(ctx context.Context) (value aws.FIPSEndpointState, found bool, err error) {
|
||||
if o.UseFIPSEndpoint == aws.FIPSEndpointStateUnset {
|
||||
return aws.FIPSEndpointStateUnset, false, nil
|
||||
}
|
||||
return o.UseFIPSEndpoint, true, nil
|
||||
}
|
||||
|
72
vendor/github.com/aws/aws-sdk-go-v2/config/shared_config.go
generated
vendored
72
vendor/github.com/aws/aws-sdk-go-v2/config/shared_config.go
generated
vendored
@ -64,6 +64,9 @@ const (
|
||||
|
||||
ec2MetadataServiceEndpointKey = "ec2_metadata_service_endpoint"
|
||||
|
||||
// Use DualStack Endpoint Resolution
|
||||
useDualStackEndpoint = "use_dualstack_endpoint"
|
||||
|
||||
// DefaultSharedConfigProfile is the default profile to be used when
|
||||
// loading configuration from the config files if another profile name
|
||||
// is not provided.
|
||||
@ -71,6 +74,8 @@ const (
|
||||
|
||||
// S3 Disable Multi-Region AccessPoints
|
||||
s3DisableMultiRegionAccessPointsKey = `s3_disable_multiregion_access_points`
|
||||
|
||||
useFIPSEndpointKey = "use_fips_endpoint"
|
||||
)
|
||||
|
||||
// defaultSharedConfigProfile allows for swapping the default profile for testing
|
||||
@ -176,6 +181,18 @@ type SharedConfig struct {
|
||||
//
|
||||
// s3_disable_multiregion_access_points=true
|
||||
S3DisableMultiRegionAccessPoints *bool
|
||||
|
||||
// Specifies that SDK clients must resolve a dual-stack endpoint for
|
||||
// services.
|
||||
//
|
||||
// use_dualstack_endpoint=true
|
||||
UseDualStackEndpoint aws.DualStackEndpointState
|
||||
|
||||
// Specifies that SDK clients must resolve a FIPS endpoint for
|
||||
// services.
|
||||
//
|
||||
// use_fips_endpoint=true
|
||||
UseFIPSEndpoint aws.FIPSEndpointState
|
||||
}
|
||||
|
||||
// GetS3UseARNRegion returns if the S3 service should allow ARNs to direct the region
|
||||
@ -238,6 +255,26 @@ func (c SharedConfig) GetEC2IMDSEndpoint() (string, bool, error) {
|
||||
return c.EC2IMDSEndpoint, true, nil
|
||||
}
|
||||
|
||||
// GetUseDualStackEndpoint returns whether the service's dual-stack endpoint should be
|
||||
// used for requests.
|
||||
func (c SharedConfig) GetUseDualStackEndpoint(ctx context.Context) (value aws.DualStackEndpointState, found bool, err error) {
|
||||
if c.UseDualStackEndpoint == aws.DualStackEndpointStateUnset {
|
||||
return aws.DualStackEndpointStateUnset, false, nil
|
||||
}
|
||||
|
||||
return c.UseDualStackEndpoint, true, nil
|
||||
}
|
||||
|
||||
// GetUseFIPSEndpoint returns whether the service's FIPS endpoint should be
|
||||
// used for requests.
|
||||
func (c SharedConfig) GetUseFIPSEndpoint(ctx context.Context) (value aws.FIPSEndpointState, found bool, err error) {
|
||||
if c.UseFIPSEndpoint == aws.FIPSEndpointStateUnset {
|
||||
return aws.FIPSEndpointStateUnset, false, nil
|
||||
}
|
||||
|
||||
return c.UseFIPSEndpoint, true, nil
|
||||
}
|
||||
|
||||
// loadSharedConfigIgnoreNotExist is an alias for loadSharedConfig with the
|
||||
// addition of ignoring when none of the files exist or when the profile
|
||||
// is not found in any of the files.
|
||||
@ -951,6 +988,9 @@ func (c *SharedConfig) setFromIniSection(profile string, section ini.Section) er
|
||||
}
|
||||
updateString(&c.EC2IMDSEndpoint, section, ec2MetadataServiceEndpointKey)
|
||||
|
||||
updateUseDualStackEndpoint(&c.UseDualStackEndpoint, section, useDualStackEndpoint)
|
||||
updateUseFIPSEndpoint(&c.UseFIPSEndpoint, section, useFIPSEndpointKey)
|
||||
|
||||
// Shared Credentials
|
||||
creds := aws.Credentials{
|
||||
AccessKeyID: section.String(accessKeyIDKey),
|
||||
@ -1236,3 +1276,35 @@ func updateEndpointDiscoveryType(dst *aws.EndpointDiscoveryEnableState, section
|
||||
*dst = aws.EndpointDiscoveryAuto
|
||||
}
|
||||
}
|
||||
|
||||
// updateEndpointDiscoveryType will only update the dst with the value in the section, if
|
||||
// a valid key and corresponding EndpointDiscoveryType is found.
|
||||
func updateUseDualStackEndpoint(dst *aws.DualStackEndpointState, section ini.Section, key string) {
|
||||
if !section.Has(key) {
|
||||
return
|
||||
}
|
||||
|
||||
if section.Bool(key) {
|
||||
*dst = aws.DualStackEndpointStateEnabled
|
||||
} else {
|
||||
*dst = aws.DualStackEndpointStateDisabled
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// updateEndpointDiscoveryType will only update the dst with the value in the section, if
|
||||
// a valid key and corresponding EndpointDiscoveryType is found.
|
||||
func updateUseFIPSEndpoint(dst *aws.FIPSEndpointState, section ini.Section, key string) {
|
||||
if !section.Has(key) {
|
||||
return
|
||||
}
|
||||
|
||||
if section.Bool(key) {
|
||||
*dst = aws.FIPSEndpointStateEnabled
|
||||
} else {
|
||||
*dst = aws.FIPSEndpointStateDisabled
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user