From 4445115a5fba5fe099c97be12595b9903e58e033 Mon Sep 17 00:00:00 2001 From: Rick Winter Date: Mon, 30 Aug 2021 10:08:09 -0700 Subject: [PATCH] Update Contributing documentation (#15393) Add additional sections for setting up development environments. Add checklists for best practices for submitting PRs --- CONTRIBUTING.md | 76 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1af84420feb4..606a851c177b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,47 @@ -# Contributing +# Azure SDK for Go Contributing Guide + +Thank you for your interest in contributing to Azure SDK for go. + +- For reporting bugs, requesting features, or asking for support, please file an issue in the [issues](https://github.com/Azure/azure-sdk-for-go/issues) section of the project. + +- If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](https://azure.github.io/azure-sdk/policies_opensource.html). + +- To make code changes, or contribute something new, please follow the [GitHub Forks / Pull requests model](https://help.github.com/articles/fork-a-repo/): Fork the repo, make the change and propose it back by submitting a pull request. + +## Pull Requests + +- **DO** follow the API design and implementation [Go Guidelines](https://azure.github.io/azure-sdk/golang_introduction.html). + - When submitting large changes or features, **DO** have an issue or spec doc that describes the design, usage, and motivating scenario. +- **DO** submit all code changes via pull requests (PRs) rather than through a direct commit. PRs will be reviewed and potentially merged by the repo maintainers after a peer review that includes at least one maintainer. +- **DO** review your own PR to make sure there are no unintended changes or commits before submitting it. +- **DO NOT** submit "work in progress" PRs. A PR should only be submitted when it is considered ready for review and subsequent merging by the contributor. + - If the change is work-in-progress or an experiment, **DO** start off as a temporary draft PR. +- **DO** give PRs short-but-descriptive names (e.g. "Improve code coverage for Azure.Core by 10%", not "Fix #1234") and add a description which explains why the change is being made. +- **DO** refer to any relevant issues, and include [keywords](https://help.github.com/articles/closing-issues-via-commit-messages/) that automatically close issues when the PR is merged. +- **DO** tag any users that should know about and/or review the change. +- **DO** ensure each commit successfully builds. The entire PR must pass all tests in the Continuous Integration (CI) system before it'll be merged. +- **DO** address PR feedback in an additional commit(s) rather than amending the existing commits, and only rebase/squash them when necessary. This makes it easier for reviewers to track changes. +- **DO** assume that ["Squash and Merge"](https://github.com/blog/2141-squash-your-commits) will be used to merge your commit unless you request otherwise in the PR. +- **DO NOT** mix independent, unrelated changes in one PR. Separate real product/test code changes from larger code formatting/dead code removal changes. Separate unrelated fixes into separate PRs, especially if they are in different modules or files that otherwise wouldn't be changed. +- **DO** comment your code focusing on "why", where necessary. Otherwise, aim to keep it self-documenting with appropriate names and style. +- **DO** add [GoDoc style comments](https://azure.github.io/azure-sdk/golang_introduction.html#documentation-style) when adding new APIs or modifying header files. +- **DO** make sure there are no typos or spelling errors, especially in user-facing documentation. +- **DO** verify if your changes have impact elsewhere. For instance, do you need to update other docs or exiting markdown files that might be impacted? +- **DO** add relevant unit tests to ensure CI will catch future regressions. + +## Merging Pull Requests (for project contributors with write access) + +- **DO** use ["Squash and Merge"](https://github.com/blog/2141-squash-your-commits) by default for individual contributions unless requested by the PR author. + Do so, even if the PR contains only one commit. It creates a simpler history than "Create a Merge Commit". + Reasons that PR authors may request "Merge and Commit" may include (but are not limited to): + + - The change is easier to understand as a series of focused commits. Each commit in the series must be buildable so as not to break `git bisect`. + - Contributor is using an e-mail address other than the primary GitHub address and wants that preserved in the history. Contributor must be willing to squash + the commits manually before acceptance. + +## Developer Guide + +### Repo structure Most packages under the `services` directory in the SDK are generated from [Azure API specs][azure_rest_specs] using [Azure/autorest.go][] and [Azure/autorest][]. These generated packages depend on the HTTP client implemented at [Azure/go-autorest][]. Therefore when contributing, please make sure you do not change anything under the `services` directory. @@ -10,7 +53,24 @@ using [Azure/autorest.go][] and [Azure/autorest][]. These generated packages dep For bugs or feature requests you can submit them using the [Github issues page][issues] and filling the appropriate template. -## Building +### Codespaces + +Codespaces is new technology that allows you to use a container as your development environment. This repo provides a Codespaces container which is supported by both GitHub Codespaces and VS Code Codespaces. + +#### GitHub Codespaces + +1. From the Azure SDK GitHub repo, click on the "Code -> Open with Codespaces" button. +1. Open a Terminal. The development environment will be ready for you. Continue to [Building and Testing](https://github.com/Azure/azure-sdk-for-go/blob/main/CONTRIBUTING.md#building-and-testing). + +#### VS Code Codespaces + +1. Install the [VS Code Remote Extension Pack](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack) +1. When you open the Azure SDK for Go repo in VS Code, it will prompt you to open the project in the Dev Container. If it does not prompt you, then hit CTRL+P, and select "Remote-Containers: Open Folder in Container..." +1. Open a Terminal. The development environment will be ready for you. Continue to [Building and Testing](https://github.com/Azure/azure-sdk-for-go/blob/main/CONTRIBUTING.md#building-and-testing). + +### Building and Testing + +#### Building SDKs are either old (track 1) or new (track 2): @@ -23,14 +83,6 @@ To build, run `go build` from the respective SDK directory. There currently is not a repository wide way to build or regenerate code. -## Guidelines and Code of Conduct - -Also please see these [guidelines][guidelines] about contributing to Azure projects. - -This project follows the [Microsoft Open Source Code of Conduct][coc]. For more information see the [Code of Conduct FAQ][cocfaq]. Contact [opencode@microsoft.com][cocmail] with questions and comments. +#### Testing -[guidelines]: https://opensource.microsoft.com/collaborate/ -[coc]: https://opensource.microsoft.com/codeofconduct/ -[cocfaq]: https://opensource.microsoft.com/codeofconduct/faq/ -[cocmail]: mailto:opencode@microsoft.com -[issues]: https://github.com/Azure/Azure-sdk-for-go/issues +To test, run 'go test' from the respective directory.