aws sdk - replace deprecated session.New with session.NewSession

This commit is contained in:
Peter Rifel 2019-09-27 12:24:30 -07:00
parent bb36e261e2
commit 413580f13f
5 changed files with 28 additions and 12 deletions

View File

@ -63,7 +63,11 @@ func newRoute53(config io.Reader) (*Interface, error) {
// e.g. https://github.com/kubernetes/kops/issues/605
awsConfig = awsConfig.WithCredentialsChainVerboseErrors(true)
svc := route53.New(session.New(), awsConfig)
sess, err := session.NewSession()
if err != nil {
return nil, err
}
svc := route53.New(sess, awsConfig)
// Add our handler that will log requests
svc.Handlers.Sign.PushFrontNamed(request.NamedHandler{

View File

@ -7,7 +7,6 @@ dnsprovider/pkg/dnsprovider/providers/google/clouddns
dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal
dnsprovider/pkg/dnsprovider/providers/google/clouddns/internal/stubs
dnsprovider/pkg/dnsprovider/providers/openstack/designate
hack/machine_types
node-authorizer/pkg/authorizers/aws
node-authorizer/pkg/server
nodeup/pkg/model

View File

@ -85,7 +85,11 @@ func run() error {
// Default to us-east-1
config = config.WithRegion("us-east-1")
svc := pricing.New(session.New(), config)
sess, err := session.NewSession()
if err != nil {
return err
}
svc := pricing.New(sess, config)
typeTerm := pricing.FilterTypeTermMatch
input := &pricing.GetProductsInput{
Filters: []*pricing.Filter{

View File

@ -89,12 +89,14 @@ func NewAuthorizer(config *server.Config) (server.Authorizer, error) {
zap.String("region", document.Region))
// @step: we create a ec2 and autoscaling client
client := ec2.New(session.New(&aws.Config{
sess, err := session.NewSession(&aws.Config{
Region: aws.String(document.Region),
}))
asgc := autoscaling.New(session.New(&aws.Config{
Region: aws.String(document.Region),
}))
})
if err != nil {
return nil, err
}
client := ec2.New(sess)
asgc := autoscaling.New(sess)
// @step: get information on the instance we are running
instance, err := getInstance(client, document.InstanceID)
@ -283,12 +285,15 @@ func hasInstanceTags(name, value string, tags []*ec2.Tag) bool {
// getInstanceIdentityDocument is responsible for retrieving the instance identity document
func getInstanceIdentityDocument() (ec2metadata.EC2InstanceIdentityDocument, error) {
var document ec2metadata.EC2InstanceIdentityDocument
client := ec2metadata.New(session.New())
sess, err := session.NewSession()
if err != nil {
return document, err
}
client := ec2metadata.New(sess)
maxInterval := 500 * time.Millisecond
maxTime := 5 * time.Second
err := utils.Retry(context.TODO(), maxInterval, maxTime, func() error {
err = utils.Retry(context.TODO(), maxInterval, maxTime, func() error {
x, err := client.GetInstanceIdentityDocument()
if err != nil {
return err

View File

@ -55,7 +55,11 @@ func (a *awsNodeVerifier) VerifyIdentity(ctx context.Context) ([]byte, error) {
go func() {
encoded, err := func() ([]byte, error) {
// @step: create a metadata client
client := ec2metadata.New(session.New())
sess, err := session.NewSession()
if err != nil {
return []byte{}, err
}
client := ec2metadata.New(sess)
// @step: get the pkcs7 signature from the metadata service
signature, err := client.GetDynamicData("/instance-identity/pkcs7")