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.

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

Add Media Connect Flow resource #7431

Open
wants to merge 17 commits into
base: main
Choose a base branch
from

Conversation

teraken0509
Copy link
Contributor

Fixes #7217

Changes proposed in this pull request:

  • Add aws_media_connect_flow resource

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (31.37s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (43.52s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (51.66s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	51.724s

@ghost ghost added size/XL Managed by automation to categorize the size of a PR. provider Pertains to the provider itself, rather than any interaction with AWS. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Feb 2, 2019
@bflad bflad added new-resource Introduces a new resource. service/mediaconnect Issues and PRs that pertain to the mediaconnect service. labels Feb 4, 2019
@ghost ghost added the documentation Introduces or discusses updates to documentation. label Feb 6, 2019
@teraken0509 teraken0509 changed the title [WIP]Add Media Connect Flow resource Add Media Connect Flow resource Feb 6, 2019
@teraken0509 teraken0509 force-pushed the feature/add-support-aws_elemental_mediaconnect-resource branch from 1ee676c to d8ded0d Compare February 6, 2019 06:55
value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf(
"only alphanumeric characters are allowed in %q", k))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MediaConnect flow names allow - (dash), which is disallowed by the regex

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I fixed.

@teraken0509 teraken0509 force-pushed the feature/add-support-aws_elemental_mediaconnect-resource branch from 0352070 to 1365067 Compare March 13, 2019 04:38
@adamgilman
Copy link

If I'd like to request the addition of managing MediaConnect Outputs & Entitlements to this, would you prefer me to open a new issue or just continue on this one?

@teraken0509
Copy link
Contributor Author

If I'd like to request the addition of managing MediaConnect Outputs & Entitlements to this, would you prefer me to open a new issue or just continue on this one?

Please open a new issue.

@teraken0509 teraken0509 force-pushed the feature/add-support-aws_elemental_mediaconnect-resource branch from 5c9488f to b8f296a Compare April 9, 2019 09:56
@teraken0509
Copy link
Contributor Author

Fixed typo.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (46.27s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (62.53s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (68.68s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	68.748s

@aeschright aeschright requested a review from a team June 25, 2019 22:11
@teraken0509 teraken0509 force-pushed the feature/add-support-aws_elemental_mediaconnect-resource branch from fe1ec06 to 9e3953e Compare August 29, 2019 16:33
@teraken0509
Copy link
Contributor Author

Re-run acctest.

$  make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (37.23s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (55.53s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (61.66s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	61.739s

@davemevans
Copy link

Will this ever get merged? We'd really like to be able to manage MediaConnect Flows with Terraform ...

@adamgilman
Copy link

Agreed. Frustrating this work is completed but, still unavailable.

@teraken0509 teraken0509 force-pushed the feature/add-support-aws_elemental_mediaconnect-resource branch from 9e3953e to 340574a Compare January 9, 2020 12:53
@teraken0509
Copy link
Contributor Author

Re-run acctest.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (36.43s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (55.97s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (63.18s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	63.286s

value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf(
"only alphanumeric characters are allowed in %q", k))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MediaConnect source names allow - (dash), which is disallowed by the regex

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@teraken0509
Copy link
Contributor Author

Re-run acctest.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (43.28s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (67.87s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (77.30s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	78.802s

Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @teraken0509 👋 Thank you for submitting this and apologies for the delayed review. Please see the below initial feedback and let us know if you have any questions or do not have time to implement them. 👍

validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9_-]+$`), "must only include alphanumeric, underscore or hyphen characters"),
),
ConflictsWith: []string{
"source.entitlement_arn",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe using ConflictsWith for configuration block attributes (albeit not "officially" supported) only works with TypeList ✅ and including the index in the flatmap representation, e.g.

Suggested change
"source.entitlement_arn",
"source.0.entitlement_arn",

This will need to be adjusted here and below until relative attribute support is added to ConflictsWith

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 4b8b4f8

Comment on lines 100 to 102
"aes128",
"aes192",
"aes256",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SDK constants available 👍

Suggested change
"aes128",
"aes192",
"aes256",
mediaconnect.AlgorithmAes128,
mediaconnect.AlgorithmAes192,
mediaconnect.AlgorithmAes256,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 0bb107c

"aes256",
}, false),
},
"key_type": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plan-time validation can be added via (please note, purposefully omitting speke):

ValidateFunc: validation.StringInSlice([]string{
	mediaconnect.KeyTypeStaticKey,
}, false),

The documentation for this parameter does also mention that static-key might be a default:

// The type of key that is used for the encryption. If no keyType is provided,
// the service will use the default setting (static-key).

There are a few other parameters now available for encryption settings as well, presumably for SPEKE handling, but we can leave those as out of scope for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 6fbe02c

Type: schema.TypeString,
Optional: true,
},
"role_arn": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plan-time validation can be added via: ValidateFunc: validateArn

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 6fbe02c

Type: schema.TypeString,
Required: true,
},
"secret_arn": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plan-time validation can be added via: ValidateFunc: validateArn

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 6fbe02c

Comment on lines 367 to 374
flow := output.Flow
if flow == nil {
return flow, "", fmt.Errorf("Media Connect Flow (%s) missing", flowArn)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To prevent panics and allow missing flow data to return successfully:

Suggested change
flow := output.Flow
if flow == nil {
return flow, "", fmt.Errorf("Media Connect Flow (%s) missing", flowArn)
}
if output == nil || output.Flow == nil {
return nil, "", nil
}
flow := output.Flow

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed e6dc835

CheckDestroy: testAccCheckAWSMediaConnectFlowDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSMediaConnectFlowConfig_Options(rName, "us-west-2a", "Test Description1"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend using aws_availability_zones data source (and value checking via resource.TestCheckResourceAttrPair() instead of hardcoding availability zone information in the testing. 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, i fixed to use aws_availability_zones cd34092

return nil
})

return err
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: To allow the for loop to continue, this should guard against early return:

Suggested change
return err
if err != nil {
return err
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 30add7e

The following arguments are supported:

* `name` - (Required) A unique identifier describing the channel
* `source` - (Required) A unique identifier describing the channel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😎

Suggested change
* `source` - (Required) A unique identifier describing the channel
* `source` - (Required) Configuration block with source settings. Detailed below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅
fixed in 4f06ddd

The `source` object supports the following:

* `name` - (Required) The type of encryption that is used on the content ingested from the source. Defined below.
* `decryption` - (Optional) The type of encryption that is used on the content ingested from the source. Defined below.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* `decryption` - (Optional) The type of encryption that is used on the content ingested from the source. Defined below.
* `decryption` - (Optional) Configuration block with type of encryption that is used on the content ingested from the source. Defined below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed 4f06ddd

@bflad bflad self-assigned this Mar 18, 2020
@bflad bflad added the waiting-response Maintainers are waiting on response from community or contributor. label Mar 18, 2020
@teraken0509
Copy link
Contributor Author

Re-run acctest.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSMediaConnectFlowConfig_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSMediaConnectFlowConfig_ -timeout 120m
=== RUN   TestAccAWSMediaConnectFlowConfig_Base
=== PAUSE TestAccAWSMediaConnectFlowConfig_Base
=== RUN   TestAccAWSMediaConnectFlowConfig_Decryption
=== PAUSE TestAccAWSMediaConnectFlowConfig_Decryption
=== RUN   TestAccAWSMediaConnectFlowConfig_Options
=== PAUSE TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Base
=== CONT  TestAccAWSMediaConnectFlowConfig_Options
=== CONT  TestAccAWSMediaConnectFlowConfig_Decryption
--- PASS: TestAccAWSMediaConnectFlowConfig_Options (41.01s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Base (56.83s)
--- PASS: TestAccAWSMediaConnectFlowConfig_Decryption (65.22s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	68.701s

@ghost ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Mar 18, 2020
@bflad
Copy link
Contributor

bflad commented Apr 15, 2020

Hi again @teraken0509 👋 I apologize for the delay in getting back to you.

It turns out that about a day or two after the last review, the MediaConnect API began supporting the separate creation of Sources, which is awesome, although I think it means we should split this functionality into two separate resources: aws_mediaconnect_flow (trimming off the source bits if possible) and aws_mediaconnect_source (implementing those trimmed off source bits). This will give operators the most flexibility when creating Media Connect infrastructure.

Please note that we're also trying to get better about implementing resources with the naming scheme aws_SERVICE_THING where the service name is combined. This will differ from the existing other aws_media_ resources but those will eventually brought under the same scheme as well.

Thanks so much.

@teamterraform
Copy link

Notification of Recent and Upcoming Changes to Contributions

Thank you for this contribution! There have been a few recent development changes that affect this pull request. We apologize for the inconvenience, especially if there have been long review delays up until now. Please note that this is automated message from an unmonitored account. See the FAQ for additional information on the maintainer team and review prioritization.

If you are unable to complete these updates, please leave a comment for the community and maintainers so someone can potentially continue the work. The maintainers will encourage other contributors to use the existing contribution as the base for additional changes as appropriate. Otherwise, contributions that do not receive updated code or comments from the original contributor may be closed in the future so the maintainers can focus on active items.

For the most up to date information about Terraform AWS Provider development, see the Contributing Guide. Additional technical debt changes can be tracked with the technical-debt label on issues.

As part of updating a pull request with these changes, the most current unit testing and linting will run. These may report issues that were not previously reported.

Action Required: Terraform 0.12 Syntax

Reference: #8950
Reference: #14417

Version 3 and later of the Terraform AWS Provider, which all existing contributions would potentially be added, only supports Terraform 0.12 and later. Certain syntax elements of Terraform 0.11 and earlier show deprecation warnings during runs with Terraform 0.12. Documentation and test configurations, such as those including deprecated string interpolations (some_attribute = "${aws_service_thing.example.id}") should be updated to the newer syntax (some_attribute = aws_service_thing.example.id). Contribution testing will automatically fail on older syntax in the near future. Please see the referenced issues for additional information.

Action Required: Terraform Plugin SDK Version 2

Reference: #14551

The Terraform AWS Provider has been upgraded to the latest version of the Terraform Plugin SDK. Generally, most changes to contributions should only involve updating Go import paths in source code files. Please see the referenced issue for additional information.

Action Required: Removal of website/aws.erb File

Reference: #14712

Any changes to the website/aws.erb file are no longer necessary and should be removed from this contribution to prevent merge issues in the near future when the file is removed from the repository. Please see the referenced issue for additional information.

Upcoming Change of Git Branch Naming

Reference: #14292

Development environments will need their upstream Git branch updated from master to main in the near future. Please see the referenced issue for additional information and scheduling.

Upcoming Change of GitHub Organization

Reference: #14715

This repository will be migrating from https://github.com/terraform-providers/terraform-provider-aws to https://github.com/hashicorp/terraform-provider-aws. No practitioner or developer action is anticipated and most GitHub functionality will automatically redirect to the new location. Go import paths including terraform-providers can remain for now. Please see the referenced issue for additional information and scheduling.

Base automatically changed from master to main January 23, 2021 00:55
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:55
@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Introduces or discusses updates to documentation. new-resource Introduces a new resource. provider Pertains to the provider itself, rather than any interaction with AWS. service/mediaconnect Issues and PRs that pertain to the mediaconnect service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature Request: MediaConnect
6 participants