mirror of https://github.com/kubernetes/kops.git
AWS: Use pagination for DescribeImages call
This commit is contained in:
parent
6e36b7853a
commit
ac06f4af48
|
|
@ -46,18 +46,18 @@ func (m *MockEC2) DescribeImagesWithContext(aws.Context, *ec2.DescribeImagesInpu
|
|||
panic("Not implemented")
|
||||
}
|
||||
|
||||
func (m *MockEC2) DescribeImages(request *ec2.DescribeImagesInput) (*ec2.DescribeImagesOutput, error) {
|
||||
func (m *MockEC2) DescribeImagesPagesWithContext(ctx aws.Context, request *ec2.DescribeImagesInput, callback func(output *ec2.DescribeImagesOutput, b bool) bool, options ...request.Option) error {
|
||||
m.mutex.Lock()
|
||||
defer m.mutex.Unlock()
|
||||
|
||||
klog.Infof("DescribeImages: %v", request)
|
||||
klog.Infof("DescribeImagesPages: %v", request)
|
||||
|
||||
var images []*ec2.Image
|
||||
|
||||
for _, image := range m.Images {
|
||||
matches, err := m.imageMatchesFilter(image, request.Filters)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
if !matches {
|
||||
continue
|
||||
|
|
@ -72,7 +72,9 @@ func (m *MockEC2) DescribeImages(request *ec2.DescribeImagesInput) (*ec2.Describ
|
|||
Images: images,
|
||||
}
|
||||
|
||||
return response, nil
|
||||
callback(response, false)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MockEC2) DescribeImportImageTasksRequest(*ec2.DescribeImportImageTasksInput) (*request.Request, *ec2.DescribeImportImageTasksOutput) {
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -14,7 +14,7 @@ require (
|
|||
github.com/Masterminds/sprig/v3 v3.2.3
|
||||
github.com/apparentlymart/go-cidr v1.1.0
|
||||
github.com/aws/amazon-ec2-instance-selector/v2 v2.4.0
|
||||
github.com/aws/aws-sdk-go v1.44.161
|
||||
github.com/aws/aws-sdk-go v1.44.166
|
||||
github.com/blang/semver/v4 v4.0.0
|
||||
github.com/cert-manager/cert-manager v1.10.1
|
||||
github.com/digitalocean/godo v1.93.0
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -123,8 +123,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
|
|||
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
|
||||
github.com/aws/amazon-ec2-instance-selector/v2 v2.4.0 h1:9l68/pwVYm6EOAeBmoVUL4ekw6VlbwtPyX9/F+IpMxQ=
|
||||
github.com/aws/amazon-ec2-instance-selector/v2 v2.4.0/go.mod h1:AEJrtkLkCkfIBIazidrVrgZqaXl+9dxI/wRgjdw+7G0=
|
||||
github.com/aws/aws-sdk-go v1.44.161 h1:uZdZJ30mlbaU2wsrd/wzibrX01cbgKE2t486TtRjeHs=
|
||||
github.com/aws/aws-sdk-go v1.44.161/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/aws/aws-sdk-go v1.44.166 h1:oAn/wJYFoSF2e9iJYkqTlC9IY15ufPnKR1Zt8oZblhg=
|
||||
github.com/aws/aws-sdk-go v1.44.166/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ require (
|
|||
github.com/StackExchange/wmi v1.2.1 // indirect
|
||||
github.com/acomagu/bufpipe v1.0.3 // indirect
|
||||
github.com/apparentlymart/go-cidr v1.1.0 // indirect
|
||||
github.com/aws/aws-sdk-go v1.44.161 // indirect
|
||||
github.com/aws/aws-sdk-go v1.44.166 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/blang/semver v3.5.1+incompatible // indirect
|
||||
github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
|
|
|
|||
|
|
@ -305,8 +305,8 @@ github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU
|
|||
github.com/aws/aws-sdk-go v1.31.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
|
||||
github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
|
||||
github.com/aws/aws-sdk-go v1.37.22/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
|
||||
github.com/aws/aws-sdk-go v1.44.161 h1:uZdZJ30mlbaU2wsrd/wzibrX01cbgKE2t486TtRjeHs=
|
||||
github.com/aws/aws-sdk-go v1.44.161/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/aws/aws-sdk-go v1.44.166 h1:oAn/wJYFoSF2e9iJYkqTlC9IY15ufPnKR1Zt8oZblhg=
|
||||
github.com/aws/aws-sdk-go v1.44.166/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
|
||||
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
|
||||
github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
|
||||
github.com/bazelbuild/buildtools v0.0.0-20200922170545-10384511ce98/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
|
||||
|
|
|
|||
|
|
@ -2084,22 +2084,27 @@ func resolveImage(ssmClient ssmiface.SSMAPI, ec2Client ec2iface.EC2API, name str
|
|||
}
|
||||
}
|
||||
|
||||
response, err := ec2Client.DescribeImages(request)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error listing images: %v", err)
|
||||
}
|
||||
if response == nil || len(response.Images) == 0 {
|
||||
return nil, fmt.Errorf("could not find Image for %q", name)
|
||||
}
|
||||
|
||||
image := response.Images[0]
|
||||
for _, v := range response.Images {
|
||||
var image *ec2.Image
|
||||
err := ec2Client.DescribeImagesPagesWithContext(context.TODO(), request, func(output *ec2.DescribeImagesOutput, b bool) bool {
|
||||
for _, v := range output.Images {
|
||||
if image == nil {
|
||||
image = v
|
||||
} else {
|
||||
itime, _ := time.Parse(time.RFC3339, *image.CreationDate)
|
||||
vtime, _ := time.Parse(time.RFC3339, *v.CreationDate)
|
||||
if vtime.After(itime) {
|
||||
image = v
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error listing images: %v", err)
|
||||
}
|
||||
if image == nil {
|
||||
return nil, fmt.Errorf("could not find Image for %q", name)
|
||||
}
|
||||
|
||||
klog.V(4).Infof("Resolved image %q", aws.StringValue(image.ImageId))
|
||||
return image, nil
|
||||
|
|
|
|||
|
|
@ -1831,6 +1831,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-south-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -4598,6 +4601,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-central-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -9300,6 +9306,15 @@ var awsPartition = partition{
|
|||
}: endpoint{
|
||||
Hostname: "elasticfilesystem-fips.eu-central-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-central-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-central-2",
|
||||
Variant: fipsVariant,
|
||||
}: endpoint{
|
||||
Hostname: "elasticfilesystem-fips.eu-central-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -9444,6 +9459,15 @@ var awsPartition = partition{
|
|||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "fips-eu-central-2",
|
||||
}: endpoint{
|
||||
Hostname: "elasticfilesystem-fips.eu-central-2.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "eu-central-2",
|
||||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "fips-eu-north-1",
|
||||
}: endpoint{
|
||||
|
|
@ -12570,12 +12594,18 @@ var awsPartition = partition{
|
|||
},
|
||||
"identitystore": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-south-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -12585,6 +12615,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "ap-southeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -12594,12 +12627,21 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "sa-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -15241,6 +15283,121 @@ var awsPartition = partition{
|
|||
},
|
||||
},
|
||||
},
|
||||
"license-manager-linux-subscriptions": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "ap-northeast-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "fips-us-east-1",
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-east-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-east-1",
|
||||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "fips-us-east-2",
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-east-2.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-east-2",
|
||||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "fips-us-west-1",
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-west-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-west-1",
|
||||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "fips-us-west-2",
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-west-2.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-west-2",
|
||||
},
|
||||
Deprecated: boxedTrue,
|
||||
},
|
||||
endpointKey{
|
||||
Region: "sa-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
Variant: fipsVariant,
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-east-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
Variant: fipsVariant,
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-east-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
Variant: fipsVariant,
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-west-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
Variant: fipsVariant,
|
||||
}: endpoint{
|
||||
Hostname: "license-manager-linux-subscriptions-fips.us-west-2.amazonaws.com",
|
||||
},
|
||||
},
|
||||
},
|
||||
"license-manager-user-subscriptions": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
|
|
@ -16001,6 +16158,9 @@ var awsPartition = partition{
|
|||
},
|
||||
"mediaconvert": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -17607,6 +17767,14 @@ var awsPartition = partition{
|
|||
},
|
||||
"oidc": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{
|
||||
Hostname: "oidc.af-south-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "af-south-1",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-east-1",
|
||||
}: endpoint{
|
||||
|
|
@ -17663,6 +17831,14 @@ var awsPartition = partition{
|
|||
Region: "ap-southeast-2",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
}: endpoint{
|
||||
Hostname: "oidc.ap-southeast-3.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "ap-southeast-3",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{
|
||||
|
|
@ -17751,6 +17927,14 @@ var awsPartition = partition{
|
|||
Region: "us-east-2",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
}: endpoint{
|
||||
Hostname: "oidc.us-west-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-west-1",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
}: endpoint{
|
||||
|
|
@ -18536,6 +18720,14 @@ var awsPartition = partition{
|
|||
},
|
||||
"portal.sso": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{
|
||||
Hostname: "portal.sso.af-south-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "af-south-1",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-east-1",
|
||||
}: endpoint{
|
||||
|
|
@ -18592,6 +18784,14 @@ var awsPartition = partition{
|
|||
Region: "ap-southeast-2",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
}: endpoint{
|
||||
Hostname: "portal.sso.ap-southeast-3.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "ap-southeast-3",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{
|
||||
|
|
@ -18680,6 +18880,14 @@ var awsPartition = partition{
|
|||
Region: "us-east-2",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
}: endpoint{
|
||||
Hostname: "portal.sso.us-west-1.amazonaws.com",
|
||||
CredentialScope: credentialScope{
|
||||
Region: "us-west-1",
|
||||
},
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
}: endpoint{
|
||||
|
|
@ -18909,12 +19117,18 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "sa-east-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -20831,6 +21045,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-south-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -22787,33 +23004,93 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.af-south-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-east-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-east-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-northeast-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-2",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-northeast-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-northeast-3",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-northeast-3.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-south-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-south-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-southeast-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-2",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-southeast-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ap-southeast-3.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.ca-central-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -22832,30 +23109,84 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-central-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-central-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-north-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-north-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-south-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-south-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-west-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-2",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-west-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.eu-west-3.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "me-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-central-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.me-central-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "me-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-south-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.me-south-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "sa-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "sa-east-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.sa-east-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "servicediscovery",
|
||||
}: endpoint{
|
||||
|
|
@ -22886,6 +23217,12 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-east-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -22904,6 +23241,12 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-east-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -22922,6 +23265,12 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-west-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -22940,6 +23289,12 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-west-2.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -23012,6 +23367,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "eu-west-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-central-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "me-south-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -24152,8 +24510,18 @@ var awsPartition = partition{
|
|||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"ssm-sap": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "us-east-1",
|
||||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"sso": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "af-south-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-east-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -24175,6 +24543,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "ap-southeast-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ap-southeast-3",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "ca-central-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -24208,6 +24579,9 @@ var awsPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-east-2",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-west-2",
|
||||
}: endpoint{},
|
||||
|
|
@ -28089,6 +28463,16 @@ var awscnPartition = partition{
|
|||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"datasync": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "cn-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "cn-northwest-1",
|
||||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"dax": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
|
|
@ -29008,9 +29392,21 @@ var awscnPartition = partition{
|
|||
endpointKey{
|
||||
Region: "cn-north-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "cn-north-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.cn-north-1.amazonaws.com.cn",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "cn-northwest-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "cn-northwest-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.cn-northwest-1.amazonaws.com.cn",
|
||||
},
|
||||
},
|
||||
},
|
||||
"sms": service{
|
||||
|
|
@ -32434,6 +32830,9 @@ var awsusgovPartition = partition{
|
|||
},
|
||||
"metrics.sagemaker": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "us-gov-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-gov-west-1",
|
||||
}: endpoint{},
|
||||
|
|
@ -33627,6 +34026,12 @@ var awsusgovPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-gov-east-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-gov-east-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-gov-east-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-gov-east-1",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -33645,6 +34050,12 @@ var awsusgovPartition = partition{
|
|||
endpointKey{
|
||||
Region: "us-gov-west-1",
|
||||
}: endpoint{},
|
||||
endpointKey{
|
||||
Region: "us-gov-west-1",
|
||||
Variant: dualStackVariant,
|
||||
}: endpoint{
|
||||
Hostname: "servicediscovery.us-gov-west-1.amazonaws.com",
|
||||
},
|
||||
endpointKey{
|
||||
Region: "us-gov-west-1",
|
||||
Variant: fipsVariant,
|
||||
|
|
@ -35039,6 +35450,13 @@ var awsisoPartition = partition{
|
|||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"glue": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
Region: "us-iso-east-1",
|
||||
}: endpoint{},
|
||||
},
|
||||
},
|
||||
"health": service{
|
||||
Endpoints: serviceEndpoints{
|
||||
endpointKey{
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ package aws
|
|||
const SDKName = "aws-sdk-go"
|
||||
|
||||
// SDKVersion is the version of this SDK
|
||||
const SDKVersion = "1.44.161"
|
||||
const SDKVersion = "1.44.166"
|
||||
|
|
|
|||
|
|
@ -3477,7 +3477,7 @@ func (c *EC2) CancelImageLaunchPermissionRequest(input *CancelImageLaunchPermiss
|
|||
// Removes your Amazon Web Services account from the launch permissions for
|
||||
// the specified AMI. For more information, see Cancel having an AMI shared
|
||||
// with your Amazon Web Services account (https://docs.aws.amazon.com/) in the
|
||||
// Amazon Elastic Compute Cloud User Guide.
|
||||
// Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -4023,11 +4023,11 @@ func (c *EC2) CopyImageRequest(input *CopyImageInput) (req *request.Request, out
|
|||
// key that you specify in the request using KmsKeyId. Outposts do not support
|
||||
// unencrypted snapshots. For more information, Amazon EBS local snapshots on
|
||||
// Outposts (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#ami)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// For more information about the prerequisites and limits when copying an AMI,
|
||||
// see Copy an AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/CopyingAMIs.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -7553,10 +7553,10 @@ func (c *EC2) CreateRestoreImageTaskRequest(input *CreateRestoreImageTaskInput)
|
|||
//
|
||||
// To use this API, you must have the required permissions. For more information,
|
||||
// see Permissions for storing and restoring AMIs using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// For more information, see Store and restore an AMI using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -8175,10 +8175,10 @@ func (c *EC2) CreateStoreImageTaskRequest(input *CreateStoreImageTaskInput) (req
|
|||
//
|
||||
// To use this API, you must have the required permissions. For more information,
|
||||
// see Permissions for storing and restoring AMIs using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// For more information, see Store and restore an AMI using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -16431,7 +16431,7 @@ func (c *EC2) DeregisterImageRequest(input *DeregisterImageInput) (req *request.
|
|||
// If you deregister an AMI that matches a Recycle Bin retention rule, the AMI
|
||||
// is retained in the Recycle Bin for the specified retention period. For more
|
||||
// information, see Recycle Bin (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// When you deregister an AMI, it doesn't affect any instances that you've already
|
||||
// launched from the AMI. You'll continue to incur usage costs for those instances
|
||||
|
|
@ -21352,6 +21352,12 @@ func (c *EC2) DescribeImagesRequest(input *DescribeImagesInput) (req *request.Re
|
|||
Name: opDescribeImages,
|
||||
HTTPMethod: "POST",
|
||||
HTTPPath: "/",
|
||||
Paginator: &request.Paginator{
|
||||
InputTokens: []string{"NextToken"},
|
||||
OutputTokens: []string{"NextToken"},
|
||||
LimitToken: "MaxResults",
|
||||
TruncationToken: "",
|
||||
},
|
||||
}
|
||||
|
||||
if input == nil {
|
||||
|
|
@ -21405,6 +21411,57 @@ func (c *EC2) DescribeImagesWithContext(ctx aws.Context, input *DescribeImagesIn
|
|||
return out, req.Send()
|
||||
}
|
||||
|
||||
// DescribeImagesPages iterates over the pages of a DescribeImages operation,
|
||||
// calling the "fn" function with the response data for each page. To stop
|
||||
// iterating, return false from the fn function.
|
||||
//
|
||||
// See DescribeImages method for more information on how to use this operation.
|
||||
//
|
||||
// Note: This operation can generate multiple requests to a service.
|
||||
//
|
||||
// // Example iterating over at most 3 pages of a DescribeImages operation.
|
||||
// pageNum := 0
|
||||
// err := client.DescribeImagesPages(params,
|
||||
// func(page *ec2.DescribeImagesOutput, lastPage bool) bool {
|
||||
// pageNum++
|
||||
// fmt.Println(page)
|
||||
// return pageNum <= 3
|
||||
// })
|
||||
func (c *EC2) DescribeImagesPages(input *DescribeImagesInput, fn func(*DescribeImagesOutput, bool) bool) error {
|
||||
return c.DescribeImagesPagesWithContext(aws.BackgroundContext(), input, fn)
|
||||
}
|
||||
|
||||
// DescribeImagesPagesWithContext same as DescribeImagesPages except
|
||||
// it takes a Context and allows setting request options on the pages.
|
||||
//
|
||||
// The context must be non-nil and will be used for request cancellation. If
|
||||
// the context is nil a panic will occur. In the future the SDK may create
|
||||
// sub-contexts for http.Requests. See https://golang.org/pkg/context/
|
||||
// for more information on using Contexts.
|
||||
func (c *EC2) DescribeImagesPagesWithContext(ctx aws.Context, input *DescribeImagesInput, fn func(*DescribeImagesOutput, bool) bool, opts ...request.Option) error {
|
||||
p := request.Pagination{
|
||||
NewRequest: func() (*request.Request, error) {
|
||||
var inCpy *DescribeImagesInput
|
||||
if input != nil {
|
||||
tmp := *input
|
||||
inCpy = &tmp
|
||||
}
|
||||
req, _ := c.DescribeImagesRequest(inCpy)
|
||||
req.SetContext(ctx)
|
||||
req.ApplyOptions(opts...)
|
||||
return req, nil
|
||||
},
|
||||
}
|
||||
|
||||
for p.Next() {
|
||||
if !fn(p.Page().(*DescribeImagesOutput), !p.HasNextPage()) {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return p.Err()
|
||||
}
|
||||
|
||||
const opDescribeImportImageTasks = "DescribeImportImageTasks"
|
||||
|
||||
// DescribeImportImageTasksRequest generates a "aws/request.Request" representing the
|
||||
|
|
@ -28951,10 +29008,10 @@ func (c *EC2) DescribeStoreImageTasksRequest(input *DescribeStoreImageTasksInput
|
|||
//
|
||||
// To use this API, you must have the required permissions. For more information,
|
||||
// see Permissions for storing and restoring AMIs using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// For more information, see Store and restore an AMI using Amazon S3 (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -34638,7 +34695,7 @@ func (c *EC2) DisableImageDeprecationRequest(input *DisableImageDeprecationInput
|
|||
// Cancels the deprecation of the specified AMI.
|
||||
//
|
||||
// For more information, see Deprecate an AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-deprecate.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -36501,7 +36558,7 @@ func (c *EC2) EnableImageDeprecationRequest(input *EnableImageDeprecationInput)
|
|||
// Enables deprecation of the specified AMI at the specified date and time.
|
||||
//
|
||||
// For more information, see Deprecate an AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-deprecate.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -42081,7 +42138,7 @@ func (c *EC2) ListImagesInRecycleBinRequest(input *ListImagesInRecycleBinInput)
|
|||
//
|
||||
// Lists one or more AMIs that are currently in the Recycle Bin. For more information,
|
||||
// see Recycle Bin (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -48256,7 +48313,7 @@ func (c *EC2) RegisterImageRequest(input *RegisterImageInput) (req *request.Requ
|
|||
// Instance will not be applied to the On-Demand Instance. For information about
|
||||
// how to obtain the platform details and billing information of an AMI, see
|
||||
// Understand AMI billing information (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -50554,7 +50611,7 @@ func (c *EC2) RestoreImageFromRecycleBinRequest(input *RestoreImageFromRecycleBi
|
|||
//
|
||||
// Restores an AMI from the Recycle Bin. For more information, see Recycle Bin
|
||||
// (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html) in
|
||||
// the Amazon Elastic Compute Cloud User Guide.
|
||||
// the Amazon EC2 User Guide.
|
||||
//
|
||||
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
|
||||
// with awserr.Error's Code and Message methods to get detailed information about
|
||||
|
|
@ -64416,7 +64473,7 @@ type CopyImageInput struct {
|
|||
//
|
||||
// For more information, see Copy AMIs from an Amazon Web Services Region to
|
||||
// an Outpost (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#copy-amis)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
DestinationOutpostArn *string `type:"string"`
|
||||
|
||||
// Checks whether you have the required permissions for the action, without
|
||||
|
|
@ -64431,7 +64488,7 @@ type CopyImageInput struct {
|
|||
// for Amazon EBS is used unless you specify a non-default Key Management Service
|
||||
// (KMS) KMS key using KmsKeyId. For more information, see Amazon EBS encryption
|
||||
// (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
Encrypted *bool `locationName:"encrypted" type:"boolean"`
|
||||
|
||||
// The identifier of the symmetric Key Management Service (KMS) KMS key to use
|
||||
|
|
@ -90580,7 +90637,7 @@ type DescribeImageAttributeOutput struct {
|
|||
// by default, the instance requires that IMDSv2 is used when requesting instance
|
||||
// metadata. In addition, HttpPutResponseHopLimit is set to 2. For more information,
|
||||
// see Configure the AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-IMDS-new-instances.html#configure-IMDS-new-instances-ami-configuration)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
ImdsSupport *AttributeValue `locationName:"imdsSupport" type:"structure"`
|
||||
|
||||
// The kernel ID.
|
||||
|
|
@ -90614,7 +90671,7 @@ type DescribeImageAttributeOutput struct {
|
|||
// command. You can inspect and modify the UEFI data by using the python-uefivars
|
||||
// tool (https://github.com/awslabs/python-uefivars) on GitHub. For more information,
|
||||
// see UEFI Secure Boot (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/uefi-secure-boot.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
UefiData *AttributeValue `locationName:"uefiData" type:"structure"`
|
||||
}
|
||||
|
||||
|
|
@ -90841,6 +90898,13 @@ type DescribeImagesInput struct {
|
|||
// of what you specify for this parameter.
|
||||
IncludeDeprecated *bool `type:"boolean"`
|
||||
|
||||
// The maximum number of results to return with a single call. To retrieve the
|
||||
// remaining results, make another call with the returned nextToken value.
|
||||
MaxResults *int64 `type:"integer"`
|
||||
|
||||
// The token for the next page of results.
|
||||
NextToken *string `type:"string"`
|
||||
|
||||
// Scopes the results to images with the specified owners. You can specify a
|
||||
// combination of Amazon Web Services account IDs, self, amazon, and aws-marketplace.
|
||||
// If you omit this parameter, the results include all images for which you
|
||||
|
|
@ -90896,6 +90960,18 @@ func (s *DescribeImagesInput) SetIncludeDeprecated(v bool) *DescribeImagesInput
|
|||
return s
|
||||
}
|
||||
|
||||
// SetMaxResults sets the MaxResults field's value.
|
||||
func (s *DescribeImagesInput) SetMaxResults(v int64) *DescribeImagesInput {
|
||||
s.MaxResults = &v
|
||||
return s
|
||||
}
|
||||
|
||||
// SetNextToken sets the NextToken field's value.
|
||||
func (s *DescribeImagesInput) SetNextToken(v string) *DescribeImagesInput {
|
||||
s.NextToken = &v
|
||||
return s
|
||||
}
|
||||
|
||||
// SetOwners sets the Owners field's value.
|
||||
func (s *DescribeImagesInput) SetOwners(v []*string) *DescribeImagesInput {
|
||||
s.Owners = v
|
||||
|
|
@ -90907,6 +90983,10 @@ type DescribeImagesOutput struct {
|
|||
|
||||
// Information about the images.
|
||||
Images []*Image `locationName:"imagesSet" locationNameList:"item" type:"list"`
|
||||
|
||||
// The token to use to retrieve the next page of results. This value is null
|
||||
// when there are no more results to return.
|
||||
NextToken *string `locationName:"nextToken" type:"string"`
|
||||
}
|
||||
|
||||
// String returns the string representation.
|
||||
|
|
@ -90933,6 +91013,12 @@ func (s *DescribeImagesOutput) SetImages(v []*Image) *DescribeImagesOutput {
|
|||
return s
|
||||
}
|
||||
|
||||
// SetNextToken sets the NextToken field's value.
|
||||
func (s *DescribeImagesOutput) SetNextToken(v string) *DescribeImagesOutput {
|
||||
s.NextToken = &v
|
||||
return s
|
||||
}
|
||||
|
||||
type DescribeImportImageTasksInput struct {
|
||||
_ struct{} `type:"structure"`
|
||||
|
||||
|
|
@ -121894,7 +121980,7 @@ type Image struct {
|
|||
BlockDeviceMappings []*BlockDeviceMapping `locationName:"blockDeviceMapping" locationNameList:"item" type:"list"`
|
||||
|
||||
// The boot mode of the image. For more information, see Boot modes (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
BootMode *string `locationName:"bootMode" type:"string" enum:"BootModeValues"`
|
||||
|
||||
// The date and time the image was created.
|
||||
|
|
@ -121932,7 +122018,7 @@ type Image struct {
|
|||
// by default, the instance requires that IMDSv2 is used when requesting instance
|
||||
// metadata. In addition, HttpPutResponseHopLimit is set to 2. For more information,
|
||||
// see Configure the AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-IMDS-new-instances.html#configure-IMDS-new-instances-ami-configuration)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
ImdsSupport *string `locationName:"imdsSupport" type:"string" enum:"ImdsSupportValues"`
|
||||
|
||||
// The kernel associated with the image, if any. Only applicable for machine
|
||||
|
|
@ -121950,7 +122036,7 @@ type Image struct {
|
|||
|
||||
// The platform details associated with the billing code of the AMI. For more
|
||||
// information, see Understand AMI billing information (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
PlatformDetails *string `locationName:"platformDetails" type:"string"`
|
||||
|
||||
// Any product codes associated with the AMI.
|
||||
|
|
@ -121988,7 +122074,7 @@ type Image struct {
|
|||
|
||||
// If the image is configured for NitroTPM support, the value is v2.0. For more
|
||||
// information, see NitroTPM (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
TpmSupport *string `locationName:"tpmSupport" type:"string" enum:"TpmSupportValues"`
|
||||
|
||||
// The operation of the Amazon EC2 instance and the billing code that is associated
|
||||
|
|
@ -150535,8 +150621,15 @@ type RegisterImageInput struct {
|
|||
Architecture *string `locationName:"architecture" type:"string" enum:"ArchitectureValues"`
|
||||
|
||||
// The billing product codes. Your account must be authorized to specify billing
|
||||
// product codes. Otherwise, you can use the Amazon Web Services Marketplace
|
||||
// to bill for the use of an AMI.
|
||||
// product codes.
|
||||
//
|
||||
// If your account is not authorized to specify billing product codes, you can
|
||||
// publish AMIs that include billable software and list them on the Amazon Web
|
||||
// Services Marketplace. You must first register as a seller on the Amazon Web
|
||||
// Services Marketplace. For more information, see Getting started as a seller
|
||||
// (https://docs.aws.amazon.com/marketplace/latest/userguide/user-guide-for-sellers.html)
|
||||
// and AMI-based products (https://docs.aws.amazon.com/marketplace/latest/userguide/ami-products.html)
|
||||
// in the Amazon Web Services Marketplace Seller Guide.
|
||||
BillingProducts []*string `locationName:"BillingProduct" locationNameList:"item" type:"list"`
|
||||
|
||||
// The block device mapping entries.
|
||||
|
|
@ -150548,11 +150641,11 @@ type RegisterImageInput struct {
|
|||
// the same Outpost or in the Region of that Outpost. AMIs on an Outpost that
|
||||
// include local snapshots can be used to launch instances on the same Outpost
|
||||
// only. For more information, Amazon EBS local snapshots on Outposts (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#ami)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
BlockDeviceMappings []*BlockDeviceMapping `locationName:"BlockDeviceMapping" locationNameList:"BlockDeviceMapping" type:"list"`
|
||||
|
||||
// The boot mode of the AMI. For more information, see Boot modes (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-boot.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
BootMode *string `type:"string" enum:"BootModeValues"`
|
||||
|
||||
// A description for your AMI.
|
||||
|
|
@ -150582,7 +150675,7 @@ type RegisterImageInput struct {
|
|||
// by default, the instance requires that IMDSv2 is used when requesting instance
|
||||
// metadata. In addition, HttpPutResponseHopLimit is set to 2. For more information,
|
||||
// see Configure the AMI (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-IMDS-new-instances.html#configure-IMDS-new-instances-ami-configuration)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
//
|
||||
// If you set the value to v2.0, make sure that your AMI software can support
|
||||
// IMDSv2.
|
||||
|
|
@ -150618,7 +150711,7 @@ type RegisterImageInput struct {
|
|||
|
||||
// Set to v2.0 to enable Trusted Platform Module (TPM) support. For more information,
|
||||
// see NitroTPM (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
TpmSupport *string `type:"string" enum:"TpmSupportValues"`
|
||||
|
||||
// Base64 representation of the non-volatile UEFI variable store. To retrieve
|
||||
|
|
@ -150626,7 +150719,7 @@ type RegisterImageInput struct {
|
|||
// command. You can inspect and modify the UEFI data by using the python-uefivars
|
||||
// tool (https://github.com/awslabs/python-uefivars) on GitHub. For more information,
|
||||
// see UEFI Secure Boot (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/uefi-secure-boot.html)
|
||||
// in the Amazon Elastic Compute Cloud User Guide.
|
||||
// in the Amazon EC2 User Guide.
|
||||
UefiData *string `type:"string"`
|
||||
|
||||
// The type of virtualization (hvm | paravirtual).
|
||||
|
|
|
|||
|
|
@ -1146,6 +1146,9 @@ type EC2API interface {
|
|||
DescribeImagesWithContext(aws.Context, *ec2.DescribeImagesInput, ...request.Option) (*ec2.DescribeImagesOutput, error)
|
||||
DescribeImagesRequest(*ec2.DescribeImagesInput) (*request.Request, *ec2.DescribeImagesOutput)
|
||||
|
||||
DescribeImagesPages(*ec2.DescribeImagesInput, func(*ec2.DescribeImagesOutput, bool) bool) error
|
||||
DescribeImagesPagesWithContext(aws.Context, *ec2.DescribeImagesInput, func(*ec2.DescribeImagesOutput, bool) bool, ...request.Option) error
|
||||
|
||||
DescribeImportImageTasks(*ec2.DescribeImportImageTasksInput) (*ec2.DescribeImportImageTasksOutput, error)
|
||||
DescribeImportImageTasksWithContext(aws.Context, *ec2.DescribeImportImageTasksInput, ...request.Option) (*ec2.DescribeImportImageTasksOutput, error)
|
||||
DescribeImportImageTasksRequest(*ec2.DescribeImportImageTasksInput) (*request.Request, *ec2.DescribeImportImageTasksOutput)
|
||||
|
|
|
|||
|
|
@ -50161,13 +50161,15 @@ type PutResourcePolicyInput struct {
|
|||
Policy *string `type:"string" required:"true"`
|
||||
|
||||
// ID of the current policy version. The hash helps to prevent a situation where
|
||||
// multiple users attempt to overwrite a policy.
|
||||
// multiple users attempt to overwrite a policy. You must provide this hash
|
||||
// when updating or deleting a policy.
|
||||
PolicyHash *string `type:"string"`
|
||||
|
||||
// The policy ID.
|
||||
PolicyId *string `type:"string"`
|
||||
|
||||
// Amazon Resource Name (ARN) of the resource to which the policies are attached.
|
||||
// Amazon Resource Name (ARN) of the resource to which you want to attach a
|
||||
// policy.
|
||||
//
|
||||
// ResourceArn is a required field
|
||||
ResourceArn *string `min:"20" type:"string" required:"true"`
|
||||
|
|
@ -50237,9 +50239,7 @@ func (s *PutResourcePolicyInput) SetResourceArn(v string) *PutResourcePolicyInpu
|
|||
type PutResourcePolicyOutput struct {
|
||||
_ struct{} `type:"structure"`
|
||||
|
||||
// ID of the current policy version. The hash helps to prevent a situation where
|
||||
// multiple users attempt to overwrite a policy. You must provide this hash
|
||||
// when updating or deleting a policy.
|
||||
// ID of the current policy version.
|
||||
PolicyHash *string `type:"string"`
|
||||
|
||||
// The policy ID. To update a policy, you must specify PolicyId and PolicyHash.
|
||||
|
|
|
|||
|
|
@ -3,33 +3,32 @@
|
|||
// Package ssm provides the client and types for making API
|
||||
// requests to Amazon Simple Systems Manager (SSM).
|
||||
//
|
||||
// Amazon Web Services Systems Manager is a collection of capabilities to help
|
||||
// you manage your applications and infrastructure running in the Amazon Web
|
||||
// Services Cloud;. Systems Manager simplifies application and resource management,
|
||||
// shortens the time to detect and resolve operational problems, and helps you
|
||||
// manage your Amazon Web Services resources securely at scale.
|
||||
// Amazon Web Services Systems Manager is the operations hub for your Amazon
|
||||
// Web Services applications and resources and a secure end-to-end management
|
||||
// solution for hybrid cloud environments that enables safe and secure operations
|
||||
// at scale.
|
||||
//
|
||||
// This reference is intended to be used with the Amazon Web Services Systems
|
||||
// Manager User Guide (https://docs.aws.amazon.com/systems-manager/latest/userguide/).
|
||||
//
|
||||
// To get started, verify prerequisites. For more information, see Setting up
|
||||
// Amazon Web Services Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-setting-up.html).
|
||||
// To get started, see Setting up Amazon Web Services Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-setting-up.html).
|
||||
//
|
||||
// Related resources
|
||||
//
|
||||
// - For information about how to use a Query API, see Making API requests
|
||||
// (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/making-api-requests.html).
|
||||
// - For information about each of the capabilities that comprise Systems
|
||||
// Manager, see Systems Manager capabilities (https://docs.aws.amazon.com/systems-manager-automation-runbooks/latest/userguide/what-is-systems-manager.html#systems-manager-capabilities)
|
||||
// in the Amazon Web Services Systems Manager User Guide.
|
||||
//
|
||||
// - For information about other API operations you can perform on EC2 instances,
|
||||
// see the Amazon EC2 API Reference (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/).
|
||||
// - For details about predefined runbooks for Automation, a capability of
|
||||
// Amazon Web Services Systems Manager, see the Systems Manager Automation
|
||||
// runbook reference (https://docs.aws.amazon.com/systems-manager-automation-runbooks/latest/userguide/automation-runbook-reference.html) .
|
||||
//
|
||||
// - For information about AppConfig, a capability of Systems Manager, see
|
||||
// the AppConfig User Guide (https://docs.aws.amazon.com/appconfig/latest/userguide/)
|
||||
// and the AppConfig API Reference (https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/).
|
||||
// and the AppConfig API Reference (https://docs.aws.amazon.com/appconfig/2019-10-09/APIReference/) .
|
||||
//
|
||||
// - For information about Incident Manager, a capability of Systems Manager,
|
||||
// see the Incident Manager User Guide (https://docs.aws.amazon.com/incident-manager/latest/userguide/)
|
||||
// and the Incident Manager API Reference (https://docs.aws.amazon.com/incident-manager/latest/APIReference/).
|
||||
// see the Systems Manager Incident Manager User Guide (https://docs.aws.amazon.com/incident-manager/latest/userguide/)
|
||||
// and the Systems Manager Incident Manager API Reference (https://docs.aws.amazon.com/incident-manager/latest/APIReference/) .
|
||||
//
|
||||
// See https://docs.aws.amazon.com/goto/WebAPI/ssm-2014-11-06 for more information on this service.
|
||||
//
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ github.com/aws/amazon-ec2-instance-selector/v2/pkg/instancetypes
|
|||
github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector
|
||||
github.com/aws/amazon-ec2-instance-selector/v2/pkg/selector/outputs
|
||||
github.com/aws/amazon-ec2-instance-selector/v2/pkg/sorter
|
||||
# github.com/aws/aws-sdk-go v1.44.161
|
||||
# github.com/aws/aws-sdk-go v1.44.166
|
||||
## explicit; go 1.11
|
||||
github.com/aws/aws-sdk-go/aws
|
||||
github.com/aws/aws-sdk-go/aws/arn
|
||||
|
|
|
|||
Loading…
Reference in New Issue