diff --git a/go.mod b/go.mod index 3b501e4ec1..aac54fbf1e 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( require ( github.com/armon/go-metrics v0.3.10 // indirect - github.com/aws/aws-sdk-go v1.43.41 + github.com/aws/aws-sdk-go v1.43.45 github.com/benbjohnson/clock v1.3.0 // indirect github.com/fatih/color v1.13.0 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect @@ -53,7 +53,6 @@ require ( github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/valyala/fastjson v1.6.3 // indirect go.uber.org/zap v1.20.0 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect golang.org/x/tools v0.1.9 // indirect google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect diff --git a/go.sum b/go.sum index f28dea5a21..abc524cdd0 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.43.41 h1:HaazVplP8/t6SOfybQlNUmjAxLWDKdLdX8BSEHFlJdY= -github.com/aws/aws-sdk-go v1.43.41/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.43.45 h1:2708Bj4uV+ym62MOtBnErm/CDX61C4mFe9V2gXy1caE= +github.com/aws/aws-sdk-go v1.43.45/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= 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 21fb2c1915..8e41aa0ea4 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 @@ -5673,6 +5673,9 @@ var awsPartition = partition{ endpointKey{ Region: "ap-southeast-2", }: endpoint{}, + endpointKey{ + Region: "ap-southeast-3", + }: endpoint{}, endpointKey{ Region: "ca-central-1", }: endpoint{}, @@ -11227,6 +11230,28 @@ var awsPartition = partition{ }: endpoint{}, }, }, + "iottwinmaker": service{ + Endpoints: serviceEndpoints{ + endpointKey{ + Region: "ap-southeast-1", + }: endpoint{}, + endpointKey{ + Region: "ap-southeast-2", + }: endpoint{}, + endpointKey{ + Region: "eu-central-1", + }: endpoint{}, + endpointKey{ + Region: "eu-west-1", + }: endpoint{}, + endpointKey{ + Region: "us-east-1", + }: endpoint{}, + endpointKey{ + Region: "us-west-2", + }: endpoint{}, + }, + }, "iotwireless": service{ Endpoints: serviceEndpoints{ endpointKey{ @@ -15370,6 +15395,12 @@ var awsPartition = partition{ endpointKey{ Region: "ca-central-1", }: endpoint{}, + endpointKey{ + Region: "ca-central-1", + Variant: fipsVariant, + }: endpoint{ + Hostname: "qldb-fips.ca-central-1.amazonaws.com", + }, endpointKey{ Region: "eu-central-1", }: endpoint{}, @@ -15379,6 +15410,15 @@ var awsPartition = partition{ endpointKey{ Region: "eu-west-2", }: endpoint{}, + endpointKey{ + Region: "fips-ca-central-1", + }: endpoint{ + Hostname: "qldb-fips.ca-central-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ca-central-1", + }, + Deprecated: boxedTrue, + }, endpointKey{ Region: "fips-us-east-1", }: endpoint{ 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 88cfe6f5b3..49893b3941 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.43.41" +const SDKVersion = "1.43.45" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go b/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go index be7a9bfed4..6f0a193555 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ssm/api.go @@ -59,13 +59,13 @@ func (c *SSM) AddTagsToResourceRequest(input *AddTagsToResourceInput) (req *requ // AddTagsToResource API operation for Amazon Simple Systems Manager (SSM). // // Adds or overwrites one or more tags for the specified resource. Tags are -// metadata that you can assign to your documents, managed nodes, maintenance -// windows, Parameter Store parameters, and patch baselines. Tags enable you -// to categorize your resources in different ways, for example, by purpose, -// owner, or environment. Each tag consists of a key and an optional value, -// both of which you define. For example, you could define a set of tags for -// your account's managed nodes that helps you track each node's owner and stack -// level. For example: +// metadata that you can assign to your automations, documents, managed nodes, +// maintenance windows, Parameter Store parameters, and patch baselines. Tags +// enable you to categorize your resources in different ways, for example, by +// purpose, owner, or environment. Each tag consists of a key and an optional +// value, both of which you define. For example, you could define a set of tags +// for your account's managed nodes that helps you track each node's owner and +// stack level. For example: // // * Key=Owner,Value=DbAdmin // @@ -79,7 +79,8 @@ func (c *SSM) AddTagsToResourceRequest(input *AddTagsToResourceInput) (req *requ // // * Key=Stack,Value=Test // -// Each resource can have a maximum of 50 tags. +// Most resources can have a maximum of 50 tags. Automations can have a maximum +// of 5 tags. // // We recommend that you devise a set of tag keys that meets your needs for // each resource type. Using a consistent set of tag keys makes it easier for @@ -15773,6 +15774,8 @@ type AddTagsToResourceInput struct { // // PatchBaseline: pb-012345abcde // + // Automation: example-c160-4567-8519-012345abcde + // // OpsMetadata object: ResourceID for tagging is created from the Amazon Resource // Name (ARN) for the object. Specifically, ResourceID is created from the strings // that come after the word opsmetadata in the ARN. For example, an OpsMetadata @@ -16195,6 +16198,9 @@ type Association struct { // schedule runs in Coordinated Universal Time (UTC). ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The managed nodes targeted by the request to create an association. You can // target all managed nodes in an Amazon Web Services account by specifying // the InstanceIds key with a value of *. @@ -16273,6 +16279,12 @@ func (s *Association) SetScheduleExpression(v string) *Association { return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *Association) SetScheduleOffset(v int64) *Association { + s.ScheduleOffset = &v + return s +} + // SetTargets sets the Targets field's value. func (s *Association) SetTargets(v []*Target) *Association { s.Targets = v @@ -16440,6 +16452,9 @@ type AssociationDescription struct { // A cron expression that specifies a schedule when the association runs. ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The association status. Status *AssociationStatus `type:"structure"` @@ -16603,6 +16618,12 @@ func (s *AssociationDescription) SetScheduleExpression(v string) *AssociationDes return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *AssociationDescription) SetScheduleOffset(v int64) *AssociationDescription { + s.ScheduleOffset = &v + return s +} + // SetStatus sets the Status field's value. func (s *AssociationDescription) SetStatus(v *AssociationStatus) *AssociationDescription { s.Status = v @@ -17446,6 +17467,9 @@ type AssociationVersionInfo struct { // version was created. ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. // In AUTO mode, the system uses the status of the association execution to // determine the compliance status. If the association execution runs successfully, @@ -17572,6 +17596,12 @@ func (s *AssociationVersionInfo) SetScheduleExpression(v string) *AssociationVer return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *AssociationVersionInfo) SetScheduleOffset(v int64) *AssociationVersionInfo { + s.ScheduleOffset = &v + return s +} + // SetSyncCompliance sets the SyncCompliance field's value. func (s *AssociationVersionInfo) SetSyncCompliance(v string) *AssociationVersionInfo { s.SyncCompliance = &v @@ -21005,6 +21035,9 @@ type CreateAssociationBatchRequestEntry struct { // A cron expression that specifies a schedule when the association runs. ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. // In AUTO mode, the system uses the status of the association execution to // determine the compliance status. If the association execution runs successfully, @@ -21063,6 +21096,9 @@ func (s *CreateAssociationBatchRequestEntry) Validate() error { if s.ScheduleExpression != nil && len(*s.ScheduleExpression) < 1 { invalidParams.Add(request.NewErrParamMinLen("ScheduleExpression", 1)) } + if s.ScheduleOffset != nil && *s.ScheduleOffset < 1 { + invalidParams.Add(request.NewErrParamMinValue("ScheduleOffset", 1)) + } if s.TargetLocations != nil && len(s.TargetLocations) < 1 { invalidParams.Add(request.NewErrParamMinLen("TargetLocations", 1)) } @@ -21176,6 +21212,12 @@ func (s *CreateAssociationBatchRequestEntry) SetScheduleExpression(v string) *Cr return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *CreateAssociationBatchRequestEntry) SetScheduleOffset(v int64) *CreateAssociationBatchRequestEntry { + s.ScheduleOffset = &v + return s +} + // SetSyncCompliance sets the SyncCompliance field's value. func (s *CreateAssociationBatchRequestEntry) SetSyncCompliance(v string) *CreateAssociationBatchRequestEntry { s.SyncCompliance = &v @@ -21306,6 +21348,18 @@ type CreateAssociationInput struct { // A cron expression when the association will be applied to the target(s). ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. For + // example, if you specified a cron schedule of cron(0 0 ? * THU#2 *), you could + // specify an offset of 3 to run the association each Sunday after the second + // Thursday of the month. For more information about cron schedules for associations, + // see Reference: Cron and rate expressions for Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/reference-cron-and-rate-expressions.html) + // in the Amazon Web Services Systems Manager User Guide. + // + // To use offsets, you must specify the ApplyOnlyAtCronInterval parameter. This + // option tells the system not to run an association immediately after you create + // it. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. // In AUTO mode, the system uses the status of the association execution to // determine the compliance status. If the association execution runs successfully, @@ -21371,6 +21425,9 @@ func (s *CreateAssociationInput) Validate() error { if s.ScheduleExpression != nil && len(*s.ScheduleExpression) < 1 { invalidParams.Add(request.NewErrParamMinLen("ScheduleExpression", 1)) } + if s.ScheduleOffset != nil && *s.ScheduleOffset < 1 { + invalidParams.Add(request.NewErrParamMinValue("ScheduleOffset", 1)) + } if s.TargetLocations != nil && len(s.TargetLocations) < 1 { invalidParams.Add(request.NewErrParamMinLen("TargetLocations", 1)) } @@ -21484,6 +21541,12 @@ func (s *CreateAssociationInput) SetScheduleExpression(v string) *CreateAssociat return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *CreateAssociationInput) SetScheduleOffset(v int64) *CreateAssociationInput { + s.ScheduleOffset = &v + return s +} + // SetSyncCompliance sets the SyncCompliance field's value. func (s *CreateAssociationInput) SetSyncCompliance(v string) *CreateAssociationInput { s.SyncCompliance = &v @@ -49662,6 +49725,8 @@ type RemoveTagsFromResourceInput struct { // // MaintenanceWindow: mw-012345abcde // + // Automation: example-c160-4567-8519-012345abcde + // // PatchBaseline: pb-012345abcde // // OpsMetadata object: ResourceID for tagging is created from the Amazon Resource @@ -52677,7 +52742,7 @@ type StartAutomationExecutionInput struct { // // * Key=OS,Value=Windows // - // To add tags to an existing patch baseline, use the AddTagsToResource operation. + // To add tags to an existing automation, use the AddTagsToResource operation. Tags []*Tag `type:"list"` // A location is a combination of Amazon Web Services Regions and/or Amazon @@ -55167,6 +55232,18 @@ type UpdateAssociationInput struct { // The cron expression used to schedule the association that you want to update. ScheduleExpression *string `min:"1" type:"string"` + // Number of days to wait after the scheduled day to run an association. For + // example, if you specified a cron schedule of cron(0 0 ? * THU#2 *), you could + // specify an offset of 3 to run the association each Sunday after the second + // Thursday of the month. For more information about cron schedules for associations, + // see Reference: Cron and rate expressions for Systems Manager (https://docs.aws.amazon.com/systems-manager/latest/userguide/reference-cron-and-rate-expressions.html) + // in the Amazon Web Services Systems Manager User Guide. + // + // To use offsets, you must specify the ApplyOnlyAtCronInterval parameter. This + // option tells the system not to run an association immediately after you create + // it. + ScheduleOffset *int64 `min:"1" type:"integer"` + // The mode for generating association compliance. You can specify AUTO or MANUAL. // In AUTO mode, the system uses the status of the association execution to // determine the compliance status. If the association execution runs successfully, @@ -55226,6 +55303,9 @@ func (s *UpdateAssociationInput) Validate() error { if s.ScheduleExpression != nil && len(*s.ScheduleExpression) < 1 { invalidParams.Add(request.NewErrParamMinLen("ScheduleExpression", 1)) } + if s.ScheduleOffset != nil && *s.ScheduleOffset < 1 { + invalidParams.Add(request.NewErrParamMinValue("ScheduleOffset", 1)) + } if s.TargetLocations != nil && len(s.TargetLocations) < 1 { invalidParams.Add(request.NewErrParamMinLen("TargetLocations", 1)) } @@ -55345,6 +55425,12 @@ func (s *UpdateAssociationInput) SetScheduleExpression(v string) *UpdateAssociat return s } +// SetScheduleOffset sets the ScheduleOffset field's value. +func (s *UpdateAssociationInput) SetScheduleOffset(v int64) *UpdateAssociationInput { + s.ScheduleOffset = &v + return s +} + // SetSyncCompliance sets the SyncCompliance field's value. func (s *UpdateAssociationInput) SetSyncCompliance(v string) *UpdateAssociationInput { s.SyncCompliance = &v diff --git a/vendor/modules.txt b/vendor/modules.txt index 43b8a0adb7..08d6fd8353 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3,7 +3,7 @@ github.com/armon/go-metrics # github.com/armon/go-radix v1.0.0 github.com/armon/go-radix -# github.com/aws/aws-sdk-go v1.43.41 +# github.com/aws/aws-sdk-go v1.43.45 ## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr @@ -626,7 +626,6 @@ golang.org/x/net/ipv6 golang.org/x/net/route golang.org/x/net/trace # golang.org/x/sync v0.0.0-20210220032951-036812b2e83c -## explicit golang.org/x/sync/errgroup # golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 ## explicit