-
Notifications
You must be signed in to change notification settings - Fork 9.2k
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
base: main
Are you sure you want to change the base?
Add Media Connect Flow resource #7431
Conversation
1ee676c
to
d8ded0d
Compare
aws/validators.go
Outdated
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)) |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. I fixed.
0352070
to
1365067
Compare
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. |
5c9488f
to
b8f296a
Compare
Fixed typo.
|
fe1ec06
to
9e3953e
Compare
Re-run acctest.
|
Will this ever get merged? We'd really like to be able to manage MediaConnect Flows with Terraform ... |
Agreed. Frustrating this work is completed but, still unavailable. |
9e3953e
to
340574a
Compare
Re-run acctest.
|
aws/validators.go
Outdated
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)) |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks.
Re-run acctest.
|
There was a problem hiding this 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", |
There was a problem hiding this comment.
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.
"source.entitlement_arn", | |
"source.0.entitlement_arn", |
This will need to be adjusted here and below until relative attribute support is added to ConflictsWith
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed 4b8b4f8
"aes128", | ||
"aes192", | ||
"aes256", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SDK constants available 👍
"aes128", | |
"aes192", | |
"aes256", | |
mediaconnect.AlgorithmAes128, | |
mediaconnect.AlgorithmAes192, | |
mediaconnect.AlgorithmAes256, |
There was a problem hiding this comment.
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": { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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": { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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": { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed 6fbe02c
flow := output.Flow | ||
if flow == nil { | ||
return flow, "", fmt.Errorf("Media Connect Flow (%s) missing", flowArn) | ||
} |
There was a problem hiding this comment.
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:
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 |
There was a problem hiding this comment.
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"), |
There was a problem hiding this comment.
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. 👍
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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:
return err | |
if err != nil { | |
return err | |
} |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😎
* `source` - (Required) A unique identifier describing the channel | |
* `source` - (Required) Configuration block with source settings. Detailed below. |
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* `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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed 4f06ddd
Re-run acctest.
|
e6dc835
to
2580741
Compare
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: Please note that we're also trying to get better about implementing resources with the naming scheme Thanks so much. |
Notification of Recent and Upcoming Changes to ContributionsThank 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 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 SyntaxReference: #8950 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 ( Action Required: Terraform Plugin SDK Version 2Reference: #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 FileReference: #14712 Any changes to the Upcoming Change of Git Branch NamingReference: #14292 Development environments will need their upstream Git branch updated from Upcoming Change of GitHub OrganizationReference: #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 |
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 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. |
Fixes #7217
Changes proposed in this pull request:
aws_media_connect_flow
resourceOutput from acceptance testing: