From 5ad8437a282f45f876255b6410b00ad74b512796 Mon Sep 17 00:00:00 2001 From: AWS SDK for Go v2 automation user Date: Wed, 22 Jan 2025 19:35:51 +0000 Subject: [PATCH] Regenerated Clients --- .../136b87442c3a41609194b66265af5b4f.json | 8 + .../578c0d8e42d647219d0ce397be07d84d.json | 8 + .../6e386084f83c4eac903c72093306a256.json | 8 + .../92db4542603448b8becd9060fa4ef585.json | 8 + .../backup/internal/endpoints/endpoints.go | 3 + .../bedrockagentruntime/api_op_InvokeFlow.go | 8 + service/bedrockagentruntime/deserializers.go | 156 ++++++++++++++ service/bedrockagentruntime/serializers.go | 10 + service/bedrockagentruntime/types/enums.go | 4 +- service/bedrockagentruntime/types/types.go | 58 ++++- .../types/types_exported_test.go | 22 ++ service/bedrockagentruntime/validators.go | 3 - service/glue/api_op_CreateJob.go | 18 +- service/glue/api_op_CreateSession.go | 3 +- service/glue/api_op_StartJobRun.go | 3 + service/glue/types/types.go | 56 +++-- service/medialive/deserializers.go | 117 ++++++++++ service/medialive/serializers.go | 53 +++++ service/medialive/types/enums.go | 19 ++ service/medialive/types/types.go | 49 +++++ service/medialive/validators.go | 20 ++ .../internal/endpoints/endpoints.go | 204 ++++++++++++++++++ .../api_op_CreateEnvironment.go | 2 +- .../api_op_UpdateEnvironment.go | 2 +- service/workspacesthinclient/types/types.go | 4 +- 25 files changed, 813 insertions(+), 33 deletions(-) create mode 100644 .changelog/136b87442c3a41609194b66265af5b4f.json create mode 100644 .changelog/578c0d8e42d647219d0ce397be07d84d.json create mode 100644 .changelog/6e386084f83c4eac903c72093306a256.json create mode 100644 .changelog/92db4542603448b8becd9060fa4ef585.json diff --git a/.changelog/136b87442c3a41609194b66265af5b4f.json b/.changelog/136b87442c3a41609194b66265af5b4f.json new file mode 100644 index 00000000000..f3ba15b4d75 --- /dev/null +++ b/.changelog/136b87442c3a41609194b66265af5b4f.json @@ -0,0 +1,8 @@ +{ + "id": "136b8744-2c3a-4160-9194-b66265af5b4f", + "type": "feature", + "description": "Adds multi-turn input support for an Agent node in an Amazon Bedrock Flow", + "modules": [ + "service/bedrockagentruntime" + ] +} \ No newline at end of file diff --git a/.changelog/578c0d8e42d647219d0ce397be07d84d.json b/.changelog/578c0d8e42d647219d0ce397be07d84d.json new file mode 100644 index 00000000000..59f08a36c58 --- /dev/null +++ b/.changelog/578c0d8e42d647219d0ce397be07d84d.json @@ -0,0 +1,8 @@ +{ + "id": "578c0d8e-42d6-4721-9d0c-e397be07d84d", + "type": "documentation", + "description": "Docs Update for timeout changes", + "modules": [ + "service/glue" + ] +} \ No newline at end of file diff --git a/.changelog/6e386084f83c4eac903c72093306a256.json b/.changelog/6e386084f83c4eac903c72093306a256.json new file mode 100644 index 00000000000..a01bc0f2787 --- /dev/null +++ b/.changelog/6e386084f83c4eac903c72093306a256.json @@ -0,0 +1,8 @@ +{ + "id": "6e386084-f83c-4eac-903c-72093306a256", + "type": "feature", + "description": "AWS Elemental MediaLive adds a new feature, ID3 segment tagging, in CMAF Ingest output groups. It allows customers to insert ID3 tags into every output segment, controlled by a newly added channel schedule action Id3SegmentTagging.", + "modules": [ + "service/medialive" + ] +} \ No newline at end of file diff --git a/.changelog/92db4542603448b8becd9060fa4ef585.json b/.changelog/92db4542603448b8becd9060fa4ef585.json new file mode 100644 index 00000000000..bbe095e7a2a --- /dev/null +++ b/.changelog/92db4542603448b8becd9060fa4ef585.json @@ -0,0 +1,8 @@ +{ + "id": "92db4542-6034-48b8-becd-9060fa4ef585", + "type": "documentation", + "description": "Rename WorkSpaces Web to WorkSpaces Secure Browser", + "modules": [ + "service/workspacesthinclient" + ] +} \ No newline at end of file diff --git a/service/backup/internal/endpoints/endpoints.go b/service/backup/internal/endpoints/endpoints.go index 96957dfa214..bd25c4433c5 100644 --- a/service/backup/internal/endpoints/endpoints.go +++ b/service/backup/internal/endpoints/endpoints.go @@ -217,6 +217,9 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "me-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "mx-central-1", + }: endpoints.Endpoint{}, endpoints.EndpointKey{ Region: "sa-east-1", }: endpoints.Endpoint{}, diff --git a/service/bedrockagentruntime/api_op_InvokeFlow.go b/service/bedrockagentruntime/api_op_InvokeFlow.go index 56d7ed92122..d82c4495efa 100644 --- a/service/bedrockagentruntime/api_op_InvokeFlow.go +++ b/service/bedrockagentruntime/api_op_InvokeFlow.go @@ -59,6 +59,10 @@ type InvokeFlowInput struct { // [Track each step in your prompt flow by viewing its trace in Amazon Bedrock]: https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html EnableTrace *bool + // The unique identifier for the current flow execution. If you don't provide a + // value, Amazon Bedrock creates the identifier for you. + ExecutionId *string + // Model performance settings for the request. ModelPerformanceConfiguration *types.ModelPerformanceConfiguration @@ -66,6 +70,10 @@ type InvokeFlowInput struct { } type InvokeFlowOutput struct { + + // The unique identifier for the current flow execution. + ExecutionId *string + eventStream *InvokeFlowEventStream // Metadata pertaining to the operation's result. diff --git a/service/bedrockagentruntime/deserializers.go b/service/bedrockagentruntime/deserializers.go index 63f9345cd85..03b3eb2aaa4 100644 --- a/service/bedrockagentruntime/deserializers.go +++ b/service/bedrockagentruntime/deserializers.go @@ -681,6 +681,11 @@ func (m *awsRestjson1_deserializeOpInvokeFlow) HandleDeserialize(ctx context.Con output := &InvokeFlowOutput{} out.Result = output + err = awsRestjson1_deserializeOpHttpBindingsInvokeFlowOutput(output, response) + if err != nil { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("failed to decode response with invalid Http bindings, %w", err)} + } + span.End() return out, metadata, err } @@ -763,6 +768,19 @@ func awsRestjson1_deserializeOpErrorInvokeFlow(response *smithyhttp.Response, me } } +func awsRestjson1_deserializeOpHttpBindingsInvokeFlowOutput(v *InvokeFlowOutput, response *smithyhttp.Response) error { + if v == nil { + return fmt.Errorf("unsupported deserialization for nil %T", v) + } + + if headerValues := response.Header.Values("x-amz-bedrock-flow-execution-id"); len(headerValues) != 0 { + headerValues[0] = strings.TrimSpace(headerValues[0]) + v.ExecutionId = ptr.String(headerValues[0]) + } + + return nil +} + type awsRestjson1_deserializeOpInvokeInlineAgent struct { } @@ -9214,6 +9232,14 @@ func awsRestjson1_deserializeEventStreamFlowResponseStream(v *types.FlowResponse *v = vv return nil + case strings.EqualFold("flowMultiTurnInputRequestEvent", eventType.String()): + vv := &types.FlowResponseStreamMemberFlowMultiTurnInputRequestEvent{} + if err := awsRestjson1_deserializeEventMessageFlowMultiTurnInputRequestEvent(&vv.Value, msg); err != nil { + return err + } + *v = vv + return nil + case strings.EqualFold("flowOutputEvent", eventType.String()): vv := &types.FlowResponseStreamMemberFlowOutputEvent{} if err := awsRestjson1_deserializeEventMessageFlowOutputEvent(&vv.Value, msg); err != nil { @@ -9420,6 +9446,44 @@ func awsRestjson1_deserializeEventMessageFlowTraceEvent(v *types.FlowTraceEvent, return nil } +func awsRestjson1_deserializeEventMessageFlowMultiTurnInputRequestEvent(v *types.FlowMultiTurnInputRequestEvent, msg *eventstream.Message) error { + if v == nil { + return fmt.Errorf("unexpected serialization of nil %T", v) + } + + br := bytes.NewReader(msg.Payload) + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(br, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + 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 err + } + + if err := awsRestjson1_deserializeDocumentFlowMultiTurnInputRequestEvent(&v, shape); err != nil { + 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 err + } + + } + return nil +} + func awsRestjson1_deserializeDocumentFlowCompletionEvent(v **types.FlowCompletionEvent, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -9460,6 +9524,98 @@ func awsRestjson1_deserializeDocumentFlowCompletionEvent(v **types.FlowCompletio return nil } +func awsRestjson1_deserializeDocumentFlowMultiTurnInputContent(v *types.FlowMultiTurnInputContent, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var uv types.FlowMultiTurnInputContent +loop: + for key, value := range shape { + if value == nil { + continue + } + switch key { + case "document": + var mv document.Interface + if err := awsRestjson1_deserializeDocumentDocument(&mv, value); err != nil { + return err + } + uv = &types.FlowMultiTurnInputContentMemberDocument{Value: mv} + break loop + + default: + uv = &types.UnknownUnionMember{Tag: key} + break loop + + } + } + *v = uv + return nil +} + +func awsRestjson1_deserializeDocumentFlowMultiTurnInputRequestEvent(v **types.FlowMultiTurnInputRequestEvent, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.FlowMultiTurnInputRequestEvent + if *v == nil { + sv = &types.FlowMultiTurnInputRequestEvent{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "content": + if err := awsRestjson1_deserializeDocumentFlowMultiTurnInputContent(&sv.Content, value); err != nil { + return err + } + + case "nodeName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected NodeName to be of type string, got %T instead", value) + } + sv.NodeName = ptr.String(jtv) + } + + case "nodeType": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected NodeType to be of type string, got %T instead", value) + } + sv.NodeType = types.NodeType(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentFlowOutputContent(v *types.FlowOutputContent, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/bedrockagentruntime/serializers.go b/service/bedrockagentruntime/serializers.go index 6d43e3686eb..ffe63177b04 100644 --- a/service/bedrockagentruntime/serializers.go +++ b/service/bedrockagentruntime/serializers.go @@ -545,6 +545,11 @@ func awsRestjson1_serializeOpDocumentInvokeFlowInput(v *InvokeFlowInput, value s ok.Boolean(*v.EnableTrace) } + if v.ExecutionId != nil { + ok := object.Key("executionId") + ok.String(*v.ExecutionId) + } + if v.Inputs != nil { ok := object.Key("inputs") if err := awsRestjson1_serializeDocumentFlowInputs(v.Inputs, ok); err != nil { @@ -1774,6 +1779,11 @@ func awsRestjson1_serializeDocumentFlowInput(v *types.FlowInput, value smithyjso } } + if v.NodeInputName != nil { + ok := object.Key("nodeInputName") + ok.String(*v.NodeInputName) + } + if v.NodeName != nil { ok := object.Key("nodeName") ok.String(*v.NodeName) diff --git a/service/bedrockagentruntime/types/enums.go b/service/bedrockagentruntime/types/enums.go index 1258f8068a6..fcf8c7f69d5 100644 --- a/service/bedrockagentruntime/types/enums.go +++ b/service/bedrockagentruntime/types/enums.go @@ -219,7 +219,8 @@ type FlowCompletionReason string // Enum values for FlowCompletionReason const ( - FlowCompletionReasonSuccess FlowCompletionReason = "SUCCESS" + FlowCompletionReasonSuccess FlowCompletionReason = "SUCCESS" + FlowCompletionReasonInputRequired FlowCompletionReason = "INPUT_REQUIRED" ) // Values returns all known values for FlowCompletionReason. Note that this can be @@ -229,6 +230,7 @@ const ( func (FlowCompletionReason) Values() []FlowCompletionReason { return []FlowCompletionReason{ "SUCCESS", + "INPUT_REQUIRED", } } diff --git a/service/bedrockagentruntime/types/types.go b/service/bedrockagentruntime/types/types.go index 941058612f2..e2a92615e7f 100644 --- a/service/bedrockagentruntime/types/types.go +++ b/service/bedrockagentruntime/types/types.go @@ -777,9 +777,10 @@ type FlowInput struct { // This member is required. NodeName *string + // The name of the input from the flow input node. + NodeInputName *string + // The name of the output from the flow input node that begins the prompt flow. - // - // This member is required. NodeOutputName *string noSmithyDocumentSerde @@ -803,6 +804,47 @@ type FlowInputContentMemberDocument struct { func (*FlowInputContentMemberDocument) isFlowInputContent() {} +// The content structure containing input information for multi-turn flow +// interactions. +// +// The following types satisfy this interface: +// +// FlowMultiTurnInputContentMemberDocument +type FlowMultiTurnInputContent interface { + isFlowMultiTurnInputContent() +} + +// The requested additional input to send back to the multi-turn flow node. +type FlowMultiTurnInputContentMemberDocument struct { + Value document.Interface + + noSmithyDocumentSerde +} + +func (*FlowMultiTurnInputContentMemberDocument) isFlowMultiTurnInputContent() {} + +// Response object from the flow multi-turn node requesting additional information. +type FlowMultiTurnInputRequestEvent struct { + + // The content payload containing the input request details for the multi-turn + // interaction. + // + // This member is required. + Content FlowMultiTurnInputContent + + // The name of the node in the flow that is requesting the input. + // + // This member is required. + NodeName *string + + // The type of the node in the flow that is requesting the input. + // + // This member is required. + NodeType NodeType + + noSmithyDocumentSerde +} + // Contains information about the content in an output from prompt flow invocation. // // The following types satisfy this interface: @@ -847,6 +889,7 @@ type FlowOutputEvent struct { // The following types satisfy this interface: // // FlowResponseStreamMemberFlowCompletionEvent +// FlowResponseStreamMemberFlowMultiTurnInputRequestEvent // FlowResponseStreamMemberFlowOutputEvent // FlowResponseStreamMemberFlowTraceEvent type FlowResponseStream interface { @@ -862,6 +905,16 @@ type FlowResponseStreamMemberFlowCompletionEvent struct { func (*FlowResponseStreamMemberFlowCompletionEvent) isFlowResponseStream() {} +// The event stream containing the multi-turn input request information from the +// flow. +type FlowResponseStreamMemberFlowMultiTurnInputRequestEvent struct { + Value FlowMultiTurnInputRequestEvent + + noSmithyDocumentSerde +} + +func (*FlowResponseStreamMemberFlowMultiTurnInputRequestEvent) isFlowResponseStream() {} + // Contains information about an output from flow invocation. type FlowResponseStreamMemberFlowOutputEvent struct { Value FlowOutputEvent @@ -4214,6 +4267,7 @@ func (*UnknownUnionMember) isAPISchema() {} func (*UnknownUnionMember) isCaller() {} func (*UnknownUnionMember) isContentBlock() {} func (*UnknownUnionMember) isFlowInputContent() {} +func (*UnknownUnionMember) isFlowMultiTurnInputContent() {} func (*UnknownUnionMember) isFlowOutputContent() {} func (*UnknownUnionMember) isFlowResponseStream() {} func (*UnknownUnionMember) isFlowTrace() {} diff --git a/service/bedrockagentruntime/types/types_exported_test.go b/service/bedrockagentruntime/types/types_exported_test.go index f5ed1229176..09a6431c109 100644 --- a/service/bedrockagentruntime/types/types_exported_test.go +++ b/service/bedrockagentruntime/types/types_exported_test.go @@ -106,6 +106,24 @@ func ExampleFlowInputContent_outputUsage() { var _ document.Interface +func ExampleFlowMultiTurnInputContent_outputUsage() { + var union types.FlowMultiTurnInputContent + // type switches can be used to check the union value + switch v := union.(type) { + case *types.FlowMultiTurnInputContentMemberDocument: + _ = v.Value // Value is document.Interface + + case *types.UnknownUnionMember: + fmt.Println("unknown tag:", v.Tag) + + default: + fmt.Println("union is nil or unknown type") + + } +} + +var _ document.Interface + func ExampleFlowOutputContent_outputUsage() { var union types.FlowOutputContent // type switches can be used to check the union value @@ -131,6 +149,9 @@ func ExampleFlowResponseStream_outputUsage() { case *types.FlowResponseStreamMemberFlowCompletionEvent: _ = v.Value // Value is types.FlowCompletionEvent + case *types.FlowResponseStreamMemberFlowMultiTurnInputRequestEvent: + _ = v.Value // Value is types.FlowMultiTurnInputRequestEvent + case *types.FlowResponseStreamMemberFlowOutputEvent: _ = v.Value // Value is types.FlowOutputEvent @@ -149,6 +170,7 @@ func ExampleFlowResponseStream_outputUsage() { var _ *types.FlowOutputEvent var _ *types.FlowTraceEvent var _ *types.FlowCompletionEvent +var _ *types.FlowMultiTurnInputRequestEvent func ExampleFlowTrace_outputUsage() { var union types.FlowTrace diff --git a/service/bedrockagentruntime/validators.go b/service/bedrockagentruntime/validators.go index 8a037cc120c..167fc47059b 100644 --- a/service/bedrockagentruntime/validators.go +++ b/service/bedrockagentruntime/validators.go @@ -585,9 +585,6 @@ func validateFlowInput(v *types.FlowInput) error { if v.NodeName == nil { invalidParams.Add(smithy.NewErrParamRequired("NodeName")) } - if v.NodeOutputName == nil { - invalidParams.Add(smithy.NewErrParamRequired("NodeOutputName")) - } if v.Content == nil { invalidParams.Add(smithy.NewErrParamRequired("Content")) } diff --git a/service/glue/api_op_CreateJob.go b/service/glue/api_op_CreateJob.go index f7e1eaafb38..02d51b10fe9 100644 --- a/service/glue/api_op_CreateJob.go +++ b/service/glue/api_op_CreateJob.go @@ -207,13 +207,19 @@ type CreateJobInput struct { Tags map[string]string // The job timeout in minutes. This is the maximum time that a job run can consume - // resources before it is terminated and enters TIMEOUT status. The default is - // 2,880 minutes (48 hours) for batch jobs. + // resources before it is terminated and enters TIMEOUT status. // - // Streaming jobs must have timeout values less than 7 days or 10080 minutes. When - // the value is left blank, the job will be restarted after 7 days based if you - // have not setup a maintenance window. If you have setup maintenance window, it - // will be restarted during the maintenance window after 7 days. + // Jobs must have timeout values less than 7 days or 10080 minutes. Otherwise, the + // jobs will throw an exception. + // + // When the value is left blank, the timeout is defaulted to 2880 minutes. + // + // Any existing Glue jobs that had a timeout value greater than 7 days will be + // defaulted to 7 days. For instance if you have specified a timeout of 20 days for + // a batch job, it will be stopped on the 7th day. + // + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 // The type of predefined worker that is allocated when a job runs. Accepts a diff --git a/service/glue/api_op_CreateSession.go b/service/glue/api_op_CreateSession.go index 4299b5ad7dc..13007510b81 100644 --- a/service/glue/api_op_CreateSession.go +++ b/service/glue/api_op_CreateSession.go @@ -80,8 +80,7 @@ type CreateSessionInput struct { Tags map[string]string // The number of minutes before session times out. Default for Spark ETL jobs is - // 48 hours (2880 minutes), the maximum session lifetime for this job type. Consult - // the documentation for other job types. + // 48 hours (2880 minutes). Consult the documentation for other job types. Timeout *int32 // The type of predefined worker that is allocated when a job runs. Accepts a diff --git a/service/glue/api_op_StartJobRun.go b/service/glue/api_op_StartJobRun.go index d0dbdddb5f6..359d1bd54b3 100644 --- a/service/glue/api_op_StartJobRun.go +++ b/service/glue/api_op_StartJobRun.go @@ -138,6 +138,9 @@ type StartJobRunInput struct { // Any existing Glue jobs that had a timeout value greater than 7 days will be // defaulted to 7 days. For instance if you have specified a timeout of 20 days for // a batch job, it will be stopped on the 7th day. + // + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 // The type of predefined worker that is allocated when a job runs. Accepts a diff --git a/service/glue/types/types.go b/service/glue/types/types.go index 9bd37dc61c1..5b3a9a482b2 100644 --- a/service/glue/types/types.go +++ b/service/glue/types/types.go @@ -39,9 +39,20 @@ type Action struct { SecurityConfiguration *string // The JobRun timeout in minutes. This is the maximum time that a job run can - // consume resources before it is terminated and enters TIMEOUT status. The - // default is 2,880 minutes (48 hours). This overrides the timeout value set in the - // parent job. + // consume resources before it is terminated and enters TIMEOUT status. This + // overrides the timeout value set in the parent job. + // + // Jobs must have timeout values less than 7 days or 10080 minutes. Otherwise, the + // jobs will throw an exception. + // + // When the value is left blank, the timeout is defaulted to 2880 minutes. + // + // Any existing Glue jobs that had a timeout value greater than 7 days will be + // defaulted to 7 days. For instance if you have specified a timeout of 20 days for + // a batch job, it will be stopped on the 7th day. + // + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 noSmithyDocumentSerde @@ -5398,13 +5409,19 @@ type Job struct { SourceControlDetails *SourceControlDetails // The job timeout in minutes. This is the maximum time that a job run can consume - // resources before it is terminated and enters TIMEOUT status. The default is - // 2,880 minutes (48 hours) for batch jobs. + // resources before it is terminated and enters TIMEOUT status. + // + // Jobs must have timeout values less than 7 days or 10080 minutes. Otherwise, the + // jobs will throw an exception. + // + // When the value is left blank, the timeout is defaulted to 2880 minutes. + // + // Any existing Glue jobs that had a timeout value greater than 7 days will be + // defaulted to 7 days. For instance if you have specified a timeout of 20 days for + // a batch job, it will be stopped on the 7th day. // - // Streaming jobs must have timeout values less than 7 days or 10080 minutes. When - // the value is left blank, the job will be restarted after 7 days based if you - // have not setup a maintenance window. If you have setup maintenance window, it - // will be restarted during the maintenance window after 7 days. + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 // The type of predefined worker that is allocated when a job runs. Accepts a @@ -5731,6 +5748,9 @@ type JobRun struct { // Any existing Glue jobs that had a timeout value greater than 7 days will be // defaulted to 7 days. For instance if you have specified a timeout of 20 days for // a batch job, it will be stopped on the 7th day. + // + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 // The name of the trigger that started this job run. @@ -5947,13 +5967,19 @@ type JobUpdate struct { SourceControlDetails *SourceControlDetails // The job timeout in minutes. This is the maximum time that a job run can consume - // resources before it is terminated and enters TIMEOUT status. The default is - // 2,880 minutes (48 hours) for batch jobs. + // resources before it is terminated and enters TIMEOUT status. + // + // Jobs must have timeout values less than 7 days or 10080 minutes. Otherwise, the + // jobs will throw an exception. + // + // When the value is left blank, the timeout is defaulted to 2880 minutes. + // + // Any existing Glue jobs that had a timeout value greater than 7 days will be + // defaulted to 7 days. For instance if you have specified a timeout of 20 days for + // a batch job, it will be stopped on the 7th day. // - // Streaming jobs must have timeout values less than 7 days or 10080 minutes. When - // the value is left blank, the job will be restarted after 7 days based if you - // have not setup a maintenance window. If you have setup maintenance window, it - // will be restarted during the maintenance window after 7 days. + // For streaming jobs, if you have set up a maintenance window, it will be + // restarted during the maintenance window after 7 days. Timeout *int32 // The type of predefined worker that is allocated when a job runs. Accepts a diff --git a/service/medialive/deserializers.go b/service/medialive/deserializers.go index 4de336db3ad..4c8587d49f4 100644 --- a/service/medialive/deserializers.go +++ b/service/medialive/deserializers.go @@ -30206,6 +30206,24 @@ func awsRestjson1_deserializeDocumentCmafIngestGroupSettings(v **types.CmafInges return err } + case "id3Behavior": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected CmafId3Behavior to be of type string, got %T instead", value) + } + sv.Id3Behavior = types.CmafId3Behavior(jtv) + } + + case "id3NameModifier": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __stringMax100 to be of type string, got %T instead", value) + } + sv.Id3NameModifier = ptr.String(jtv) + } + case "klvBehavior": if value != nil { jtv, ok := value.(string) @@ -35862,6 +35880,55 @@ func awsRestjson1_deserializeDocumentHtmlMotionGraphicsSettings(v **types.HtmlMo return nil } +func awsRestjson1_deserializeDocumentId3SegmentTaggingScheduleActionSettings(v **types.Id3SegmentTaggingScheduleActionSettings, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.Id3SegmentTaggingScheduleActionSettings + if *v == nil { + sv = &types.Id3SegmentTaggingScheduleActionSettings{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "id3": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __string to be of type string, got %T instead", value) + } + sv.Id3 = ptr.String(jtv) + } + + case "tag": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __string to be of type string, got %T instead", value) + } + sv.Tag = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentImmediateModeScheduleActionStartSettings(v **types.ImmediateModeScheduleActionStartSettings, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -43630,6 +43697,11 @@ func awsRestjson1_deserializeDocumentScheduleActionSettings(v **types.ScheduleAc return err } + case "id3SegmentTaggingSettings": + if err := awsRestjson1_deserializeDocumentId3SegmentTaggingScheduleActionSettings(&sv.Id3SegmentTaggingSettings, value); err != nil { + return err + } + case "inputPrepareSettings": if err := awsRestjson1_deserializeDocumentInputPrepareScheduleActionSettings(&sv.InputPrepareSettings, value); err != nil { return err @@ -43695,6 +43767,11 @@ func awsRestjson1_deserializeDocumentScheduleActionSettings(v **types.ScheduleAc return err } + case "timedMetadataSettings": + if err := awsRestjson1_deserializeDocumentTimedMetadataScheduleActionSettings(&sv.TimedMetadataSettings, value); err != nil { + return err + } + default: _, _ = key, value @@ -46129,6 +46206,46 @@ func awsRestjson1_deserializeDocumentTimecodeConfig(v **types.TimecodeConfig, va return nil } +func awsRestjson1_deserializeDocumentTimedMetadataScheduleActionSettings(v **types.TimedMetadataScheduleActionSettings, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.TimedMetadataScheduleActionSettings + if *v == nil { + sv = &types.TimedMetadataScheduleActionSettings{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "id3": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __string to be of type string, got %T instead", value) + } + sv.Id3 = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentTooManyRequestsException(v **types.TooManyRequestsException, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/medialive/serializers.go b/service/medialive/serializers.go index 3e8dda92bb5..889654c8001 100644 --- a/service/medialive/serializers.go +++ b/service/medialive/serializers.go @@ -12311,6 +12311,16 @@ func awsRestjson1_serializeDocumentCmafIngestGroupSettings(v *types.CmafIngestGr } } + if len(v.Id3Behavior) > 0 { + ok := object.Key("id3Behavior") + ok.String(string(v.Id3Behavior)) + } + + if v.Id3NameModifier != nil { + ok := object.Key("id3NameModifier") + ok.String(*v.Id3NameModifier) + } + if len(v.KlvBehavior) > 0 { ok := object.Key("klvBehavior") ok.String(string(v.KlvBehavior)) @@ -14490,6 +14500,23 @@ func awsRestjson1_serializeDocumentHtmlMotionGraphicsSettings(v *types.HtmlMotio return nil } +func awsRestjson1_serializeDocumentId3SegmentTaggingScheduleActionSettings(v *types.Id3SegmentTaggingScheduleActionSettings, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.Id3 != nil { + ok := object.Key("id3") + ok.String(*v.Id3) + } + + if v.Tag != nil { + ok := object.Key("tag") + ok.String(*v.Tag) + } + + return nil +} + func awsRestjson1_serializeDocumentImmediateModeScheduleActionStartSettings(v *types.ImmediateModeScheduleActionStartSettings, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -17140,6 +17167,13 @@ func awsRestjson1_serializeDocumentScheduleActionSettings(v *types.ScheduleActio } } + if v.Id3SegmentTaggingSettings != nil { + ok := object.Key("id3SegmentTaggingSettings") + if err := awsRestjson1_serializeDocumentId3SegmentTaggingScheduleActionSettings(v.Id3SegmentTaggingSettings, ok); err != nil { + return err + } + } + if v.InputPrepareSettings != nil { ok := object.Key("inputPrepareSettings") if err := awsRestjson1_serializeDocumentInputPrepareScheduleActionSettings(v.InputPrepareSettings, ok); err != nil { @@ -17231,6 +17265,13 @@ func awsRestjson1_serializeDocumentScheduleActionSettings(v *types.ScheduleActio } } + if v.TimedMetadataSettings != nil { + ok := object.Key("timedMetadataSettings") + if err := awsRestjson1_serializeDocumentTimedMetadataScheduleActionSettings(v.TimedMetadataSettings, ok); err != nil { + return err + } + } + return nil } @@ -18024,6 +18065,18 @@ func awsRestjson1_serializeDocumentTimecodeConfig(v *types.TimecodeConfig, value return nil } +func awsRestjson1_serializeDocumentTimedMetadataScheduleActionSettings(v *types.TimedMetadataScheduleActionSettings, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.Id3 != nil { + ok := object.Key("id3") + ok.String(*v.Id3) + } + + return nil +} + func awsRestjson1_serializeDocumentTtmlDestinationSettings(v *types.TtmlDestinationSettings, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/medialive/types/enums.go b/service/medialive/types/enums.go index 0949121ef52..9ed8cbec177 100644 --- a/service/medialive/types/enums.go +++ b/service/medialive/types/enums.go @@ -1161,6 +1161,25 @@ func (ClusterType) Values() []ClusterType { } } +type CmafId3Behavior string + +// Enum values for CmafId3Behavior +const ( + CmafId3BehaviorDisabled CmafId3Behavior = "DISABLED" + CmafId3BehaviorEnabled CmafId3Behavior = "ENABLED" +) + +// Values returns all known values for CmafId3Behavior. Note that this can be +// expanded in the future, and so it is only as up to date as the client. +// +// The ordering of this slice is not guaranteed to be stable across updates. +func (CmafId3Behavior) Values() []CmafId3Behavior { + return []CmafId3Behavior{ + "DISABLED", + "ENABLED", + } +} + type CmafIngestSegmentLengthUnits string // Enum values for CmafIngestSegmentLengthUnits diff --git a/service/medialive/types/types.go b/service/medialive/types/types.go index 1adcb22df98..4d3d1cd6db5 100644 --- a/service/medialive/types/types.go +++ b/service/medialive/types/types.go @@ -1541,6 +1541,18 @@ type CmafIngestGroupSettings struct { // This member is required. Destination *OutputLocationRef + // Set to ENABLED to enable ID3 metadata insertion. To include metadata, you + // configure other parameters in the output group, or you add an ID3 action to the + // channel schedule. + Id3Behavior CmafId3Behavior + + // Change the modifier that MediaLive automatically adds to the Streams() name + // that identifies an ID3 track. The default is "id3", which means the default name + // will be Streams(id3.cmfm). Any string you enter here will replace the "id3" + // string.\nThe modifier can only contain: numbers, letters, plus (+), minus (-), + // underscore (_) and period (.) and has a maximum length of 100 characters. + Id3NameModifier *string + // If set to passthrough, passes any KLV data from the input source to this output. KlvBehavior CmafKLVBehavior @@ -3661,6 +3673,24 @@ type HtmlMotionGraphicsSettings struct { noSmithyDocumentSerde } +// Settings for the action to insert ID3 metadata in every segment, in applicable +// output groups. +type Id3SegmentTaggingScheduleActionSettings struct { + + // Complete this parameter if you want to specify the entire ID3 metadata. Enter a + // base64 string that contains one or more fully formed ID3 tags, according to the + // ID3 specification: http://id3.org/id3v2.4.0-structure + Id3 *string + + // Complete this parameter if you want to specify only the metadata, not the + // entire frame. MediaLive will insert the metadata in a TXXX frame. Enter the + // value as plain text. You can include standard MediaLive variable data such as + // the current segment number. + Tag *string + + noSmithyDocumentSerde +} + // Settings to configure an action so that it occurs as soon as possible. type ImmediateModeScheduleActionStartSettings struct { noSmithyDocumentSerde @@ -6482,6 +6512,9 @@ type ScheduleActionSettings struct { // Action to insert ID3 metadata once, in HLS output groups HlsTimedMetadataSettings *HlsTimedMetadataScheduleActionSettings + // Action to insert ID3 metadata in every segment, in applicable output groups + Id3SegmentTaggingSettings *Id3SegmentTaggingScheduleActionSettings + // Action to prepare an input for a future immediate input switch InputPrepareSettings *InputPrepareScheduleActionSettings @@ -6521,6 +6554,9 @@ type ScheduleActionSettings struct { // Action to deactivate a static image overlay in one or more specified outputs StaticImageOutputDeactivateSettings *StaticImageOutputDeactivateScheduleActionSettings + // Action to insert ID3 metadata once, in applicable output groups + TimedMetadataSettings *TimedMetadataScheduleActionSettings + noSmithyDocumentSerde } @@ -7365,6 +7401,19 @@ type TimecodeConfig struct { noSmithyDocumentSerde } +// Settings for the action to insert ID3 metadata (as a one-time action) in +// applicable output groups. +type TimedMetadataScheduleActionSettings struct { + + // Enter a base64 string that contains one or more fully formed ID3 tags.See the + // ID3 specification: http://id3.org/id3v2.4.0-structure + // + // This member is required. + Id3 *string + + noSmithyDocumentSerde +} + // Details about the input device that is being transferred. type TransferringInputDeviceSummary struct { diff --git a/service/medialive/validators.go b/service/medialive/validators.go index 15cc6aa8f59..bf28c159d68 100644 --- a/service/medialive/validators.go +++ b/service/medialive/validators.go @@ -4315,6 +4315,11 @@ func validateScheduleActionSettings(v *types.ScheduleActionSettings) error { invalidParams.AddNested("StaticImageOutputDeactivateSettings", err.(smithy.InvalidParamsError)) } } + if v.TimedMetadataSettings != nil { + if err := validateTimedMetadataScheduleActionSettings(v.TimedMetadataSettings); err != nil { + invalidParams.AddNested("TimedMetadataSettings", err.(smithy.InvalidParamsError)) + } + } if invalidParams.Len() > 0 { return invalidParams } else { @@ -4671,6 +4676,21 @@ func validateTimecodeConfig(v *types.TimecodeConfig) error { } } +func validateTimedMetadataScheduleActionSettings(v *types.TimedMetadataScheduleActionSettings) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "TimedMetadataScheduleActionSettings"} + if v.Id3 == nil { + invalidParams.Add(smithy.NewErrParamRequired("Id3")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateUdpContainerSettings(v *types.UdpContainerSettings) error { if v == nil { return nil diff --git a/service/synthetics/internal/endpoints/endpoints.go b/service/synthetics/internal/endpoints/endpoints.go index 75000b0a31a..ddc469722f9 100644 --- a/service/synthetics/internal/endpoints/endpoints.go +++ b/service/synthetics/internal/endpoints/endpoints.go @@ -142,42 +142,120 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "af-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "af-south-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.af-south-1.api.aws", + }, endpoints.EndpointKey{ Region: "ap-east-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-east-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-east-1.api.aws", + }, endpoints.EndpointKey{ Region: "ap-northeast-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-northeast-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-northeast-1.api.aws", + }, endpoints.EndpointKey{ Region: "ap-northeast-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-northeast-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-northeast-2.api.aws", + }, endpoints.EndpointKey{ Region: "ap-northeast-3", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-northeast-3", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-northeast-3.api.aws", + }, endpoints.EndpointKey{ Region: "ap-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-south-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-south-1.api.aws", + }, endpoints.EndpointKey{ Region: "ap-south-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-south-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-south-2.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-1.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-2.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-3", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-3", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-3.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-4", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-4", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-4.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-5", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-5", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-5.api.aws", + }, endpoints.EndpointKey{ Region: "ap-southeast-7", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-southeast-7", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ap-southeast-7.api.aws", + }, endpoints.EndpointKey{ Region: "ca-central-1", }: endpoints.Endpoint{}, @@ -187,6 +265,12 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.ca-central-1.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "ca-central-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ca-central-1.api.aws", + }, endpoints.EndpointKey{ Region: "ca-west-1", }: endpoints.Endpoint{}, @@ -196,30 +280,84 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.ca-west-1.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "ca-west-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.ca-west-1.api.aws", + }, endpoints.EndpointKey{ Region: "eu-central-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-central-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-central-1.api.aws", + }, endpoints.EndpointKey{ Region: "eu-central-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-central-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-central-2.api.aws", + }, endpoints.EndpointKey{ Region: "eu-north-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-north-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-north-1.api.aws", + }, endpoints.EndpointKey{ Region: "eu-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-south-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-south-1.api.aws", + }, endpoints.EndpointKey{ Region: "eu-south-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-south-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-south-2.api.aws", + }, endpoints.EndpointKey{ Region: "eu-west-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-west-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-west-1.api.aws", + }, endpoints.EndpointKey{ Region: "eu-west-2", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-west-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-west-2.api.aws", + }, endpoints.EndpointKey{ Region: "eu-west-3", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-west-3", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.eu-west-3.api.aws", + }, endpoints.EndpointKey{ Region: "fips-ca-central-1", }: endpoints.Endpoint{ @@ -277,18 +415,48 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "il-central-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "il-central-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.il-central-1.api.aws", + }, endpoints.EndpointKey{ Region: "me-central-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "me-central-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.me-central-1.api.aws", + }, endpoints.EndpointKey{ Region: "me-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "me-south-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.me-south-1.api.aws", + }, endpoints.EndpointKey{ Region: "mx-central-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "mx-central-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.mx-central-1.api.aws", + }, endpoints.EndpointKey{ Region: "sa-east-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "sa-east-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.sa-east-1.api.aws", + }, endpoints.EndpointKey{ Region: "us-east-1", }: endpoints.Endpoint{}, @@ -298,6 +466,12 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.us-east-1.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "us-east-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.us-east-1.api.aws", + }, endpoints.EndpointKey{ Region: "us-east-2", }: endpoints.Endpoint{}, @@ -307,6 +481,12 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.us-east-2.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "us-east-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.us-east-2.api.aws", + }, endpoints.EndpointKey{ Region: "us-west-1", }: endpoints.Endpoint{}, @@ -316,6 +496,12 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.us-west-1.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "us-west-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.us-west-1.api.aws", + }, endpoints.EndpointKey{ Region: "us-west-2", }: endpoints.Endpoint{}, @@ -325,6 +511,12 @@ var defaultPartitions = endpoints.Partitions{ }: { Hostname: "synthetics-fips.us-west-2.amazonaws.com", }, + endpoints.EndpointKey{ + Region: "us-west-2", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.us-west-2.api.aws", + }, }, }, { @@ -365,9 +557,21 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "cn-north-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "cn-north-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.cn-north-1.api.amazonwebservices.com.cn", + }, endpoints.EndpointKey{ Region: "cn-northwest-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "cn-northwest-1", + Variant: endpoints.DualStackVariant, + }: { + Hostname: "synthetics.cn-northwest-1.api.amazonwebservices.com.cn", + }, }, }, { diff --git a/service/workspacesthinclient/api_op_CreateEnvironment.go b/service/workspacesthinclient/api_op_CreateEnvironment.go index 5f511fafbad..ecf7a95f51a 100644 --- a/service/workspacesthinclient/api_op_CreateEnvironment.go +++ b/service/workspacesthinclient/api_op_CreateEnvironment.go @@ -30,7 +30,7 @@ func (c *Client) CreateEnvironment(ctx context.Context, params *CreateEnvironmen type CreateEnvironmentInput struct { // The Amazon Resource Name (ARN) of the desktop to stream from Amazon WorkSpaces, - // WorkSpaces Web, or AppStream 2.0. + // WorkSpaces Secure Browser, or AppStream 2.0. // // This member is required. DesktopArn *string diff --git a/service/workspacesthinclient/api_op_UpdateEnvironment.go b/service/workspacesthinclient/api_op_UpdateEnvironment.go index 9a25ef7205b..f77e3ab1f23 100644 --- a/service/workspacesthinclient/api_op_UpdateEnvironment.go +++ b/service/workspacesthinclient/api_op_UpdateEnvironment.go @@ -38,7 +38,7 @@ type UpdateEnvironmentInput struct { DesiredSoftwareSetId *string // The Amazon Resource Name (ARN) of the desktop to stream from Amazon WorkSpaces, - // WorkSpaces Web, or AppStream 2.0. + // WorkSpaces Secure Browser, or AppStream 2.0. DesktopArn *string // The URL for the identity provider login (only for environments that use diff --git a/service/workspacesthinclient/types/types.go b/service/workspacesthinclient/types/types.go index 0a153f2567f..23672b6c871 100644 --- a/service/workspacesthinclient/types/types.go +++ b/service/workspacesthinclient/types/types.go @@ -147,7 +147,7 @@ type Environment struct { DesiredSoftwareSetId *string // The Amazon Resource Name (ARN) of the desktop to stream from Amazon WorkSpaces, - // WorkSpaces Web, or AppStream 2.0. + // WorkSpaces Secure Browser, or AppStream 2.0. DesktopArn *string // The URL for the identity provider login (only for environments that use @@ -219,7 +219,7 @@ type EnvironmentSummary struct { DesiredSoftwareSetId *string // The Amazon Resource Name (ARN) of the desktop to stream from Amazon WorkSpaces, - // WorkSpaces Web, or AppStream 2.0. + // WorkSpaces Secure Browser, or AppStream 2.0. DesktopArn *string // The URL for the identity provider login (only for environments that use