From 6ffb91c047b2d1dec2f71546c5d9584c2133bdf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 20:25:20 +0000 Subject: [PATCH] rebase: bump github.com/aws/aws-sdk-go from 1.41.0 to 1.41.5 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.41.0 to 1.41.5. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.41.0...v1.41.5) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 43 ++++ .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/ec2/api.go | 208 ++++++++++++++++-- vendor/modules.txt | 2 +- 6 files changed, 236 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 51db07050..28fbb166b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ceph/ceph-csi go 1.16 require ( - github.com/aws/aws-sdk-go v1.41.0 + github.com/aws/aws-sdk-go v1.41.5 github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 github.com/ceph/go-ceph v0.12.0 github.com/container-storage-interface/spec v1.5.0 diff --git a/go.sum b/go.sum index bb14effe7..894d8d8b1 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.41.0 h1:XUzHLFWQVhmFtmKTodnAo5QdooPQfpVfilCxIV3aLoE= -github.com/aws/aws-sdk-go v1.41.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.41.5 h1:Y41voXM6P/Kq3kxZIk5cV5uOuy8HXfiKTmtXlMCIuIM= +github.com/aws/aws-sdk-go v1.41.5/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index 510f68060..ebd0e4c97 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -55,6 +55,7 @@ const ( // AWS ISO (US) partition's regions. const ( UsIsoEast1RegionID = "us-iso-east-1" // US ISO East. + UsIsoWest1RegionID = "us-iso-west-1" // US ISO WEST. ) // AWS ISOB (US) partition's regions. @@ -10380,6 +10381,12 @@ var awsusgovPartition = partition{ "us-gov-west-1": endpoint{}, }, }, + "kendra": service{ + + Endpoints: endpoints{ + "us-gov-west-1": endpoint{}, + }, + }, "kinesis": service{ Endpoints: endpoints{ @@ -11401,6 +11408,9 @@ var awsisoPartition = partition{ "us-iso-east-1": region{ Description: "US ISO East", }, + "us-iso-west-1": region{ + Description: "US ISO WEST", + }, }, Services: services{ "api.ecr": service{ @@ -11412,6 +11422,12 @@ var awsisoPartition = partition{ Region: "us-iso-east-1", }, }, + "us-iso-west-1": endpoint{ + Hostname: "api.ecr.us-iso-west-1.c2s.ic.gov", + CredentialScope: credentialScope{ + Region: "us-iso-west-1", + }, + }, }, }, "api.sagemaker": service{ @@ -11432,6 +11448,7 @@ var awsisoPartition = partition{ }, Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "autoscaling": service{ @@ -11440,24 +11457,28 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "cloudformation": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "cloudtrail": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "codedeploy": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "comprehend": service{ @@ -11472,6 +11493,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "datapipeline": service{ @@ -11484,6 +11506,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "dms": service{ @@ -11510,24 +11533,28 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "ec2": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "ecs": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "elasticache": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "elasticfilesystem": service{ @@ -11548,6 +11575,7 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "elasticmapreduce": service{ @@ -11556,6 +11584,7 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"https"}, }, + "us-iso-west-1": endpoint{}, }, }, "es": service{ @@ -11568,6 +11597,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "firehose": service{ @@ -11582,6 +11612,7 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "health": service{ @@ -11607,6 +11638,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "kms": service{ @@ -11619,12 +11651,14 @@ var awsisoPartition = partition{ }, }, "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "lambda": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "license-manager": service{ @@ -11637,6 +11671,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "medialive": service{ @@ -11655,6 +11690,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "outposts": service{ @@ -11673,12 +11709,14 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "redshift": service{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "route53": service{ @@ -11735,6 +11773,7 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "sqs": service{ @@ -11743,6 +11782,7 @@ var awsisoPartition = partition{ "us-iso-east-1": endpoint{ Protocols: []string{"http", "https"}, }, + "us-iso-west-1": endpoint{}, }, }, "ssm": service{ @@ -11755,6 +11795,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "streams.dynamodb": service{ @@ -11774,6 +11815,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "support": service{ @@ -11792,6 +11834,7 @@ var awsisoPartition = partition{ Endpoints: endpoints{ "us-iso-east-1": endpoint{}, + "us-iso-west-1": endpoint{}, }, }, "transcribe": service{ diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 4a04d190b..749691366 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.41.0" +const SDKVersion = "1.41.5" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 91b9d92b0..1859dc718 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -56231,16 +56231,18 @@ type CreateFlowLogsInput struct { // or LogGroupName. DeliverLogsPermissionArn *string `type:"string"` + // The destination options. + DestinationOptions *DestinationOptionsRequest `type:"structure"` + // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have // the required permissions, the error response is DryRunOperation. Otherwise, // it is UnauthorizedOperation. DryRun *bool `type:"boolean"` - // Specifies the destination to which the flow log data is to be published. - // Flow log data can be published to a CloudWatch Logs log group or an Amazon - // S3 bucket. The value specified for this parameter depends on the value specified - // for LogDestinationType. + // The destination to which the flow log data is to be published. Flow log data + // can be published to a CloudWatch Logs log group or an Amazon S3 bucket. The + // value specified for this parameter depends on the value specified for LogDestinationType. // // If LogDestinationType is not specified or cloud-watch-logs, specify the Amazon // Resource Name (ARN) of the CloudWatch Logs log group. For example, to publish @@ -56255,10 +56257,10 @@ type CreateFlowLogsInput struct { // a subfolder name. This is a reserved term. LogDestination *string `type:"string"` - // Specifies the type of destination to which the flow log data is to be published. - // Flow log data can be published to CloudWatch Logs or Amazon S3. To publish - // flow log data to CloudWatch Logs, specify cloud-watch-logs. To publish flow - // log data to Amazon S3, specify s3. + // The type of destination to which the flow log data is to be published. Flow + // log data can be published to CloudWatch Logs or Amazon S3. To publish flow + // log data to CloudWatch Logs, specify cloud-watch-logs. To publish flow log + // data to Amazon S3, specify s3. // // If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn // or LogGroupName. @@ -56367,6 +56369,12 @@ func (s *CreateFlowLogsInput) SetDeliverLogsPermissionArn(v string) *CreateFlowL return s } +// SetDestinationOptions sets the DestinationOptions field's value. +func (s *CreateFlowLogsInput) SetDestinationOptions(v *DestinationOptionsRequest) *CreateFlowLogsInput { + s.DestinationOptions = v + return s +} + // SetDryRun sets the DryRun field's value. func (s *CreateFlowLogsInput) SetDryRun(v bool) *CreateFlowLogsInput { s.DryRun = &v @@ -76501,8 +76509,11 @@ type DescribeInstanceTypesInput struct { // * instance-storage-info.disk.type - The storage technology for the local // instance storage disks (hdd | ssd). // + // * instance-storage-info.encryption-supported - Indicates whether data + // is encrypted at rest (required | unsupported). + // // * instance-storage-info.nvme-support - Indicates whether non-volatile - // memory express (NVMe) is supported for instance store (required | supported) + // memory express (NVMe) is supported for instance store (required | supported // | unsupported). // // * instance-storage-info.total-size-in-gb - The total amount of storage @@ -87935,6 +87946,109 @@ func (s *DescribeVpnGatewaysOutput) SetVpnGateways(v []*VpnGateway) *DescribeVpn return s } +// Describes the destination options for a flow log. +type DestinationOptionsRequest struct { + _ struct{} `type:"structure"` + + // The format for the flow log. The default is plain-text. + FileFormat *string `type:"string" enum:"DestinationFileFormat"` + + // Indicates whether to use Hive-compatible prefixes for flow logs stored in + // Amazon S3. The default is false. + HiveCompatiblePartitions *bool `type:"boolean"` + + // Indicates whether to partition the flow log per hour. This reduces the cost + // and response time for queries. The default is false. + PerHourPartition *bool `type:"boolean"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DestinationOptionsRequest) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DestinationOptionsRequest) GoString() string { + return s.String() +} + +// SetFileFormat sets the FileFormat field's value. +func (s *DestinationOptionsRequest) SetFileFormat(v string) *DestinationOptionsRequest { + s.FileFormat = &v + return s +} + +// SetHiveCompatiblePartitions sets the HiveCompatiblePartitions field's value. +func (s *DestinationOptionsRequest) SetHiveCompatiblePartitions(v bool) *DestinationOptionsRequest { + s.HiveCompatiblePartitions = &v + return s +} + +// SetPerHourPartition sets the PerHourPartition field's value. +func (s *DestinationOptionsRequest) SetPerHourPartition(v bool) *DestinationOptionsRequest { + s.PerHourPartition = &v + return s +} + +// Describes the destination options for a flow log. +type DestinationOptionsResponse struct { + _ struct{} `type:"structure"` + + // The format for the flow log. + FileFormat *string `locationName:"fileFormat" type:"string" enum:"DestinationFileFormat"` + + // Indicates whether to use Hive-compatible prefixes for flow logs stored in + // Amazon S3. + HiveCompatiblePartitions *bool `locationName:"hiveCompatiblePartitions" type:"boolean"` + + // Indicates whether to partition the flow log per hour. + PerHourPartition *bool `locationName:"perHourPartition" type:"boolean"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DestinationOptionsResponse) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DestinationOptionsResponse) GoString() string { + return s.String() +} + +// SetFileFormat sets the FileFormat field's value. +func (s *DestinationOptionsResponse) SetFileFormat(v string) *DestinationOptionsResponse { + s.FileFormat = &v + return s +} + +// SetHiveCompatiblePartitions sets the HiveCompatiblePartitions field's value. +func (s *DestinationOptionsResponse) SetHiveCompatiblePartitions(v bool) *DestinationOptionsResponse { + s.HiveCompatiblePartitions = &v + return s +} + +// SetPerHourPartition sets the PerHourPartition field's value. +func (s *DestinationOptionsResponse) SetPerHourPartition(v bool) *DestinationOptionsResponse { + s.PerHourPartition = &v + return s +} + type DetachClassicLinkVpcInput struct { _ struct{} `type:"structure"` @@ -90815,7 +90929,7 @@ func (s *DiskImageVolumeDescription) SetSize(v int64) *DiskImageVolumeDescriptio return s } -// Describes the disk. +// Describes a disk. type DiskInfo struct { _ struct{} `type:"structure"` @@ -95678,22 +95792,25 @@ type FlowLog struct { // The status of the logs delivery (SUCCESS | FAILED). DeliverLogsStatus *string `locationName:"deliverLogsStatus" type:"string"` + // The destination options. + DestinationOptions *DestinationOptionsResponse `locationName:"destinationOptions" type:"structure"` + // The flow log ID. FlowLogId *string `locationName:"flowLogId" type:"string"` // The status of the flow log (ACTIVE). FlowLogStatus *string `locationName:"flowLogStatus" type:"string"` - // Specifies the destination to which the flow log data is published. Flow log - // data can be published to an CloudWatch Logs log group or an Amazon S3 bucket. - // If the flow log publishes to CloudWatch Logs, this element indicates the - // Amazon Resource Name (ARN) of the CloudWatch Logs log group to which the - // data is published. If the flow log publishes to Amazon S3, this element indicates + // The destination to which the flow log data is published. Flow log data can + // be published to an CloudWatch Logs log group or an Amazon S3 bucket. If the + // flow log publishes to CloudWatch Logs, this element indicates the Amazon + // Resource Name (ARN) of the CloudWatch Logs log group to which the data is + // published. If the flow log publishes to Amazon S3, this element indicates // the ARN of the Amazon S3 bucket to which the data is published. LogDestination *string `locationName:"logDestination" type:"string"` - // Specifies the type of destination to which the flow log data is published. - // Flow log data can be published to CloudWatch Logs or Amazon S3. + // The type of destination to which the flow log data is published. Flow log + // data can be published to CloudWatch Logs or Amazon S3. LogDestinationType *string `locationName:"logDestinationType" type:"string" enum:"LogDestinationType"` // The format of the flow log record. @@ -95764,6 +95881,12 @@ func (s *FlowLog) SetDeliverLogsStatus(v string) *FlowLog { return s } +// SetDestinationOptions sets the DestinationOptions field's value. +func (s *FlowLog) SetDestinationOptions(v *DestinationOptionsResponse) *FlowLog { + s.DestinationOptions = v + return s +} + // SetFlowLogId sets the FlowLogId field's value. func (s *FlowLog) SetFlowLogId(v string) *FlowLog { s.FlowLogId = &v @@ -105489,15 +105612,18 @@ func (s *InstanceStatusSummary) SetStatus(v string) *InstanceStatusSummary { return s } -// Describes the disks that are available for the instance type. +// Describes the instance store features that are supported by the instance +// type. type InstanceStorageInfo struct { _ struct{} `type:"structure"` // Describes the disks that are available for the instance type. Disks []*DiskInfo `locationName:"disks" locationNameList:"item" type:"list"` - // Indicates whether non-volatile memory express (NVMe) is supported for instance - // store. + // Indicates whether data is encrypted at rest. + EncryptionSupport *string `locationName:"encryptionSupport" type:"string" enum:"InstanceStorageEncryptionSupport"` + + // Indicates whether non-volatile memory express (NVMe) is supported. NvmeSupport *string `locationName:"nvmeSupport" type:"string" enum:"EphemeralNvmeSupport"` // The total size of the disks, in GB. @@ -105528,6 +105654,12 @@ func (s *InstanceStorageInfo) SetDisks(v []*DiskInfo) *InstanceStorageInfo { return s } +// SetEncryptionSupport sets the EncryptionSupport field's value. +func (s *InstanceStorageInfo) SetEncryptionSupport(v string) *InstanceStorageInfo { + s.EncryptionSupport = &v + return s +} + // SetNvmeSupport sets the NvmeSupport field's value. func (s *InstanceStorageInfo) SetNvmeSupport(v string) *InstanceStorageInfo { s.NvmeSupport = &v @@ -143185,6 +143317,9 @@ const ( // ArchitectureTypeArm64 is a ArchitectureType enum value ArchitectureTypeArm64 = "arm64" + + // ArchitectureTypeX8664Mac is a ArchitectureType enum value + ArchitectureTypeX8664Mac = "x86_64_mac" ) // ArchitectureType_Values returns all elements of the ArchitectureType enum @@ -143193,6 +143328,7 @@ func ArchitectureType_Values() []string { ArchitectureTypeI386, ArchitectureTypeX8664, ArchitectureTypeArm64, + ArchitectureTypeX8664Mac, } } @@ -144128,6 +144264,22 @@ func DeleteQueuedReservedInstancesErrorCode_Values() []string { } } +const ( + // DestinationFileFormatPlainText is a DestinationFileFormat enum value + DestinationFileFormatPlainText = "plain-text" + + // DestinationFileFormatParquet is a DestinationFileFormat enum value + DestinationFileFormatParquet = "parquet" +) + +// DestinationFileFormat_Values returns all elements of the DestinationFileFormat enum +func DestinationFileFormat_Values() []string { + return []string{ + DestinationFileFormatPlainText, + DestinationFileFormatParquet, + } +} + const ( // DeviceTypeEbs is a DeviceType enum value DeviceTypeEbs = "ebs" @@ -145228,6 +145380,22 @@ func InstanceStateName_Values() []string { } } +const ( + // InstanceStorageEncryptionSupportUnsupported is a InstanceStorageEncryptionSupport enum value + InstanceStorageEncryptionSupportUnsupported = "unsupported" + + // InstanceStorageEncryptionSupportRequired is a InstanceStorageEncryptionSupport enum value + InstanceStorageEncryptionSupportRequired = "required" +) + +// InstanceStorageEncryptionSupport_Values returns all elements of the InstanceStorageEncryptionSupport enum +func InstanceStorageEncryptionSupport_Values() []string { + return []string{ + InstanceStorageEncryptionSupportUnsupported, + InstanceStorageEncryptionSupportRequired, + } +} + const ( // InstanceTypeT1Micro is a InstanceType enum value InstanceTypeT1Micro = "t1.micro" diff --git a/vendor/modules.txt b/vendor/modules.txt index 55acbad83..80a7afb3a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/aws/aws-sdk-go v1.41.0 +# github.com/aws/aws-sdk-go v1.41.5 ## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr