From 4b00124c6951bb3f731e8c36a3a160cdc3654d33 Mon Sep 17 00:00:00 2001 From: "cilium-renovate[bot]" <134692979+cilium-renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:21:30 +0000 Subject: [PATCH] fix(deps): update module github.com/aws/aws-sdk-go-v2/service/ec2 to v1.164.0 Signed-off-by: cilium-renovate[bot] <134692979+cilium-renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 +- .../aws-sdk-go-v2/service/ec2/CHANGELOG.md | 4 + .../ec2/api_op_CreateTrafficMirrorFilter.go | 4 +- .../api_op_CreateTrafficMirrorFilterRule.go | 7 +- .../ec2/api_op_CreateTrafficMirrorSession.go | 8 +- .../ec2/api_op_CreateTrafficMirrorTarget.go | 4 +- ...api_op_DescribeTrafficMirrorFilterRules.go | 181 ++++++++++++++ .../api_op_ModifyTrafficMirrorFilterRule.go | 4 +- .../service/ec2/deserializers.go | 220 ++++++++++++++++++ .../aws-sdk-go-v2/service/ec2/generated.json | 1 + .../service/ec2/go_module_metadata.go | 2 +- .../aws-sdk-go-v2/service/ec2/serializers.go | 125 ++++++++++ .../aws-sdk-go-v2/service/ec2/types/enums.go | 2 + .../aws-sdk-go-v2/service/ec2/types/types.go | 3 + vendor/modules.txt | 2 +- 16 files changed, 557 insertions(+), 16 deletions(-) create mode 100644 vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeTrafficMirrorFilterRules.go diff --git a/go.mod b/go.mod index 2552f3d517974..65be454934291 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.27.2 github.com/aws/aws-sdk-go-v2/config v1.27.18 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.5 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.0 github.com/aws/smithy-go v1.20.2 github.com/blang/semver/v4 v4.0.0 github.com/bombsimon/logrusr/v4 v4.1.0 diff --git a/go.sum b/go.sum index 063ecd2574795..90adb5f44df78 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9 h1:A4SYk07ef04+vxZToz9 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.9/go.mod h1:5jJcHuwDagxN+ErjQ3PU3ocf6Ylc/p9x+BLO/+X4iXw= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.1 h1:0RiDkJO1veM6/FQ+GJcGiIhZgPwXlscX29B0zFE4Ulo= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.1/go.mod h1:gYk1NtyvkH1SxPcndDtfro3lwbiE5t0tW4eRki5YnOQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.0 h1:kN8Jd9H1LD/zlZEaoLpHJjsaKQjzYA1TgzlCB12BCw8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.0/go.mod h1:gYk1NtyvkH1SxPcndDtfro3lwbiE5t0tW4eRki5YnOQ= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.11 h1:o4T+fKxA3gTMcluBNZZXE9DNaMkJuUL1O3mffCUjoJo= diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md index 311f199660629..0c92a91727402 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.164.0 (2024-06-12) + +* **Feature**: Tagging support for Traffic Mirroring FilterRule resource + # v1.163.1 (2024-06-07) * **Bug Fix**: Add clock skew correction on all service clients diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilter.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilter.go index b0cb6ec64a82d..03f45b2a4643f 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilter.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilter.go @@ -41,7 +41,7 @@ type CreateTrafficMirrorFilterInput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // The description of the Traffic Mirror filter. @@ -64,7 +64,7 @@ type CreateTrafficMirrorFilterOutput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // Information about the Traffic Mirror filter. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilterRule.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilterRule.go index adeb8c70d9a76..91be61415e9c3 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilterRule.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorFilterRule.go @@ -68,7 +68,7 @@ type CreateTrafficMirrorFilterRuleInput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // The description of the Traffic Mirror rule. @@ -94,6 +94,9 @@ type CreateTrafficMirrorFilterRuleInput struct { // The source port range. SourcePortRange *types.TrafficMirrorPortRangeRequest + // Traffic Mirroring tags specifications. + TagSpecifications []types.TagSpecification + noSmithyDocumentSerde } @@ -102,7 +105,7 @@ type CreateTrafficMirrorFilterRuleOutput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // The Traffic Mirror rule. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorSession.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorSession.go index 5b212736a5ab6..6fdb365c54d2b 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorSession.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorSession.go @@ -69,7 +69,7 @@ type CreateTrafficMirrorSessionInput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // The description of the Traffic Mirror session. @@ -100,9 +100,9 @@ type CreateTrafficMirrorSessionInput struct { // The VXLAN ID for the Traffic Mirror session. For more information about the // VXLAN protocol, see [RFC 7348]. If you do not specify a VirtualNetworkId , an account-wide - // unique id is chosen at random. + // unique ID is chosen at random. // - // [RFC 7348]: https://tools.ietf.org/html/rfc7348 + // [RFC 7348]: https://datatracker.ietf.org/doc/html/rfc7348 VirtualNetworkId *int32 noSmithyDocumentSerde @@ -113,7 +113,7 @@ type CreateTrafficMirrorSessionOutput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // Information about the Traffic Mirror session. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorTarget.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorTarget.go index 4d0788c5e9331..9cbadc928a906 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorTarget.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateTrafficMirrorTarget.go @@ -44,7 +44,7 @@ type CreateTrafficMirrorTargetInput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // The description of the Traffic Mirror target. @@ -77,7 +77,7 @@ type CreateTrafficMirrorTargetOutput struct { // Unique, case-sensitive identifier that you provide to ensure the idempotency of // the request. For more information, see [How to ensure idempotency]. // - // [How to ensure idempotency]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html + // [How to ensure idempotency]: https://docs.aws.amazon.com/ec2/latest/devguide/ec2-api-idempotency.html ClientToken *string // Information about the Traffic Mirror target. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeTrafficMirrorFilterRules.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeTrafficMirrorFilterRules.go new file mode 100644 index 0000000000000..dd9dee2ea08ee --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeTrafficMirrorFilterRules.go @@ -0,0 +1,181 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package ec2 + +import ( + "context" + "fmt" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Describe traffic mirror filters that determine the traffic that is mirrored. +func (c *Client) DescribeTrafficMirrorFilterRules(ctx context.Context, params *DescribeTrafficMirrorFilterRulesInput, optFns ...func(*Options)) (*DescribeTrafficMirrorFilterRulesOutput, error) { + if params == nil { + params = &DescribeTrafficMirrorFilterRulesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "DescribeTrafficMirrorFilterRules", params, optFns, c.addOperationDescribeTrafficMirrorFilterRulesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*DescribeTrafficMirrorFilterRulesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type DescribeTrafficMirrorFilterRulesInput struct { + + // 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 + + // Traffic mirror filters. + // + // - traffic-mirror-filter-rule-id : The ID of the Traffic Mirror rule. + // + // - traffic-mirror-filter-id : The ID of the filter that this rule is associated + // with. + // + // - rule-number : The number of the Traffic Mirror rule. + // + // - rule-action : The action taken on the filtered traffic. Possible actions are + // accept and reject . + // + // - traffic-direction : The traffic direction. Possible directions are ingress + // and egress . + // + // - protocol : The protocol, for example UDP, assigned to the Traffic Mirror + // rule. + // + // - source-cidr-block : The source CIDR block assigned to the Traffic Mirror + // rule. + // + // - destination-cidr-block : The destination CIDR block assigned to the Traffic + // Mirror rule. + // + // - description : The description of the Traffic Mirror rule. + Filters []types.Filter + + // 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 *int32 + + // The token for the next page of results. + NextToken *string + + // Traffic filter ID. + TrafficMirrorFilterId *string + + // Traffic filter rule IDs. + TrafficMirrorFilterRuleIds []string + + noSmithyDocumentSerde +} + +type DescribeTrafficMirrorFilterRulesOutput struct { + + // The token to use to retrieve the next page of results. The value is null when + // there are no more results to return. + NextToken *string + + // Traffic mirror rules. + TrafficMirrorFilterRules []types.TrafficMirrorFilterRule + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationDescribeTrafficMirrorFilterRulesMiddlewares(stack *middleware.Stack, options Options) (err error) { + if err := stack.Serialize.Add(&setOperationInputMiddleware{}, middleware.After); err != nil { + return err + } + err = stack.Serialize.Add(&awsEc2query_serializeOpDescribeTrafficMirrorFilterRules{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsEc2query_deserializeOpDescribeTrafficMirrorFilterRules{}, middleware.After) + if err != nil { + return err + } + if err := addProtocolFinalizerMiddlewares(stack, options, "DescribeTrafficMirrorFilterRules"); err != nil { + return fmt.Errorf("add protocol finalizers: %v", err) + } + + if err = addlegacyEndpointContextSetter(stack, options); err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = addClientRequestID(stack); err != nil { + return err + } + if err = addComputeContentLength(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = addComputePayloadSHA256(stack); err != nil { + return err + } + if err = addRetry(stack, options); err != nil { + return err + } + if err = addRawResponseToMetadata(stack); err != nil { + return err + } + if err = addRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack, options); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addSetLegacyContextSigningOptionsMiddleware(stack); err != nil { + return err + } + if err = addTimeOffsetBuild(stack, c); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opDescribeTrafficMirrorFilterRules(options.Region), middleware.Before); err != nil { + return err + } + if err = addRecursionDetection(stack); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + if err = addDisableHTTPSMiddleware(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opDescribeTrafficMirrorFilterRules(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + OperationName: "DescribeTrafficMirrorFilterRules", + } +} diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go index 6d1c81ff8e180..c191ce22fccf2 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ModifyTrafficMirrorFilterRule.go @@ -83,7 +83,9 @@ type ModifyTrafficMirrorFilterRuleInput struct { type ModifyTrafficMirrorFilterRuleOutput struct { - // Modifies a Traffic Mirror rule. + // Tags are not returned for ModifyTrafficMirrorFilterRule. + // + // A Traffic Mirror rule. TrafficMirrorFilterRule *types.TrafficMirrorFilterRule // Metadata pertaining to the operation's result. diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/deserializers.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/deserializers.go index 490828ae00237..07f1e7f421e4f 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/deserializers.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/deserializers.go @@ -29715,6 +29715,97 @@ func awsEc2query_deserializeOpErrorDescribeTags(response *smithyhttp.Response, m } } +type awsEc2query_deserializeOpDescribeTrafficMirrorFilterRules struct { +} + +func (*awsEc2query_deserializeOpDescribeTrafficMirrorFilterRules) ID() string { + return "OperationDeserializer" +} + +func (m *awsEc2query_deserializeOpDescribeTrafficMirrorFilterRules) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsEc2query_deserializeOpErrorDescribeTrafficMirrorFilterRules(response, &metadata) + } + output := &DescribeTrafficMirrorFilterRulesOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + body := io.TeeReader(response.Body, ringBuffer) + rootDecoder := xml.NewDecoder(body) + t, err := smithyxml.FetchRootElement(rootDecoder) + if err == io.EOF { + return out, metadata, nil + } + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + return out, metadata, &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + } + + decoder := smithyxml.WrapNodeDecoder(rootDecoder, t) + err = awsEc2query_deserializeOpDocumentDescribeTrafficMirrorFilterRulesOutput(&output, decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsEc2query_deserializeOpErrorDescribeTrafficMirrorFilterRules(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + errorComponents, err := ec2query.GetErrorResponseComponents(errorBody) + if err != nil { + return err + } + awsmiddleware.SetRequestIDMetadata(metadata, errorComponents.RequestID) + if len(errorComponents.Code) != 0 { + errorCode = errorComponents.Code + } + if len(errorComponents.Message) != 0 { + errorMessage = errorComponents.Message + } + errorBody.Seek(0, io.SeekStart) + switch { + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsEc2query_deserializeOpDescribeTrafficMirrorFilters struct { } @@ -125209,6 +125300,12 @@ func awsEc2query_deserializeDocumentTrafficMirrorFilterRule(v **types.TrafficMir return err } + case strings.EqualFold("tagSet", t.Name.Local): + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + if err := awsEc2query_deserializeDocumentTagList(&sv.Tags, nodeDecoder); err != nil { + return err + } + case strings.EqualFold("trafficDirection", t.Name.Local): val, err := decoder.Value() if err != nil { @@ -125330,6 +125427,74 @@ func awsEc2query_deserializeDocumentTrafficMirrorFilterRuleListUnwrapped(v *[]ty *v = sv return nil } +func awsEc2query_deserializeDocumentTrafficMirrorFilterRuleSet(v *[]types.TrafficMirrorFilterRule, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv []types.TrafficMirrorFilterRule + if *v == nil { + sv = make([]types.TrafficMirrorFilterRule, 0) + } else { + sv = *v + } + + originalDecoder := decoder + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + switch { + case strings.EqualFold("item", t.Name.Local): + var col types.TrafficMirrorFilterRule + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + destAddr := &col + if err := awsEc2query_deserializeDocumentTrafficMirrorFilterRule(&destAddr, nodeDecoder); err != nil { + return err + } + col = *destAddr + sv = append(sv, col) + + default: + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + +func awsEc2query_deserializeDocumentTrafficMirrorFilterRuleSetUnwrapped(v *[]types.TrafficMirrorFilterRule, decoder smithyxml.NodeDecoder) error { + var sv []types.TrafficMirrorFilterRule + if *v == nil { + sv = make([]types.TrafficMirrorFilterRule, 0) + } else { + sv = *v + } + + switch { + default: + var mv types.TrafficMirrorFilterRule + t := decoder.StartEl + _ = t + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + destAddr := &mv + if err := awsEc2query_deserializeDocumentTrafficMirrorFilterRule(&destAddr, nodeDecoder); err != nil { + return err + } + mv = *destAddr + sv = append(sv, mv) + } + *v = sv + return nil +} func awsEc2query_deserializeDocumentTrafficMirrorFilterSet(v *[]types.TrafficMirrorFilter, decoder smithyxml.NodeDecoder) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -156002,6 +156167,61 @@ func awsEc2query_deserializeOpDocumentDescribeTagsOutput(v **DescribeTagsOutput, return nil } +func awsEc2query_deserializeOpDocumentDescribeTrafficMirrorFilterRulesOutput(v **DescribeTrafficMirrorFilterRulesOutput, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv *DescribeTrafficMirrorFilterRulesOutput + if *v == nil { + sv = &DescribeTrafficMirrorFilterRulesOutput{} + } else { + sv = *v + } + + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + originalDecoder := decoder + decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t) + switch { + case strings.EqualFold("nextToken", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.NextToken = ptr.String(xtv) + } + + case strings.EqualFold("trafficMirrorFilterRuleSet", t.Name.Local): + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + if err := awsEc2query_deserializeDocumentTrafficMirrorFilterRuleSet(&sv.TrafficMirrorFilterRules, nodeDecoder); err != nil { + return err + } + + default: + // Do nothing and ignore the unexpected tag element + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + func awsEc2query_deserializeOpDocumentDescribeTrafficMirrorFiltersOutput(v **DescribeTrafficMirrorFiltersOutput, decoder smithyxml.NodeDecoder) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/generated.json b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/generated.json index a82c0ca18cc55..2b480a17d339c 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/generated.json +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/generated.json @@ -345,6 +345,7 @@ "api_op_DescribeStoreImageTasks.go", "api_op_DescribeSubnets.go", "api_op_DescribeTags.go", + "api_op_DescribeTrafficMirrorFilterRules.go", "api_op_DescribeTrafficMirrorFilters.go", "api_op_DescribeTrafficMirrorSessions.go", "api_op_DescribeTrafficMirrorTargets.go", diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go index 4771b627e18e5..1e40c04b8b9db 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go @@ -3,4 +3,4 @@ package ec2 // goModuleVersion is the tagged release for this module -const goModuleVersion = "1.163.1" +const goModuleVersion = "1.164.0" diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/serializers.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/serializers.go index 845e8879ee8dd..113204f480029 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/serializers.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/serializers.go @@ -21329,6 +21329,70 @@ func (m *awsEc2query_serializeOpDescribeTags) HandleSerialize(ctx context.Contex return next.HandleSerialize(ctx, in) } +type awsEc2query_serializeOpDescribeTrafficMirrorFilterRules struct { +} + +func (*awsEc2query_serializeOpDescribeTrafficMirrorFilterRules) ID() string { + return "OperationSerializer" +} + +func (m *awsEc2query_serializeOpDescribeTrafficMirrorFilterRules) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*DescribeTrafficMirrorFilterRulesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + operationPath := "/" + if len(request.Request.URL.Path) == 0 { + request.Request.URL.Path = operationPath + } else { + request.Request.URL.Path = path.Join(request.Request.URL.Path, operationPath) + if request.Request.URL.Path != "/" && operationPath[len(operationPath)-1] == '/' { + request.Request.URL.Path += "/" + } + } + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-www-form-urlencoded") + + bodyWriter := bytes.NewBuffer(nil) + bodyEncoder := query.NewEncoder(bodyWriter) + body := bodyEncoder.Object() + body.Key("Action").String("DescribeTrafficMirrorFilterRules") + body.Key("Version").String("2016-11-15") + + if err := awsEc2query_serializeOpDocumentDescribeTrafficMirrorFilterRulesInput(input, bodyEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + err = bodyEncoder.Encode() + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(bodyWriter.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsEc2query_serializeOpDescribeTrafficMirrorFilters struct { } @@ -48596,6 +48660,19 @@ func awsEc2query_serializeDocumentTrafficMirrorFilterRuleFieldList(v []types.Tra return nil } +func awsEc2query_serializeDocumentTrafficMirrorFilterRuleIdList(v []string, value query.Value) error { + if len(v) == 0 { + return nil + } + array := value.Array("Item") + + for i := range v { + av := array.Value() + av.String(v[i]) + } + return nil +} + func awsEc2query_serializeDocumentTrafficMirrorNetworkServiceList(v []types.TrafficMirrorNetworkService, value query.Value) error { if len(v) == 0 { return nil @@ -53766,6 +53843,13 @@ func awsEc2query_serializeOpDocumentCreateTrafficMirrorFilterRuleInput(v *Create } } + if v.TagSpecifications != nil { + objectKey := object.FlatKey("TagSpecification") + if err := awsEc2query_serializeDocumentTagSpecificationList(v.TagSpecifications, objectKey); err != nil { + return err + } + } + if len(v.TrafficDirection) > 0 { objectKey := object.Key("TrafficDirection") objectKey.String(string(v.TrafficDirection)) @@ -60450,6 +60534,47 @@ func awsEc2query_serializeOpDocumentDescribeTagsInput(v *DescribeTagsInput, valu return nil } +func awsEc2query_serializeOpDocumentDescribeTrafficMirrorFilterRulesInput(v *DescribeTrafficMirrorFilterRulesInput, value query.Value) error { + object := value.Object() + _ = object + + if v.DryRun != nil { + objectKey := object.Key("DryRun") + objectKey.Boolean(*v.DryRun) + } + + if v.Filters != nil { + objectKey := object.FlatKey("Filter") + if err := awsEc2query_serializeDocumentFilterList(v.Filters, objectKey); err != nil { + return err + } + } + + if v.MaxResults != nil { + objectKey := object.Key("MaxResults") + objectKey.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + objectKey := object.Key("NextToken") + objectKey.String(*v.NextToken) + } + + if v.TrafficMirrorFilterId != nil { + objectKey := object.Key("TrafficMirrorFilterId") + objectKey.String(*v.TrafficMirrorFilterId) + } + + if v.TrafficMirrorFilterRuleIds != nil { + objectKey := object.FlatKey("TrafficMirrorFilterRuleId") + if err := awsEc2query_serializeDocumentTrafficMirrorFilterRuleIdList(v.TrafficMirrorFilterRuleIds, objectKey); err != nil { + return err + } + } + + return nil +} + func awsEc2query_serializeOpDocumentDescribeTrafficMirrorFiltersInput(v *DescribeTrafficMirrorFiltersInput, value query.Value) error { object := value.Object() _ = object diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go index 402f00be7395d..e1b3b4c324f08 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go @@ -6963,6 +6963,7 @@ const ( ResourceTypeVerifiedAccessTrustProvider ResourceType = "verified-access-trust-provider" ResourceTypeVpnConnectionDeviceType ResourceType = "vpn-connection-device-type" ResourceTypeVpcBlockPublicAccessExclusion ResourceType = "vpc-block-public-access-exclusion" + ResourceTypeVpcEncryptionControl ResourceType = "vpc-encryption-control" ResourceTypeIpamResourceDiscovery ResourceType = "ipam-resource-discovery" ResourceTypeIpamResourceDiscoveryAssociation ResourceType = "ipam-resource-discovery-association" ResourceTypeInstanceConnectEndpoint ResourceType = "instance-connect-endpoint" @@ -7057,6 +7058,7 @@ func (ResourceType) Values() []ResourceType { "verified-access-trust-provider", "vpn-connection-device-type", "vpc-block-public-access-exclusion", + "vpc-encryption-control", "ipam-resource-discovery", "ipam-resource-discovery-association", "instance-connect-endpoint", diff --git a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go index 12965dbf09907..695b21f2b5d7e 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go @@ -17291,6 +17291,9 @@ type TrafficMirrorFilterRule struct { // The source port range assigned to the Traffic Mirror rule. SourcePortRange *TrafficMirrorPortRange + // Tags on Traffic Mirroring filter rules. + Tags []Tag + // The traffic direction assigned to the Traffic Mirror rule. TrafficDirection TrafficDirection diff --git a/vendor/modules.txt b/vendor/modules.txt index 8c7b557330ca0..500415cc6257c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -131,7 +131,7 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 # github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 ## explicit; go 1.20 github.com/aws/aws-sdk-go-v2/internal/ini -# github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.1 +# github.com/aws/aws-sdk-go-v2/service/ec2 v1.164.0 ## explicit; go 1.20 github.com/aws/aws-sdk-go-v2/service/ec2 github.com/aws/aws-sdk-go-v2/service/ec2/internal/endpoints