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

Rename "master" branch to "main" #14292

Closed
YakDriver opened this issue Jul 22, 2020 · 5 comments · Fixed by #17246
Closed

Rename "master" branch to "main" #14292

YakDriver opened this issue Jul 22, 2020 · 5 comments · Fixed by #17246
Labels
breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. enhancement Requests to existing resources that expand the functionality or scope. provider Pertains to the provider itself, rather than any interaction with AWS.
Milestone

Comments

@YakDriver
Copy link
Member

YakDriver commented Jul 22, 2020

Community Note

  • Please vote on this issue by adding a 👍 reaction to the original issue 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 issue followers and do not help prioritize the request
  • If you are interested in working on this issue or have submitted a pull request, please leave a comment

Description

GitHub is working on replacing the term "master" on its service with a neutral term like "main" to avoid any unnecessary references to slavery, its CEO said on Friday.

I recommend renaming the default branch in the AWS provider GitHub repo to main so as to avoid using the term master.

This will not affect resources but will have wide implications on existing forks, CI configuration, and documentation.

New or Affected Resource(s)

None

Potential Terraform Configuration

References

@YakDriver YakDriver added enhancement Requests to existing resources that expand the functionality or scope. breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. proposal Proposes new design or functionality. labels Jul 22, 2020
@bflad
Copy link
Contributor

bflad commented Aug 17, 2020

This is now explicitly part of a company-wide initiative, https://discuss.hashicorp.com/t/inclusive-language-changes/12797, so removing the proposal label. The maintainers team will provide additional information on timing when it has been decided.

@bflad bflad added provider Pertains to the provider itself, rather than any interaction with AWS. and removed proposal Proposes new design or functionality. labels Aug 17, 2020
@bflad
Copy link
Contributor

bflad commented Oct 2, 2020

Context: https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/

main is now the default choice when creating GitHub repositories and it sounds like they will be releasing tooling by end of year to cover all the various scenarios of doing the migration. Depending on the timing of that tooling and our migration, we can either leverage GitHub's tooling or some various (currently internal only) tooling.

@breathingdust
Copy link
Member

This has now been completed 🎉. To update your local copy run:

git branch -m master main
git fetch origin
git branch -u origin/main main

@ghost
Copy link

ghost commented Jan 28, 2021

This has been released in version 3.26.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 for triage. Thanks!

@ghost
Copy link

ghost commented Feb 22, 2021

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked as resolved and limited conversation to collaborators Feb 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
breaking-change Introduces a breaking change in current functionality; usually deferred to the next major release. enhancement Requests to existing resources that expand the functionality or scope. provider Pertains to the provider itself, rather than any interaction with AWS.
Projects
None yet
3 participants