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

Codecommit approval rule template #11487

Merged
merged 9 commits into from
Dec 2, 2021

Conversation

carthewd
Copy link
Contributor

@carthewd carthewd commented Jan 6, 2020

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #11461

Release note for CHANGELOG:

New Resource: aws_codecommit_approval_rule_template

Example

resource "aws_codecommit_approval_rule_template" "test" {
    name = "MyTestApprovalRule"
    description = "This is a test approval rule template"
    
    content = <<EOF
{
    "Version": "2018-11-08",
    "DestinationReferences": ["refs/heads/master"],
    "Statements": [{
        "Type": "Approvers",
        "NumberOfApprovalsNeeded": 2,
        "ApprovalPoolMembers": ["arn:aws:sts::123456789012:assumed-role/CodeCommitReview/*"]}]
}
EOF
}
data "aws_codecommit_approval_rule_template" "test" {
  name = "MyTestApprovalRule"
}

Testing

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSCodeCommitApprovalRule'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSCodeCommitApprovalRule -timeout 120m                    
=== RUN   TestAccAWSCodeCommitApprovalRuleTemplateDataSource_basic                                                     
=== PAUSE TestAccAWSCodeCommitApprovalRuleTemplateDataSource_basic                                                     
=== RUN   TestAccAWSCodeCommitApprovalRule_basic
=== PAUSE TestAccAWSCodeCommitApprovalRule_basic
=== RUN   TestAccAWSCodeCommitApprovalRule_withChanges
=== PAUSE TestAccAWSCodeCommitApprovalRule_withChanges
=== CONT  TestAccAWSCodeCommitApprovalRuleTemplateDataSource_basic                                                     
=== CONT  TestAccAWSCodeCommitApprovalRule_withChanges
=== CONT  TestAccAWSCodeCommitApprovalRule_basic
--- PASS: TestAccAWSCodeCommitApprovalRuleTemplateDataSource_basic (54.73s)                                            
--- PASS: TestAccAWSCodeCommitApprovalRule_basic (56.16s)
--- PASS: TestAccAWSCodeCommitApprovalRule_withChanges (84.27s)                                                        
PASS                                                       
ok      github.com/terraform-providers/terraform-provider-aws/aws       84.294s 
...

Notes

I'm also working on an aws_codecommit_approval_rule_association resource to manage associating rules with repositories.

@carthewd carthewd requested a review from a team January 6, 2020 14:07
@ghost ghost added needs-triage Waiting for first response or review from a maintainer. size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. service/codecommit Issues and PRs that pertain to the codecommit service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 6, 2020
@a-weiss-programmer
Copy link

+1

@jValdron
Copy link
Contributor

jValdron commented May 12, 2020

Hey @carthewd, how's the work on aws_codecommit_approval_rule_association going? This can't really be used without the association to its repo. I can look into it if you need someone to help out with that part.

@carthewd
Copy link
Contributor Author

Hey @jValdron - it's mostly done, to be honest I let it languish a bit in case some feedback here contradicted the implementation. I'll wrap it up and post in the next 2 days or so.

@jValdron
Copy link
Contributor

Thanks @carthewd! Let me know if there's anything I can do to help.

@carthewd
Copy link
Contributor Author

carthewd commented May 22, 2020

Thanks @carthewd! Let me know if there's anything I can do to help.

Ok, I've created a separate PR for the association resource (I thought it maybe easier to review that way): #13467

@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.

@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. and removed size/XL Managed by automation to categorize the size of a PR. labels Sep 8, 2020
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. and removed size/XXL Managed by automation to categorize the size of a PR. labels Sep 8, 2020
Base automatically changed from master to main January 23, 2021 00:56
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:56
@goraxe
Copy link
Contributor

goraxe commented Jun 7, 2021

@bflad @ewbankkit Hey Guys I have seen that you folks were recent reviewers / mergers for things in the codecommit area. Looking at the attached PR #13467 would also be required to make use of the feature. It looks to me like the PRs have docs + tests is there anything else @carthewd would need to do to get these merged? Many thanks

@DaKaZ
Copy link

DaKaZ commented Jul 7, 2021

@bflad @ewbankkit Not trying to be overly noisy - but its been another month... is there anything the rest of us can do to help this PR land?

@breathingdust breathingdust added the new-resource Introduces a new resource. label Oct 6, 2021
@breathingdust breathingdust removed the needs-triage Waiting for first response or review from a maintainer. label Oct 6, 2021
@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.

@YakDriver YakDriver added the pre-service-packages Includes pre-Service Packages aspects. label Nov 30, 2021
@anGie44 anGie44 self-assigned this Dec 1, 2021
@anGie44
Copy link
Contributor

anGie44 commented Dec 1, 2021

Hi @carthewd , thank you for this PR! I'm going to be reviewing this PR and in the meantime, I recommend setting this PR to allow maintainers to edit so that we can help you update this PR for service packages (see #20000). If edits are possible, I will resolve merge conflicts on my end.

One initial note: since upstream API uses methods like CreateApprovalRuleTemplate and DeleteApprovalRuleTemplate, the resource and data source in question should aline with this and include template in the name for consistency

@github-actions github-actions bot removed the pre-service-packages Includes pre-Service Packages aspects. label Dec 1, 2021
@anGie44 anGie44 added the new-data-source Introduces a new data source. label Dec 1, 2021
@anGie44 anGie44 force-pushed the codecommit_approval_rules branch 2 times, most recently from 69bc94a to ea16421 Compare December 1, 2021 20:13
@anGie44 anGie44 changed the title Codecommit approval rules Codecommit approval rule template Dec 1, 2021
@anGie44
Copy link
Contributor

anGie44 commented Dec 1, 2021

Output of acceptance tests (AWS commercial):

--- PASS: TestAccCodeCommitApprovalRuleTemplate_disappears (12.36s)
--- PASS: TestAccCodeCommitApprovalRuleTemplateDataSource_basic (14.28s)
--- PASS: TestAccCodeCommitApprovalRuleTemplate_basic (15.65s)
--- PASS: TestAccCodeCommitApprovalRuleTemplate_updateName (25.01s)
--- PASS: TestAccCodeCommitApprovalRuleTemplate_updateContentAndDescription (25.54s)

@anGie44 anGie44 added this to the v3.68.0 milestone Dec 2, 2021
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Thank you again @carthewd for this PR! I've added in the required changes to get this up-to-date with our service packages restructure.

@anGie44 anGie44 merged commit eda4145 into hashicorp:main Dec 2, 2021
@carthewd
Copy link
Contributor Author

carthewd commented Dec 2, 2021

Thank you @anGie44 ! Really appreciate the help here - I had been hoping to make some time over the break to wrap this up with the new requirements

@github-actions
Copy link

github-actions bot commented Dec 2, 2021

This functionality has been released in v3.68.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@anGie44
Copy link
Contributor

anGie44 commented Dec 2, 2021

Of course, happy to help @carthewd ! Appreciate all your work and for checking back in as it's been quite some time since you initially created the PR .

@github-actions
Copy link

github-actions bot commented Jun 4, 2022

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. new-data-source Introduces a new data source. new-resource Introduces a new resource. provider Pertains to the provider itself, rather than any interaction with AWS. service/codecommit Issues and PRs that pertain to the codecommit 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.

Add resource for CodeCommit approval rule templates
10 participants