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

Jump to bottom

Realign inconsistent media store names #21603

Closed
wants to merge 2 commits into from
Closed

Realign inconsistent media store names #21603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
638a752
Realign inconsistent media store names
YakDriver Nov 2, 2021
4fbf050
Add changelog
YakDriver Nov 2, 2021
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/21603.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_media_store_container: Rename data source to aws_mediastore_container (with alias for aws_media_store_container)
```

```release-note:enhancement
resource/aws_media_store_container_policy: Rename data source to aws_mediastore_container_policy (with alias for aws_media_store_container_policy)
```
2 changes: 1 addition & 1 deletion .github/workflows/terraform_provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ jobs:
-allowed-resource-subcategories-file website/allowed-subcategories.txt \
-enable-contents-check \
-ignore-file-missing-data-sources aws_alb,aws_alb_listener,aws_alb_target_group \
-ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment \
-ignore-file-missing-resources aws_alb,aws_alb_listener,aws_alb_listener_certificate,aws_alb_listener_rule,aws_alb_target_group,aws_alb_target_group_attachment,aws_media_store_container,aws_media_store_container_policy \
-provider-source registry.terraform.io/hashicorp/aws \
-providers-schema-json terraform-providers-schema/schema.json \
-require-resource-subcategory
6 changes: 4 additions & 2 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,8 +1320,10 @@ func Provider() *schema.Provider {

"aws_media_package_channel": mediapackage.ResourceChannel(),

"aws_media_store_container": mediastore.ResourceContainer(),
"aws_media_store_container_policy": mediastore.ResourceContainerPolicy(),
"aws_mediastore_container": mediastore.ResourceContainer(),
"aws_mediastore_container_policy": mediastore.ResourceContainerPolicy(),
"aws_media_store_container": mediastore.ResourceContainer(), // backward compatible alias
"aws_media_store_container_policy": mediastore.ResourceContainerPolicy(), // backward compatible alias

"aws_mq_broker": mq.ResourceBroker(),
"aws_mq_configuration": mq.ResourceConfiguration(),
Expand Down
6 changes: 3 additions & 3 deletions internal/service/mediastore/container_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func TestAccMediaStoreContainerPolicy_basic(t *testing.T) {
rname := sdkacctest.RandString(5)
resourceName := "aws_media_store_container_policy.test"
resourceName := "aws_mediastore_container_policy.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); testAccPreCheck(t) },
Expand Down Expand Up @@ -53,7 +53,7 @@ func testAccCheckContainerPolicyDestroy(s *terraform.State) error {
conn := acctest.Provider.Meta().(*conns.AWSClient).MediaStoreConn

for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_media_store_container_policy" {
if rs.Type != "aws_mediastore_container_policy" {
continue
}

Expand Down Expand Up @@ -111,7 +111,7 @@ resource "aws_media_store_container" "test" {
name = "tf_mediastore_%s"
}

resource "aws_media_store_container_policy" "test" {
resource "aws_mediastore_container_policy" "test" {
container_name = aws_media_store_container.test.name

policy = <<EOF
Expand Down
0 ...ocs/r/media_store_container.html.markdown → ...docs/r/mediastore_container.html.markdown
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...edia_store_container_policy.html.markdown → ...mediastore_container_policy.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
subcategory: "MediaStore"
layout: "aws"
page_title: "AWS: aws_media_store_container_policy"
page_title: "AWS: aws_mediastore_container_policy"
description: |-
Provides a MediaStore Container Policy.
---

# Resource: aws_media_store_container_policy
# Resource: aws_mediastore_container_policy

Provides a MediaStore Container Policy.

Expand All @@ -21,7 +21,7 @@ resource "aws_media_store_container" "example" {
name = "example"
}

resource "aws_media_store_container_policy" "example" {
resource "aws_mediastore_container_policy" "example" {
container_name = aws_media_store_container.example.name

policy = <<EOF
Expand Down Expand Up @@ -58,5 +58,5 @@ No additional attributes are exported.
MediaStore Container Policy can be imported using the MediaStore Container Name, e.g.,

```
$ terraform import aws_media_store_container_policy.example example
$ terraform import aws_mediastore_container_policy.example example
```