mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 11:00:25 +00:00
rebase: bump github.com/aws/aws-sdk-go-v2/service/sts
Bumps [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) from 1.16.13 to 1.16.17. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.16.13...service/ram/v1.16.17) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
mergify[bot]
parent
9ddb4a784a
commit
e5c5646963
12
go.mod
12
go.mod
@ -5,7 +5,7 @@ go 1.17
|
||||
require (
|
||||
github.com/IBM/keyprotect-go-client v0.8.1
|
||||
github.com/aws/aws-sdk-go v1.44.96
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.13
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.17
|
||||
github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000
|
||||
// TODO: API for managing subvolume metadata and snapshot metadata requires `ceph_ci_untested` build-tag
|
||||
github.com/ceph/go-ceph v0.17.0
|
||||
@ -51,11 +51,11 @@ require (
|
||||
github.com/ansel1/merry/v2 v2.0.1 // indirect
|
||||
github.com/armon/go-metrics v0.3.9 // indirect
|
||||
github.com/armon/go-radix v1.0.0 // indirect
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.11 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.18 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.12 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12 // indirect
|
||||
github.com/aws/smithy-go v1.12.1 // indirect
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.14 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 // indirect
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15 // indirect
|
||||
github.com/aws/smithy-go v1.13.2 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/blang/semver/v4 v4.0.0 // indirect
|
||||
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
|
||||
|
||||
24
go.sum
24
go.sum
@ -162,18 +162,18 @@ github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z
|
||||
github.com/aws/aws-sdk-go v1.44.67/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||
github.com/aws/aws-sdk-go v1.44.96 h1:S9paaqnJ0AJ95t5AB+iK8RM6YNZN0W0Lek1gOVJsEr8=
|
||||
github.com/aws/aws-sdk-go v1.44.96/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.11 h1:xM1ZPSvty3xVmdxiGr7ay/wlqv+MWhH0rMlyLdbC0YQ=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.11/go.mod h1:WTACcleLz6VZTp7fak4EO5b9Q4foxbn+8PIz3PmyKlo=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.18 h1:OmiwoVyLKEqqD5GvB683dbSqxiOfvx4U2lDZhG2Esc4=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.18/go.mod h1:348MLhzV1GSlZSMusdwQpXKbhD7X2gbI/TxwAPKkYZQ=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.12 h1:5mvQDtNWtI6H56+E4LUnLWEmATMB7oEh+Z9RurtIuC0=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.12/go.mod h1:ckaCVTEdGAxO6KwTGzgskxR1xM+iJW4lxMyDFVda2Fc=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12 h1:7iPTTX4SAI2U2VOogD7/gmHlsgnYSgoNHt7MSQXtG2M=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12/go.mod h1:1TODGhheLWjpQWSuhYuAUWYTCKwEjx2iblIFKDHjeTc=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.13 h1:dl8T0PJlN92rvEGOEUiD0+YPYdPEaCZK0TqHukvSfII=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.13/go.mod h1:Ru3QVMLygVs/07UQ3YDur1AQZZp2tUNje8wfloFttC0=
|
||||
github.com/aws/smithy-go v1.12.1 h1:yQRC55aXN/y1W10HgwHle01DRuV9Dpf31iGkotjt3Ag=
|
||||
github.com/aws/smithy-go v1.12.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.14 h1:db6GvO4Z2UqHt5gvT0lr6J5x5P+oQ7bdRzczVaRekMU=
|
||||
github.com/aws/aws-sdk-go-v2 v1.16.14/go.mod h1:s/G+UV29dECbF5rf+RNj1xhlmvoNurGSr+McVSRj59w=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 h1:gRIXnmAVNyoRQywdNtpAkgY+f30QNzgF53Q5OobNZZs=
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21/go.mod h1:XsmHMV9c512xgsW01q7H0ut+UQQQpWX8QsFbdLHDwaU=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 h1:noAhOo2mMDyYhTx99aYPvQw16T3fQ/DiKAv9fzpIKH8=
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15/go.mod h1:kjJ4CyD9M3Wq88GYg3IPfj67Rs0Uvz8aXK7MJ8BvE4I=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15 h1:xlf0J6DUgAj/ocvKQxCmad8Bu1lJuRbt5Wu+4G1xw1g=
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15/go.mod h1:ZVJ7ejRl4+tkWMuCwjXoy0jd8fF5u3RCyWjSVjUIvQE=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.17 h1:LVM2jzEQ8mhb2dhrFl4PJ3sa5+KcKT01dsMk2Ma9/FU=
|
||||
github.com/aws/aws-sdk-go-v2/service/sts v1.16.17/go.mod h1:bQujK1n0V1D1Gz5uII1jaB1WDvhj4/T3tElsJnVXCR0=
|
||||
github.com/aws/smithy-go v1.13.2 h1:TBLKyeJfXTrTXRHmsv4qWt9IQGYyWThLYaJWSahTOGE=
|
||||
github.com/aws/smithy-go v1.13.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
|
||||
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
|
||||
github.com/baum/kmip-go v0.0.0-20220714190649-7b37ecf92eb2/go.mod h1:5WlKRqL5dfI68V56W+4ZmlPSL+TSfqQrKJYI8CSJz+E=
|
||||
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
|
||||
|
||||
15
vendor/github.com/aws/aws-sdk-go-v2/aws/config.go
generated
vendored
15
vendor/github.com/aws/aws-sdk-go-v2/aws/config.go
generated
vendored
@ -3,13 +3,14 @@ package aws
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
smithybearer "github.com/aws/smithy-go/auth/bearer"
|
||||
"github.com/aws/smithy-go/logging"
|
||||
"github.com/aws/smithy-go/middleware"
|
||||
)
|
||||
|
||||
// HTTPClient provides the interface to provide custom HTTPClients. Generally
|
||||
// *http.Client is sufficient for most use cases. The HTTPClient should not
|
||||
// follow redirects.
|
||||
// follow 301 or 302 redirects.
|
||||
type HTTPClient interface {
|
||||
Do(*http.Request) (*http.Response, error)
|
||||
}
|
||||
@ -30,6 +31,18 @@ type Config struct {
|
||||
// variables, shared credential file, and EC2 Instance Roles.
|
||||
Credentials CredentialsProvider
|
||||
|
||||
// The Bearer Authentication token provider to use for authenticating API
|
||||
// operation calls with a Bearer Authentication token. The API clients and
|
||||
// operation must support Bearer Authentication scheme in order for the
|
||||
// token provider to be used. API clients created with NewFromConfig will
|
||||
// automatically be configured with this option, if the API client support
|
||||
// Bearer Authentication.
|
||||
//
|
||||
// The SDK's config.LoadDefaultConfig can automatically populate this
|
||||
// option for external configuration options such as SSO session.
|
||||
// https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.html
|
||||
BearerAuthTokenProvider smithybearer.TokenProvider
|
||||
|
||||
// The HTTP Client the SDK's API clients will use to invoke HTTP requests.
|
||||
// The SDK defaults to a BuildableClient allowing API clients to create
|
||||
// copies of the HTTP Client for service specific customizations.
|
||||
|
||||
2
vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package aws
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.16.11"
|
||||
const goModuleVersion = "1.16.14"
|
||||
|
||||
2
vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/middleware.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/middleware.go
generated
vendored
@ -82,7 +82,7 @@ func (m *dynamicPayloadSigningMiddleware) HandleBuild(
|
||||
}
|
||||
|
||||
// if TLS is enabled, use unsigned payload when supported
|
||||
if strings.EqualFold(req.URL.Scheme, "https") {
|
||||
if req.IsHTTPS() {
|
||||
return (&unsignedPayload{}).HandleBuild(ctx, in, next)
|
||||
}
|
||||
|
||||
|
||||
12
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md
generated
vendored
12
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md
generated
vendored
@ -1,3 +1,15 @@
|
||||
# v1.1.21 (2022-09-02)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.1.20 (2022-08-31)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.1.19 (2022-08-29)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.1.18 (2022-08-11)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
2
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package configsources
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.1.18"
|
||||
const goModuleVersion = "1.1.21"
|
||||
|
||||
12
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md
generated
vendored
12
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md
generated
vendored
@ -1,3 +1,15 @@
|
||||
# v2.4.15 (2022-09-02)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v2.4.14 (2022-08-31)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v2.4.13 (2022-08-29)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v2.4.12 (2022-08-11)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
2
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package endpoints
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "2.4.12"
|
||||
const goModuleVersion = "2.4.15"
|
||||
|
||||
12
vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md
generated
vendored
12
vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md
generated
vendored
@ -1,3 +1,15 @@
|
||||
# v1.9.15 (2022-09-02)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.9.14 (2022-08-31)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.9.13 (2022-08-29)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.9.12 (2022-08-11)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
@ -3,4 +3,4 @@
|
||||
package presignedurl
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.9.12"
|
||||
const goModuleVersion = "1.9.15"
|
||||
|
||||
16
vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md
generated
vendored
16
vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md
generated
vendored
@ -1,3 +1,19 @@
|
||||
# v1.16.17 (2022-09-02)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.16.16 (2022-08-31)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.16.15 (2022-08-30)
|
||||
|
||||
* No change notes available for this release.
|
||||
|
||||
# v1.16.14 (2022-08-29)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
# v1.16.13 (2022-08-11)
|
||||
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
2
vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package sts
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.16.13"
|
||||
const goModuleVersion = "1.16.17"
|
||||
|
||||
3
vendor/github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints/endpoints.go
generated
vendored
3
vendor/github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints/endpoints.go
generated
vendored
@ -191,6 +191,9 @@ var defaultPartitions = endpoints.Partitions{
|
||||
endpoints.EndpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoints.Endpoint{},
|
||||
endpoints.EndpointKey{
|
||||
Region: "me-central-1",
|
||||
}: endpoints.Endpoint{},
|
||||
endpoints.EndpointKey{
|
||||
Region: "me-south-1",
|
||||
}: endpoints.Endpoint{},
|
||||
|
||||
14
vendor/github.com/aws/smithy-go/CHANGELOG.md
generated
vendored
14
vendor/github.com/aws/smithy-go/CHANGELOG.md
generated
vendored
@ -1,3 +1,17 @@
|
||||
# Release (v1.13.2)
|
||||
|
||||
* No change notes available for this release.
|
||||
|
||||
# Release (v1.13.1)
|
||||
|
||||
* No change notes available for this release.
|
||||
|
||||
# Release (v1.13.0)
|
||||
|
||||
## Module Highlights
|
||||
* `github.com/aws/smithy-go`: v1.13.0
|
||||
* **Feature**: Adds support for the Smithy httpBearerAuth authentication trait to smithy-go. This allows the SDK to support the bearer authentication flow for API operations decorated with httpBearerAuth. An API client will need to be provided with its own bearer.TokenProvider implementation or use the bearer.StaticTokenProvider implementation.
|
||||
|
||||
# Release (v1.12.1)
|
||||
|
||||
## Module Highlights
|
||||
|
||||
3
vendor/github.com/aws/smithy-go/auth/bearer/docs.go
generated
vendored
Normal file
3
vendor/github.com/aws/smithy-go/auth/bearer/docs.go
generated
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
// Package bearer provides middleware and utilities for authenticating API
|
||||
// operation calls with a Bearer Token.
|
||||
package bearer
|
||||
104
vendor/github.com/aws/smithy-go/auth/bearer/middleware.go
generated
vendored
Normal file
104
vendor/github.com/aws/smithy-go/auth/bearer/middleware.go
generated
vendored
Normal file
@ -0,0 +1,104 @@
|
||||
package bearer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/aws/smithy-go/middleware"
|
||||
smithyhttp "github.com/aws/smithy-go/transport/http"
|
||||
)
|
||||
|
||||
// Message is the middleware stack's request transport message value.
|
||||
type Message interface{}
|
||||
|
||||
// Signer provides an interface for implementations to decorate a request
|
||||
// message with a bearer token. The signer is responsible for validating the
|
||||
// message type is compatible with the signer.
|
||||
type Signer interface {
|
||||
SignWithBearerToken(context.Context, Token, Message) (Message, error)
|
||||
}
|
||||
|
||||
// AuthenticationMiddleware provides the Finalize middleware step for signing
|
||||
// an request message with a bearer token.
|
||||
type AuthenticationMiddleware struct {
|
||||
signer Signer
|
||||
tokenProvider TokenProvider
|
||||
}
|
||||
|
||||
// AddAuthenticationMiddleware helper adds the AuthenticationMiddleware to the
|
||||
// middleware Stack in the Finalize step with the options provided.
|
||||
func AddAuthenticationMiddleware(s *middleware.Stack, signer Signer, tokenProvider TokenProvider) error {
|
||||
return s.Finalize.Add(
|
||||
NewAuthenticationMiddleware(signer, tokenProvider),
|
||||
middleware.After,
|
||||
)
|
||||
}
|
||||
|
||||
// NewAuthenticationMiddleware returns an initialized AuthenticationMiddleware.
|
||||
func NewAuthenticationMiddleware(signer Signer, tokenProvider TokenProvider) *AuthenticationMiddleware {
|
||||
return &AuthenticationMiddleware{
|
||||
signer: signer,
|
||||
tokenProvider: tokenProvider,
|
||||
}
|
||||
}
|
||||
|
||||
const authenticationMiddlewareID = "BearerTokenAuthentication"
|
||||
|
||||
// ID returns the resolver identifier
|
||||
func (m *AuthenticationMiddleware) ID() string {
|
||||
return authenticationMiddlewareID
|
||||
}
|
||||
|
||||
// HandleFinalize implements the FinalizeMiddleware interface in order to
|
||||
// update the request with bearer token authentication.
|
||||
func (m *AuthenticationMiddleware) HandleFinalize(
|
||||
ctx context.Context, in middleware.FinalizeInput, next middleware.FinalizeHandler,
|
||||
) (
|
||||
out middleware.FinalizeOutput, metadata middleware.Metadata, err error,
|
||||
) {
|
||||
token, err := m.tokenProvider.RetrieveBearerToken(ctx)
|
||||
if err != nil {
|
||||
return out, metadata, fmt.Errorf("failed AuthenticationMiddleware wrap message, %w", err)
|
||||
}
|
||||
|
||||
signedMessage, err := m.signer.SignWithBearerToken(ctx, token, in.Request)
|
||||
if err != nil {
|
||||
return out, metadata, fmt.Errorf("failed AuthenticationMiddleware sign message, %w", err)
|
||||
}
|
||||
|
||||
in.Request = signedMessage
|
||||
return next.HandleFinalize(ctx, in)
|
||||
}
|
||||
|
||||
// SignHTTPSMessage provides a bearer token authentication implementation that
|
||||
// will sign the message with the provided bearer token.
|
||||
//
|
||||
// Will fail if the message is not a smithy-go HTTP request or the request is
|
||||
// not HTTPS.
|
||||
type SignHTTPSMessage struct{}
|
||||
|
||||
// NewSignHTTPSMessage returns an initialized signer for HTTP messages.
|
||||
func NewSignHTTPSMessage() *SignHTTPSMessage {
|
||||
return &SignHTTPSMessage{}
|
||||
}
|
||||
|
||||
// SignWithBearerToken returns a copy of the HTTP request with the bearer token
|
||||
// added via the "Authorization" header, per RFC 6750, https://datatracker.ietf.org/doc/html/rfc6750.
|
||||
//
|
||||
// Returns an error if the request's URL scheme is not HTTPS, or the request
|
||||
// message is not an smithy-go HTTP Request pointer type.
|
||||
func (SignHTTPSMessage) SignWithBearerToken(ctx context.Context, token Token, message Message) (Message, error) {
|
||||
req, ok := message.(*smithyhttp.Request)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("expect smithy-go HTTP Request, got %T", message)
|
||||
}
|
||||
|
||||
if !req.IsHTTPS() {
|
||||
return nil, fmt.Errorf("bearer token with HTTP request requires HTTPS")
|
||||
}
|
||||
|
||||
reqClone := req.Clone()
|
||||
reqClone.Header.Set("Authorization", "Bearer "+token.Value)
|
||||
|
||||
return reqClone, nil
|
||||
}
|
||||
50
vendor/github.com/aws/smithy-go/auth/bearer/token.go
generated
vendored
Normal file
50
vendor/github.com/aws/smithy-go/auth/bearer/token.go
generated
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
package bearer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Token provides a type wrapping a bearer token and expiration metadata.
|
||||
type Token struct {
|
||||
Value string
|
||||
|
||||
CanExpire bool
|
||||
Expires time.Time
|
||||
}
|
||||
|
||||
// Expired returns if the token's Expires time is before or equal to the time
|
||||
// provided. If CanExpires is false, Expired will always return false.
|
||||
func (t Token) Expired(now time.Time) bool {
|
||||
if !t.CanExpire {
|
||||
return false
|
||||
}
|
||||
now = now.Round(0)
|
||||
return now.Equal(t.Expires) || now.After(t.Expires)
|
||||
}
|
||||
|
||||
// TokenProvider provides interface for retrieving bearer tokens.
|
||||
type TokenProvider interface {
|
||||
RetrieveBearerToken(context.Context) (Token, error)
|
||||
}
|
||||
|
||||
// TokenProviderFunc provides a helper utility to wrap a function as a type
|
||||
// that implements the TokenProvider interface.
|
||||
type TokenProviderFunc func(context.Context) (Token, error)
|
||||
|
||||
// RetrieveBearerToken calls the wrapped function, returning the Token or
|
||||
// error.
|
||||
func (fn TokenProviderFunc) RetrieveBearerToken(ctx context.Context) (Token, error) {
|
||||
return fn(ctx)
|
||||
}
|
||||
|
||||
// StaticTokenProvider provides a utility for wrapping a static bearer token
|
||||
// value within an implementation of a token provider.
|
||||
type StaticTokenProvider struct {
|
||||
Token Token
|
||||
}
|
||||
|
||||
// RetrieveBearerToken returns the static token specified.
|
||||
func (s StaticTokenProvider) RetrieveBearerToken(context.Context) (Token, error) {
|
||||
return s.Token, nil
|
||||
}
|
||||
208
vendor/github.com/aws/smithy-go/auth/bearer/token_cache.go
generated
vendored
Normal file
208
vendor/github.com/aws/smithy-go/auth/bearer/token_cache.go
generated
vendored
Normal file
@ -0,0 +1,208 @@
|
||||
package bearer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
smithycontext "github.com/aws/smithy-go/context"
|
||||
"github.com/aws/smithy-go/internal/sync/singleflight"
|
||||
)
|
||||
|
||||
// package variable that can be override in unit tests.
|
||||
var timeNow = time.Now
|
||||
|
||||
// TokenCacheOptions provides a set of optional configuration options for the
|
||||
// TokenCache TokenProvider.
|
||||
type TokenCacheOptions struct {
|
||||
// The duration before the token will expire when the credentials will be
|
||||
// refreshed. If DisableAsyncRefresh is true, the RetrieveBearerToken calls
|
||||
// will be blocking.
|
||||
//
|
||||
// Asynchronous refreshes are deduplicated, and only one will be in-flight
|
||||
// at a time. If the token expires while an asynchronous refresh is in
|
||||
// flight, the next call to RetrieveBearerToken will block on that refresh
|
||||
// to return.
|
||||
RefreshBeforeExpires time.Duration
|
||||
|
||||
// The timeout the underlying TokenProvider's RetrieveBearerToken call must
|
||||
// return within, or will be canceled. Defaults to 0, no timeout.
|
||||
//
|
||||
// If 0 timeout, its possible for the underlying tokenProvider's
|
||||
// RetrieveBearerToken call to block forever. Preventing subsequent
|
||||
// TokenCache attempts to refresh the token.
|
||||
//
|
||||
// If this timeout is reached all pending deduplicated calls to
|
||||
// TokenCache RetrieveBearerToken will fail with an error.
|
||||
RetrieveBearerTokenTimeout time.Duration
|
||||
|
||||
// The minimum duration between asynchronous refresh attempts. If the next
|
||||
// asynchronous recent refresh attempt was within the minimum delay
|
||||
// duration, the call to retrieve will return the current cached token, if
|
||||
// not expired.
|
||||
//
|
||||
// The asynchronous retrieve is deduplicated across multiple calls when
|
||||
// RetrieveBearerToken is called. The asynchronous retrieve is not a
|
||||
// periodic task. It is only performed when the token has not yet expired,
|
||||
// and the current item is within the RefreshBeforeExpires window, and the
|
||||
// TokenCache's RetrieveBearerToken method is called.
|
||||
//
|
||||
// If 0, (default) there will be no minimum delay between asynchronous
|
||||
// refresh attempts.
|
||||
//
|
||||
// If DisableAsyncRefresh is true, this option is ignored.
|
||||
AsyncRefreshMinimumDelay time.Duration
|
||||
|
||||
// Sets if the TokenCache will attempt to refresh the token in the
|
||||
// background asynchronously instead of blocking for credentials to be
|
||||
// refreshed. If disabled token refresh will be blocking.
|
||||
//
|
||||
// The first call to RetrieveBearerToken will always be blocking, because
|
||||
// there is no cached token.
|
||||
DisableAsyncRefresh bool
|
||||
}
|
||||
|
||||
// TokenCache provides an utility to cache Bearer Authentication tokens from a
|
||||
// wrapped TokenProvider. The TokenCache can be has options to configure the
|
||||
// cache's early and asynchronous refresh of the token.
|
||||
type TokenCache struct {
|
||||
options TokenCacheOptions
|
||||
provider TokenProvider
|
||||
|
||||
cachedToken atomic.Value
|
||||
lastRefreshAttemptTime atomic.Value
|
||||
sfGroup singleflight.Group
|
||||
}
|
||||
|
||||
// NewTokenCache returns a initialized TokenCache that implements the
|
||||
// TokenProvider interface. Wrapping the provider passed in. Also taking a set
|
||||
// of optional functional option parameters to configure the token cache.
|
||||
func NewTokenCache(provider TokenProvider, optFns ...func(*TokenCacheOptions)) *TokenCache {
|
||||
var options TokenCacheOptions
|
||||
for _, fn := range optFns {
|
||||
fn(&options)
|
||||
}
|
||||
|
||||
return &TokenCache{
|
||||
options: options,
|
||||
provider: provider,
|
||||
}
|
||||
}
|
||||
|
||||
// RetrieveBearerToken returns the token if it could be obtained, or error if a
|
||||
// valid token could not be retrieved.
|
||||
//
|
||||
// The passed in Context's cancel/deadline/timeout will impacting only this
|
||||
// individual retrieve call and not any other already queued up calls. This
|
||||
// means underlying provider's RetrieveBearerToken calls could block for ever,
|
||||
// and not be canceled with the Context. Set RetrieveBearerTokenTimeout to
|
||||
// provide a timeout, preventing the underlying TokenProvider blocking forever.
|
||||
//
|
||||
// By default, if the passed in Context is canceled, all of its values will be
|
||||
// considered expired. The wrapped TokenProvider will not be able to lookup the
|
||||
// values from the Context once it is expired. This is done to protect against
|
||||
// expired values no longer being valid. To disable this behavior, use
|
||||
// smithy-go's context.WithPreserveExpiredValues to add a value to the Context
|
||||
// before calling RetrieveBearerToken to enable support for expired values.
|
||||
//
|
||||
// Without RetrieveBearerTokenTimeout there is the potential for a underlying
|
||||
// Provider's RetrieveBearerToken call to sit forever. Blocking in subsequent
|
||||
// attempts at refreshing the token.
|
||||
func (p *TokenCache) RetrieveBearerToken(ctx context.Context) (Token, error) {
|
||||
cachedToken, ok := p.getCachedToken()
|
||||
if !ok || cachedToken.Expired(timeNow()) {
|
||||
return p.refreshBearerToken(ctx)
|
||||
}
|
||||
|
||||
// Check if the token should be refreshed before it expires.
|
||||
refreshToken := cachedToken.Expired(timeNow().Add(p.options.RefreshBeforeExpires))
|
||||
if !refreshToken {
|
||||
return cachedToken, nil
|
||||
}
|
||||
|
||||
if p.options.DisableAsyncRefresh {
|
||||
return p.refreshBearerToken(ctx)
|
||||
}
|
||||
|
||||
p.tryAsyncRefresh(ctx)
|
||||
|
||||
return cachedToken, nil
|
||||
}
|
||||
|
||||
// tryAsyncRefresh attempts to asynchronously refresh the token returning the
|
||||
// already cached token. If it AsyncRefreshMinimumDelay option is not zero, and
|
||||
// the duration since the last refresh is less than that value, nothing will be
|
||||
// done.
|
||||
func (p *TokenCache) tryAsyncRefresh(ctx context.Context) {
|
||||
if p.options.AsyncRefreshMinimumDelay != 0 {
|
||||
var lastRefreshAttempt time.Time
|
||||
if v := p.lastRefreshAttemptTime.Load(); v != nil {
|
||||
lastRefreshAttempt = v.(time.Time)
|
||||
}
|
||||
|
||||
if timeNow().Before(lastRefreshAttempt.Add(p.options.AsyncRefreshMinimumDelay)) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Ignore the returned channel so this won't be blocking, and limit the
|
||||
// number of additional goroutines created.
|
||||
p.sfGroup.DoChan("async-refresh", func() (interface{}, error) {
|
||||
res, err := p.refreshBearerToken(ctx)
|
||||
if p.options.AsyncRefreshMinimumDelay != 0 {
|
||||
var refreshAttempt time.Time
|
||||
if err != nil {
|
||||
refreshAttempt = timeNow()
|
||||
}
|
||||
p.lastRefreshAttemptTime.Store(refreshAttempt)
|
||||
}
|
||||
|
||||
return res, err
|
||||
})
|
||||
}
|
||||
|
||||
func (p *TokenCache) refreshBearerToken(ctx context.Context) (Token, error) {
|
||||
resCh := p.sfGroup.DoChan("refresh-token", func() (interface{}, error) {
|
||||
ctx := smithycontext.WithSuppressCancel(ctx)
|
||||
if v := p.options.RetrieveBearerTokenTimeout; v != 0 {
|
||||
var cancel func()
|
||||
ctx, cancel = context.WithTimeout(ctx, v)
|
||||
defer cancel()
|
||||
}
|
||||
return p.singleRetrieve(ctx)
|
||||
})
|
||||
|
||||
select {
|
||||
case res := <-resCh:
|
||||
return res.Val.(Token), res.Err
|
||||
case <-ctx.Done():
|
||||
return Token{}, fmt.Errorf("retrieve bearer token canceled, %w", ctx.Err())
|
||||
}
|
||||
}
|
||||
|
||||
func (p *TokenCache) singleRetrieve(ctx context.Context) (interface{}, error) {
|
||||
token, err := p.provider.RetrieveBearerToken(ctx)
|
||||
if err != nil {
|
||||
return Token{}, fmt.Errorf("failed to retrieve bearer token, %w", err)
|
||||
}
|
||||
|
||||
p.cachedToken.Store(&token)
|
||||
return token, nil
|
||||
}
|
||||
|
||||
// getCachedToken returns the currently cached token and true if found. Returns
|
||||
// false if no token is cached.
|
||||
func (p *TokenCache) getCachedToken() (Token, bool) {
|
||||
v := p.cachedToken.Load()
|
||||
if v == nil {
|
||||
return Token{}, false
|
||||
}
|
||||
|
||||
t := v.(*Token)
|
||||
if t == nil || t.Value == "" {
|
||||
return Token{}, false
|
||||
}
|
||||
|
||||
return *t, true
|
||||
}
|
||||
81
vendor/github.com/aws/smithy-go/context/suppress_expired.go
generated
vendored
Normal file
81
vendor/github.com/aws/smithy-go/context/suppress_expired.go
generated
vendored
Normal file
@ -0,0 +1,81 @@
|
||||
package context
|
||||
|
||||
import "context"
|
||||
|
||||
// valueOnlyContext provides a utility to preserve only the values of a
|
||||
// Context. Suppressing any cancellation or deadline on that context being
|
||||
// propagated downstream of this value.
|
||||
//
|
||||
// If preserveExpiredValues is false (default), and the valueCtx is canceled,
|
||||
// calls to lookup values with the Values method, will always return nil. Setting
|
||||
// preserveExpiredValues to true, will allow the valueOnlyContext to lookup
|
||||
// values in valueCtx even if valueCtx is canceled.
|
||||
//
|
||||
// Based on the Go standard libraries net/lookup.go onlyValuesCtx utility.
|
||||
// https://github.com/golang/go/blob/da2773fe3e2f6106634673a38dc3a6eb875fe7d8/src/net/lookup.go
|
||||
type valueOnlyContext struct {
|
||||
context.Context
|
||||
|
||||
preserveExpiredValues bool
|
||||
valuesCtx context.Context
|
||||
}
|
||||
|
||||
var _ context.Context = (*valueOnlyContext)(nil)
|
||||
|
||||
// Value looks up the key, returning its value. If configured to not preserve
|
||||
// values of expired context, and the wrapping context is canceled, nil will be
|
||||
// returned.
|
||||
func (v *valueOnlyContext) Value(key interface{}) interface{} {
|
||||
if !v.preserveExpiredValues {
|
||||
select {
|
||||
case <-v.valuesCtx.Done():
|
||||
return nil
|
||||
default:
|
||||
}
|
||||
}
|
||||
|
||||
return v.valuesCtx.Value(key)
|
||||
}
|
||||
|
||||
// WithSuppressCancel wraps the Context value, suppressing its deadline and
|
||||
// cancellation events being propagated downstream to consumer of the returned
|
||||
// context.
|
||||
//
|
||||
// By default the wrapped Context's Values are available downstream until the
|
||||
// wrapped Context is canceled. Once the wrapped Context is canceled, Values
|
||||
// method called on the context return will no longer lookup any key. As they
|
||||
// are now considered expired.
|
||||
//
|
||||
// To override this behavior, use WithPreserveExpiredValues on the Context
|
||||
// before it is wrapped by WithSuppressCancel. This will make the Context
|
||||
// returned by WithSuppressCancel allow lookup of expired values.
|
||||
func WithSuppressCancel(ctx context.Context) context.Context {
|
||||
return &valueOnlyContext{
|
||||
Context: context.Background(),
|
||||
valuesCtx: ctx,
|
||||
|
||||
preserveExpiredValues: GetPreserveExpiredValues(ctx),
|
||||
}
|
||||
}
|
||||
|
||||
type preserveExpiredValuesKey struct{}
|
||||
|
||||
// WithPreserveExpiredValues adds a Value to the Context if expired values
|
||||
// should be preserved, and looked up by a Context wrapped by
|
||||
// WithSuppressCancel.
|
||||
//
|
||||
// WithPreserveExpiredValues must be added as a value to a Context, before that
|
||||
// Context is wrapped by WithSuppressCancel
|
||||
func WithPreserveExpiredValues(ctx context.Context, enable bool) context.Context {
|
||||
return context.WithValue(ctx, preserveExpiredValuesKey{}, enable)
|
||||
}
|
||||
|
||||
// GetPreserveExpiredValues looks up, and returns the PreserveExpressValues
|
||||
// value in the context. Returning true if enabled, false otherwise.
|
||||
func GetPreserveExpiredValues(ctx context.Context) bool {
|
||||
v := ctx.Value(preserveExpiredValuesKey{})
|
||||
if v != nil {
|
||||
return v.(bool)
|
||||
}
|
||||
return false
|
||||
}
|
||||
2
vendor/github.com/aws/smithy-go/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/smithy-go/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package smithy
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.12.1"
|
||||
const goModuleVersion = "1.13.2"
|
||||
|
||||
28
vendor/github.com/aws/smithy-go/internal/sync/singleflight/LICENSE
generated
vendored
Normal file
28
vendor/github.com/aws/smithy-go/internal/sync/singleflight/LICENSE
generated
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
Copyright (c) 2009 The Go Authors. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following disclaimer
|
||||
in the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
* Neither the name of Google Inc. nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
8
vendor/github.com/aws/smithy-go/internal/sync/singleflight/docs.go
generated
vendored
Normal file
8
vendor/github.com/aws/smithy-go/internal/sync/singleflight/docs.go
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
// Package singleflight provides a duplicate function call suppression
|
||||
// mechanism. This package is a fork of the Go golang.org/x/sync/singleflight
|
||||
// package. The package is forked, because the package a part of the unstable
|
||||
// and unversioned golang.org/x/sync module.
|
||||
//
|
||||
// https://github.com/golang/sync/tree/67f06af15bc961c363a7260195bcd53487529a21/singleflight
|
||||
|
||||
package singleflight
|
||||
210
vendor/github.com/aws/smithy-go/internal/sync/singleflight/singleflight.go
generated
vendored
Normal file
210
vendor/github.com/aws/smithy-go/internal/sync/singleflight/singleflight.go
generated
vendored
Normal file
@ -0,0 +1,210 @@
|
||||
// Copyright 2013 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package singleflight
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"runtime"
|
||||
"runtime/debug"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// errGoexit indicates the runtime.Goexit was called in
|
||||
// the user given function.
|
||||
var errGoexit = errors.New("runtime.Goexit was called")
|
||||
|
||||
// A panicError is an arbitrary value recovered from a panic
|
||||
// with the stack trace during the execution of given function.
|
||||
type panicError struct {
|
||||
value interface{}
|
||||
stack []byte
|
||||
}
|
||||
|
||||
// Error implements error interface.
|
||||
func (p *panicError) Error() string {
|
||||
return fmt.Sprintf("%v\n\n%s", p.value, p.stack)
|
||||
}
|
||||
|
||||
func newPanicError(v interface{}) error {
|
||||
stack := debug.Stack()
|
||||
|
||||
// The first line of the stack trace is of the form "goroutine N [status]:"
|
||||
// but by the time the panic reaches Do the goroutine may no longer exist
|
||||
// and its status will have changed. Trim out the misleading line.
|
||||
if line := bytes.IndexByte(stack[:], '\n'); line >= 0 {
|
||||
stack = stack[line+1:]
|
||||
}
|
||||
return &panicError{value: v, stack: stack}
|
||||
}
|
||||
|
||||
// call is an in-flight or completed singleflight.Do call
|
||||
type call struct {
|
||||
wg sync.WaitGroup
|
||||
|
||||
// These fields are written once before the WaitGroup is done
|
||||
// and are only read after the WaitGroup is done.
|
||||
val interface{}
|
||||
err error
|
||||
|
||||
// forgotten indicates whether Forget was called with this call's key
|
||||
// while the call was still in flight.
|
||||
forgotten bool
|
||||
|
||||
// These fields are read and written with the singleflight
|
||||
// mutex held before the WaitGroup is done, and are read but
|
||||
// not written after the WaitGroup is done.
|
||||
dups int
|
||||
chans []chan<- Result
|
||||
}
|
||||
|
||||
// Group represents a class of work and forms a namespace in
|
||||
// which units of work can be executed with duplicate suppression.
|
||||
type Group struct {
|
||||
mu sync.Mutex // protects m
|
||||
m map[string]*call // lazily initialized
|
||||
}
|
||||
|
||||
// Result holds the results of Do, so they can be passed
|
||||
// on a channel.
|
||||
type Result struct {
|
||||
Val interface{}
|
||||
Err error
|
||||
Shared bool
|
||||
}
|
||||
|
||||
// Do executes and returns the results of the given function, making
|
||||
// sure that only one execution is in-flight for a given key at a
|
||||
// time. If a duplicate comes in, the duplicate caller waits for the
|
||||
// original to complete and receives the same results.
|
||||
// The return value shared indicates whether v was given to multiple callers.
|
||||
func (g *Group) Do(key string, fn func() (interface{}, error)) (v interface{}, err error, shared bool) {
|
||||
g.mu.Lock()
|
||||
if g.m == nil {
|
||||
g.m = make(map[string]*call)
|
||||
}
|
||||
if c, ok := g.m[key]; ok {
|
||||
c.dups++
|
||||
g.mu.Unlock()
|
||||
c.wg.Wait()
|
||||
|
||||
if e, ok := c.err.(*panicError); ok {
|
||||
panic(e)
|
||||
} else if c.err == errGoexit {
|
||||
runtime.Goexit()
|
||||
}
|
||||
return c.val, c.err, true
|
||||
}
|
||||
c := new(call)
|
||||
c.wg.Add(1)
|
||||
g.m[key] = c
|
||||
g.mu.Unlock()
|
||||
|
||||
g.doCall(c, key, fn)
|
||||
return c.val, c.err, c.dups > 0
|
||||
}
|
||||
|
||||
// DoChan is like Do but returns a channel that will receive the
|
||||
// results when they are ready.
|
||||
//
|
||||
// The returned channel will not be closed.
|
||||
func (g *Group) DoChan(key string, fn func() (interface{}, error)) <-chan Result {
|
||||
ch := make(chan Result, 1)
|
||||
g.mu.Lock()
|
||||
if g.m == nil {
|
||||
g.m = make(map[string]*call)
|
||||
}
|
||||
if c, ok := g.m[key]; ok {
|
||||
c.dups++
|
||||
c.chans = append(c.chans, ch)
|
||||
g.mu.Unlock()
|
||||
return ch
|
||||
}
|
||||
c := &call{chans: []chan<- Result{ch}}
|
||||
c.wg.Add(1)
|
||||
g.m[key] = c
|
||||
g.mu.Unlock()
|
||||
|
||||
go g.doCall(c, key, fn)
|
||||
|
||||
return ch
|
||||
}
|
||||
|
||||
// doCall handles the single call for a key.
|
||||
func (g *Group) doCall(c *call, key string, fn func() (interface{}, error)) {
|
||||
normalReturn := false
|
||||
recovered := false
|
||||
|
||||
// use double-defer to distinguish panic from runtime.Goexit,
|
||||
// more details see https://golang.org/cl/134395
|
||||
defer func() {
|
||||
// the given function invoked runtime.Goexit
|
||||
if !normalReturn && !recovered {
|
||||
c.err = errGoexit
|
||||
}
|
||||
|
||||
c.wg.Done()
|
||||
g.mu.Lock()
|
||||
defer g.mu.Unlock()
|
||||
if !c.forgotten {
|
||||
delete(g.m, key)
|
||||
}
|
||||
|
||||
if e, ok := c.err.(*panicError); ok {
|
||||
// In order to prevent the waiting channels from being blocked forever,
|
||||
// needs to ensure that this panic cannot be recovered.
|
||||
if len(c.chans) > 0 {
|
||||
go panic(e)
|
||||
select {} // Keep this goroutine around so that it will appear in the crash dump.
|
||||
} else {
|
||||
panic(e)
|
||||
}
|
||||
} else if c.err == errGoexit {
|
||||
// Already in the process of goexit, no need to call again
|
||||
} else {
|
||||
// Normal return
|
||||
for _, ch := range c.chans {
|
||||
ch <- Result{c.val, c.err, c.dups > 0}
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
func() {
|
||||
defer func() {
|
||||
if !normalReturn {
|
||||
// Ideally, we would wait to take a stack trace until we've determined
|
||||
// whether this is a panic or a runtime.Goexit.
|
||||
//
|
||||
// Unfortunately, the only way we can distinguish the two is to see
|
||||
// whether the recover stopped the goroutine from terminating, and by
|
||||
// the time we know that, the part of the stack trace relevant to the
|
||||
// panic has been discarded.
|
||||
if r := recover(); r != nil {
|
||||
c.err = newPanicError(r)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
c.val, c.err = fn()
|
||||
normalReturn = true
|
||||
}()
|
||||
|
||||
if !normalReturn {
|
||||
recovered = true
|
||||
}
|
||||
}
|
||||
|
||||
// Forget tells the singleflight to forget about a key. Future calls
|
||||
// to Do for this key will call the function rather than waiting for
|
||||
// an earlier call to complete.
|
||||
func (g *Group) Forget(key string) {
|
||||
g.mu.Lock()
|
||||
if c, ok := g.m[key]; ok {
|
||||
c.forgotten = true
|
||||
}
|
||||
delete(g.m, key)
|
||||
g.mu.Unlock()
|
||||
}
|
||||
9
vendor/github.com/aws/smithy-go/transport/http/request.go
generated
vendored
9
vendor/github.com/aws/smithy-go/transport/http/request.go
generated
vendored
@ -7,6 +7,7 @@ import (
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
iointernal "github.com/aws/smithy-go/transport/http/internal/io"
|
||||
)
|
||||
@ -33,6 +34,14 @@ func NewStackRequest() interface{} {
|
||||
}
|
||||
}
|
||||
|
||||
// IsHTTPS returns if the request is HTTPS. Returns false if no endpoint URL is set.
|
||||
func (r *Request) IsHTTPS() bool {
|
||||
if r.URL == nil {
|
||||
return false
|
||||
}
|
||||
return strings.EqualFold(r.URL.Scheme, "https")
|
||||
}
|
||||
|
||||
// Clone returns a deep copy of the Request for the new context. A reference to
|
||||
// the Stream is copied, but the underlying stream is not copied.
|
||||
func (r *Request) Clone() *Request {
|
||||
|
||||
15
vendor/modules.txt
vendored
15
vendor/modules.txt
vendored
@ -65,7 +65,7 @@ github.com/aws/aws-sdk-go/service/sso
|
||||
github.com/aws/aws-sdk-go/service/sso/ssoiface
|
||||
github.com/aws/aws-sdk-go/service/sts
|
||||
github.com/aws/aws-sdk-go/service/sts/stsiface
|
||||
# github.com/aws/aws-sdk-go-v2 v1.16.11
|
||||
# github.com/aws/aws-sdk-go-v2 v1.16.14
|
||||
## explicit; go 1.15
|
||||
github.com/aws/aws-sdk-go-v2/aws
|
||||
github.com/aws/aws-sdk-go-v2/aws/defaults
|
||||
@ -82,27 +82,30 @@ github.com/aws/aws-sdk-go-v2/internal/sdk
|
||||
github.com/aws/aws-sdk-go-v2/internal/strings
|
||||
github.com/aws/aws-sdk-go-v2/internal/sync/singleflight
|
||||
github.com/aws/aws-sdk-go-v2/internal/timeconv
|
||||
# github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.18
|
||||
# github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21
|
||||
## explicit; go 1.15
|
||||
github.com/aws/aws-sdk-go-v2/internal/configsources
|
||||
# github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.12
|
||||
# github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15
|
||||
## explicit; go 1.15
|
||||
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2
|
||||
# github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12
|
||||
# github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15
|
||||
## explicit; go 1.15
|
||||
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url
|
||||
# github.com/aws/aws-sdk-go-v2/service/sts v1.16.13
|
||||
# github.com/aws/aws-sdk-go-v2/service/sts v1.16.17
|
||||
## explicit; go 1.15
|
||||
github.com/aws/aws-sdk-go-v2/service/sts
|
||||
github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints
|
||||
github.com/aws/aws-sdk-go-v2/service/sts/types
|
||||
# github.com/aws/smithy-go v1.12.1
|
||||
# github.com/aws/smithy-go v1.13.2
|
||||
## explicit; go 1.15
|
||||
github.com/aws/smithy-go
|
||||
github.com/aws/smithy-go/auth/bearer
|
||||
github.com/aws/smithy-go/context
|
||||
github.com/aws/smithy-go/document
|
||||
github.com/aws/smithy-go/encoding
|
||||
github.com/aws/smithy-go/encoding/httpbinding
|
||||
github.com/aws/smithy-go/encoding/xml
|
||||
github.com/aws/smithy-go/internal/sync/singleflight
|
||||
github.com/aws/smithy-go/io
|
||||
github.com/aws/smithy-go/logging
|
||||
github.com/aws/smithy-go/middleware
|
||||
|
||||
Loading…
Reference in New Issue
Block a user