Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 18 commits into from
Feb 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0bd72b8
r/aws_media_convert_queue: Use '_Values()' for string enums.
ewbankkit Feb 2, 2024
edcf454
r/aws_media_convert_queue: Tidy up Create.
ewbankkit Feb 2, 2024
11c89de
r/aws_media_convert_queue: Tidy up Delete.
ewbankkit Feb 2, 2024
8179e52
r/aws_media_convert_queue: Tidy up Update.
ewbankkit Feb 2, 2024
2b30ad6
r/aws_media_convert_queue: Tidy up Read.
ewbankkit Feb 2, 2024
43c5a88
d/aws_media_convert_queue: Tidy up.
ewbankkit Feb 2, 2024
9a96f05
mediaconvert: Tidy up acceptance tests.
ewbankkit Feb 2, 2024
6772f96
Acceptance test output:
ewbankkit Feb 2, 2024
ac9bb51
mediaconvert: Use standard API connection.
ewbankkit Feb 2, 2024
3eecf43
Acceptance test output:
ewbankkit Feb 2, 2024
c96b326
mediaconvert: Use AWS SDK for Go v2.
ewbankkit Feb 2, 2024
f307921
Run 'make gen'.
ewbankkit Feb 2, 2024
8a7ae02
Run 'go get github.com/aws/aws-sdk-go-v2/service/[email protected]…
ewbankkit Feb 2, 2024
f23e5b7
r/aws_media_convert_queue: Migrate to AWS SDK for Go v2.
ewbankkit Feb 2, 2024
7c6e2c0
d/aws_media_convert_queue: Migrate to AWS SDK for Go v2.
ewbankkit Feb 2, 2024
4c15e08
mediaconvert: Migrate acceptance tests to AWS SDK for Go v2.
ewbankkit Feb 2, 2024
d592cb8
Add CHANGELOG entries.
ewbankkit Feb 2, 2024
135bd47
Correct CHANGELOG entry file name.
ewbankkit Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/35615.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
```
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
22 changes: 10 additions & 12 deletions internal/conns/awsclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/conns/awsclient_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions internal/service/mediaconvert/exports_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
2 changes: 1 addition & 1 deletion internal/service/mediaconvert/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Loading
Loading