Merge pull request #35615 from hashicorp/td-mediaconvert.DescribeEndp…

…ointsInput-deprecated

mediaconvert: Use standard Regional endpoints, not per-account endpoints

.changelog/35615.txt

@@ -0,0 +1,7 @@
+```release-note:note
+resource/aws_media_convert_queue: The AWS Elemental MediaConvert service has been converted to use standard [Regional endpoints](https://docs.aws.amazon.com/general/latest/gr/mediaconvert.html#mediaconvert_region) instead of deprecated per-account endpoints
+```
+
+```release-note:note
+data-source/aws_media_convert_queue: The AWS Elemental MediaConvert service has been converted to use standard [Regional endpoints](https://docs.aws.amazon.com/general/latest/gr/mediaconvert.html#mediaconvert_region) instead of deprecated per-account endpoints
+```

go.mod

@@ -73,6 +73,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.25.6
 	github.com/aws/aws-sdk-go-v2/service/m2 v1.10.7
 	github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.25.1
+	github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.49.1
 	github.com/aws/aws-sdk-go-v2/service/medialive v1.44.1
 	github.com/aws/aws-sdk-go-v2/service/mediapackage v1.28.7
 	github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.7.7

go.sum

@@ -180,6 +180,8 @@ github.com/aws/aws-sdk-go-v2/service/m2 v1.10.7 h1:5etXqoLGqO/63wcrEJHhZ42+pA/sT
 github.com/aws/aws-sdk-go-v2/service/m2 v1.10.7/go.mod h1:RwwoIKmTLC0noLzjd3V+Tm/zPriuaBXd1/uXmGKIAko=
 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.25.1 h1:GnROse8mFPn5tiUrcLrSlCl64N3HZoLKVJlnM+1Txzo=
 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.25.1/go.mod h1:YtYScucFEyg+/50YWZlIt8XjYMTIQbjw6dgz9/UYZXA=
+github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.49.1 h1:7W2XOA9H0ddbkhZjKCez0e9aVqVQXyqxQhdLDDqfASI=
+github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.49.1/go.mod h1:aCUF5+yUBBaesG5FH67HY4pIYOMJK3UzajdnXSCOFGg=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.44.1 h1:5iU4di93LKUIUAvcHY9TXR8MvrHKhrOjpL/CINGuV04=
 github.com/aws/aws-sdk-go-v2/service/medialive v1.44.1/go.mod h1:SITOSt2FpMrkZzTD/8ykcnK0zpbBLcjk/1LUhcU/gzE=
 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.28.7 h1:vdaaK74RcQKM7Db8GAEqM+J76AR9mhJztLPb+6wYpfQ=

internal/conns/awsclient.go

@@ -16,7 +16,6 @@ import (
 	endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints"
 	session_sdkv1 "github.com/aws/aws-sdk-go/aws/session"
 	apigatewayv2_sdkv1 "github.com/aws/aws-sdk-go/service/apigatewayv2"
-	mediaconvert_sdkv1 "github.com/aws/aws-sdk-go/service/mediaconvert"
 	baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
@@ -25,17 +24,16 @@ import (
 )
 
 type AWSClient struct {
-	AccountID               string
-	DefaultTagsConfig       *tftags.DefaultConfig
-	DNSSuffix               string
-	IgnoreTagsConfig        *tftags.IgnoreConfig
-	MediaConvertAccountConn *mediaconvert_sdkv1.MediaConvert
-	Partition               string
-	Region                  string
-	ReverseDNSPrefix        string
-	ServicePackages         map[string]ServicePackage
-	Session                 *session_sdkv1.Session
-	TerraformVersion        string
+	AccountID         string
+	DefaultTagsConfig *tftags.DefaultConfig
+	DNSSuffix         string
+	IgnoreTagsConfig  *tftags.IgnoreConfig
+	Partition         string
+	Region            string
+	ReverseDNSPrefix  string
+	ServicePackages   map[string]ServicePackage
+	Session           *session_sdkv1.Session
+	TerraformVersion  string
 
 	awsConfig                 *aws_sdkv2.Config
 	clients                   map[string]any

internal/service/mediaconvert/exports_test.go

@@ -0,0 +1,11 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package mediaconvert
+
+// Exports for use in tests only.
+var (
+	ResourceQueue = resourceQueue
+
+	FindQueueByName = findQueueByName
+)

internal/service/mediaconvert/generate.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-//go:generate go run ../../generate/tags/main.go -ListTags -ListTagsInIDElem=Arn -ListTagsOutTagsElem=ResourceTags.Tags -ServiceTagsMap -TagInIDElem=Arn -UpdateTags
+//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ListTags -ListTagsInIDElem=Arn -ListTagsOutTagsElem=ResourceTags.Tags -ServiceTagsMap -TagInIDElem=Arn -UpdateTags -KVTValues -SkipTypesImp
 //go:generate go run ../../generate/servicepackage/main.go
 // ONLY generate directives and package declaration! Do not add anything else to this file.