2020-12-30 15:26:25 +00:00
|
|
|
# AdGuard Home Developer Guidelines
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
As of **March 2021**, following this document is obligatory for all new code.
|
|
|
|
Some of the rules aren't enforced as thoroughly or remain broken in old code,
|
|
|
|
but this is still the place to find out about what we **want** our code to look
|
|
|
|
like and how to improve it.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-20 15:06:07 +00:00
|
|
|
The rules are mostly sorted in the alphabetical order.
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## Contents
|
|
|
|
|
|
|
|
* [Git](#git)
|
|
|
|
* [Go](#go)
|
2021-03-25 13:55:54 +00:00
|
|
|
* [Code](#code)
|
2021-02-05 15:36:37 +00:00
|
|
|
* [Commenting](#commenting)
|
|
|
|
* [Formatting](#formatting)
|
2021-03-25 13:55:54 +00:00
|
|
|
* [Naming](#naming)
|
|
|
|
* [Testing](#testing)
|
2021-02-05 15:36:37 +00:00
|
|
|
* [Recommended Reading](#recommended-reading)
|
|
|
|
* [Markdown](#markdown)
|
|
|
|
* [Shell Scripting](#shell-scripting)
|
|
|
|
* [Text, Including Comments](#text-including-comments)
|
|
|
|
* [YAML](#yaml)
|
|
|
|
|
|
|
|
<!-- NOTE: Use the IDs that GitHub would generate in order for this to work both
|
|
|
|
on GitHub and most other Markdown renderers. -->
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="git" href="#git">Git</a>
|
2020-11-23 11:14:08 +00:00
|
|
|
|
|
|
|
* Call your branches either `NNNN-fix-foo` (where `NNNN` is the ID of the
|
2021-02-05 15:36:37 +00:00
|
|
|
GitHub issue you worked on in this branch) or just `fix-foo` if there was no
|
|
|
|
GitHub issue.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
|
|
|
* Follow the commit message header format:
|
|
|
|
|
|
|
|
```none
|
|
|
|
pkg: fix the network error logging issue
|
|
|
|
```
|
|
|
|
|
2021-01-11 12:59:42 +00:00
|
|
|
Where `pkg` is the directory or Go package (without the `internal/` part)
|
|
|
|
where most changes took place. If there are several such packages, or the
|
|
|
|
change is top-level only, write `all`.
|
2020-11-20 15:06:07 +00:00
|
|
|
|
|
|
|
* Keep your commit messages, including headers, to eighty (**80**) columns.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-20 15:06:07 +00:00
|
|
|
* Only use lowercase letters in your commit message headers. The rest of the
|
|
|
|
message should follow the plain text conventions below.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-23 11:14:08 +00:00
|
|
|
The only exceptions are direct mentions of identifiers from the source code
|
|
|
|
and filenames like `HACKING.md`.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="go" href="#go">Go</a>
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-12-08 15:23:35 +00:00
|
|
|
> Not Golang, not GO, not GOLANG, not GoLang. It is Go in natural language,
|
|
|
|
> golang for others.
|
|
|
|
|
|
|
|
— [@rakyll](https://twitter.com/rakyll/status/1229850223184269312)
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
### <a id="code" href="#code">Code</a>
|
|
|
|
|
|
|
|
* Always `recover` from panics in new goroutines. Preferably in the very
|
|
|
|
first statement. If all you want there is a log message, use
|
|
|
|
`agherr.LogPanic`.
|
|
|
|
|
|
|
|
* Avoid `errors.New`, use `aghnet.Error` instead.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-27 11:39:43 +00:00
|
|
|
* Avoid `goto`.
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2020-11-13 10:01:07 +00:00
|
|
|
* Avoid `init` and use explicit initialization functions instead.
|
|
|
|
|
|
|
|
* Avoid `new`, especially with structs.
|
|
|
|
|
2021-01-13 13:18:51 +00:00
|
|
|
* Check against empty strings like this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
if s == "" {
|
|
|
|
// …
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
Except when the check is done to then use the first character:
|
|
|
|
|
|
|
|
```go
|
|
|
|
if len(s) > 0 {
|
|
|
|
c := s[0]
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
2020-11-25 09:02:21 +00:00
|
|
|
* Constructors should validate their arguments and return meaningful errors.
|
|
|
|
As a corollary, avoid lazy initialization.
|
|
|
|
|
2021-03-11 09:17:54 +00:00
|
|
|
* Don't mix horizontal and vertical placement of arguments in function and
|
|
|
|
method calls. That is, either this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
err := f(a, b, c)
|
|
|
|
```
|
|
|
|
|
|
|
|
Or, when the arguments are too long, this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
err := functionWithALongName(
|
|
|
|
firstArgumentWithALongName,
|
|
|
|
secondArgumentWithALongName,
|
|
|
|
thirdArgumentWithALongName,
|
|
|
|
)
|
|
|
|
```
|
|
|
|
|
|
|
|
But **never** this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
err := functionWithALongName(firstArgumentWithALongName,
|
|
|
|
secondArgumentWithALongName,
|
|
|
|
thirdArgumentWithALongName,
|
|
|
|
)
|
|
|
|
```
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Don't use `fmt.Sprintf` where a more structured approach to string
|
|
|
|
conversion could be used. For example, `net.JoinHostPort` or
|
|
|
|
`url.(*URL).String`.
|
2020-11-16 16:45:31 +00:00
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Don't use naked `return`s.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-01-27 15:32:13 +00:00
|
|
|
* Don't write non-test code with more than four (**4**) levels of indentation.
|
|
|
|
Just like [Linus said], plus an additional level for an occasional error
|
|
|
|
check or struct initialization.
|
|
|
|
|
|
|
|
The exception proving the rule is the table-driven test code, where an
|
|
|
|
additional level of indentation is allowed.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
|
|
|
* Eschew external dependencies, including transitive, unless
|
|
|
|
absolutely necessary.
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Minimize scope of variables as much as possible.
|
2020-11-23 11:14:08 +00:00
|
|
|
|
2020-11-13 10:01:07 +00:00
|
|
|
* No shadowing, since it can often lead to subtle bugs, especially with
|
|
|
|
errors.
|
|
|
|
|
|
|
|
* Prefer constants to variables where possible. Reduce global variables. Use
|
|
|
|
[constant errors] instead of `errors.New`.
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Prefer to use named functions for goroutines.
|
|
|
|
|
2021-01-29 17:00:11 +00:00
|
|
|
* Program code lines should not be longer than one hundred (**100**) columns.
|
|
|
|
For comments, see the text section below.
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Use linters. `make go-lint`.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-27 11:39:43 +00:00
|
|
|
* Write logs and error messages in lowercase only to make it easier to `grep`
|
|
|
|
logs and error messages without using the `-i` flag.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
### <a id="commenting" href="#commenting">Commenting</a>
|
2020-11-27 11:39:43 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* See also the “[Text, Including Comments]” section below.
|
2020-11-27 11:39:43 +00:00
|
|
|
|
|
|
|
* Document everything, including unexported top-level identifiers, to build
|
|
|
|
a habit of writing documentation.
|
|
|
|
|
|
|
|
* Don't put identifiers into any kind of quotes.
|
|
|
|
|
|
|
|
* Put comments above the documented entity, **not** to the side, to improve
|
|
|
|
readability.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
|
|
|
* When a method implements an interface, start the doc comment with the
|
|
|
|
standard template:
|
|
|
|
|
|
|
|
```go
|
|
|
|
// Foo implements the Fooer interface for *foo.
|
|
|
|
func (f *foo) Foo() {
|
2020-12-17 10:32:46 +00:00
|
|
|
// …
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
When the implemented interface is unexported:
|
|
|
|
|
|
|
|
```go
|
|
|
|
// Unwrap implements the hidden wrapper interface for *fooError.
|
|
|
|
func (err *fooError) Unwrap() (unwrapped error) {
|
|
|
|
// …
|
2020-11-13 10:01:07 +00:00
|
|
|
}
|
|
|
|
```
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
### <a id="formatting" href="#formatting">Formatting</a>
|
2020-11-27 11:39:43 +00:00
|
|
|
|
2021-03-31 13:00:47 +01:00
|
|
|
* Decorate `break`, `continue`, `fallthrough`, `return`, and other function
|
|
|
|
exit points with empty lines unless it's the only statement in that block.
|
2020-11-27 11:39:43 +00:00
|
|
|
|
|
|
|
* Use `gofumpt --extra -s`.
|
|
|
|
|
2020-11-13 10:01:07 +00:00
|
|
|
* Write slices of struct like this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
ts := []T{{
|
|
|
|
Field: Value0,
|
|
|
|
// …
|
|
|
|
}, {
|
|
|
|
Field: Value1,
|
|
|
|
// …
|
|
|
|
}, {
|
|
|
|
Field: Value2,
|
|
|
|
// …
|
|
|
|
}}
|
|
|
|
```
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
### <a id="naming" href="#naming">Naming</a>
|
|
|
|
|
|
|
|
* Don't use underscores in file and package names, unless they're build tags
|
|
|
|
or for tests. This is to prevent accidental build errors with weird tags.
|
|
|
|
|
|
|
|
* Name benchmarks and tests using the same convention as examples. For
|
|
|
|
example:
|
|
|
|
|
|
|
|
```go
|
|
|
|
func TestFunction(t *testing.T) { /* … */ }
|
|
|
|
func TestFunction_suffix(t *testing.T) { /* … */ }
|
|
|
|
func TestType_Method(t *testing.T) { /* … */ }
|
|
|
|
func TestType_Method_suffix(t *testing.T) { /* … */ }
|
|
|
|
```
|
|
|
|
|
|
|
|
* Name parameters in interface definitions:
|
|
|
|
|
|
|
|
```go
|
|
|
|
type Frobulator interface {
|
|
|
|
Frobulate(f Foo, b Bar) (r Result, err error)
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
* Name the deferred errors (e.g. when closing something) `derr`.
|
|
|
|
|
|
|
|
* Unused arguments in anonymous functions must be called `_`:
|
|
|
|
|
|
|
|
```go
|
|
|
|
v.onSuccess = func(_ int, msg string) {
|
|
|
|
// …
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
* Use named returns to improve readability of function signatures.
|
|
|
|
|
|
|
|
### <a id="testing" href="#testing">Testing</a>
|
|
|
|
|
|
|
|
* Use `assert.NoError` and `require.NoError` instead of `assert.Nil` and
|
|
|
|
`require.Nil` on errors.
|
|
|
|
|
|
|
|
* Use functions like `require.Foo` instead of `assert.Foo` when the test
|
|
|
|
cannot continue if the condition is false.
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
### <a id="recommended-reading" href="#recommended-reading">Recommended Reading</a>
|
2020-11-27 11:39:43 +00:00
|
|
|
|
|
|
|
* <https://github.com/golang/go/wiki/CodeReviewComments>.
|
|
|
|
|
|
|
|
* <https://github.com/golang/go/wiki/TestComments>.
|
|
|
|
|
|
|
|
* <https://go-proverbs.github.io/>
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
[constant errors]: https://dave.cheney.net/2016/04/07/constant-errors
|
|
|
|
[Linus said]: https://www.kernel.org/doc/html/v4.17/process/coding-style.html#indentation
|
|
|
|
[Text, Including Comments]: #text-including-comments
|
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="markdown" href="#markdown">Markdown</a>
|
|
|
|
|
|
|
|
* **TODO(a.garipov):** Define more Markdown conventions.
|
|
|
|
|
|
|
|
* Prefer triple-backtick preformatted code blocks to indented code blocks.
|
|
|
|
|
|
|
|
* Use asterisks and not underscores for bold and italic.
|
2020-11-20 15:06:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* Use either link references or link destinations only. Put all link
|
|
|
|
reference definitions at the end of the second-level block.
|
2020-11-20 15:06:07 +00:00
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="shell-scripting" href="#shell-scripting">Shell Scripting</a>
|
2020-12-08 15:23:35 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* Avoid bashisms and GNUisms, prefer POSIX features only.
|
2020-12-08 15:23:35 +00:00
|
|
|
|
|
|
|
* Prefer `'raw strings'` to `"double quoted strings"` whenever possible.
|
|
|
|
|
|
|
|
* Put spaces within `$( cmd )`, `$(( expr ))`, and `{ cmd; }`.
|
|
|
|
|
2020-12-18 11:19:42 +00:00
|
|
|
* Put utility flags in the ASCII order and **don't** group them together. For
|
|
|
|
example, `ls -1 -A -q`.
|
|
|
|
|
2021-04-09 13:07:18 +01:00
|
|
|
* Script code lines should not be longer than one hundred (**100**) columns.
|
|
|
|
For comments, see the text section below.
|
|
|
|
|
2020-12-25 10:50:52 +00:00
|
|
|
* `snake_case`, not `camelCase` for variables. `kebab-case` for filenames.
|
|
|
|
|
|
|
|
* UPPERCASE names for external exported variables, lowercase for local,
|
|
|
|
unexported ones.
|
2020-12-10 11:35:07 +00:00
|
|
|
|
2020-12-08 15:23:35 +00:00
|
|
|
* Use `set -e -f -u` and also `set -x` in verbose mode.
|
|
|
|
|
2020-12-25 10:50:52 +00:00
|
|
|
* Use `readonly` liberally.
|
|
|
|
|
2020-12-08 15:23:35 +00:00
|
|
|
* Use the `"$var"` form instead of the `$var` form, unless word splitting is
|
|
|
|
required.
|
|
|
|
|
2020-12-18 11:19:42 +00:00
|
|
|
* When concatenating, always use the form with curly braces to prevent
|
|
|
|
accidental bad variable names. That is, `"${var}_tmp.txt"` and **not**
|
|
|
|
`"$var_tmp.txt"`. The latter will try to lookup variable `var_tmp`.
|
|
|
|
|
|
|
|
* When concatenating, surround the whole string with quotes. That is, use
|
|
|
|
this:
|
|
|
|
|
|
|
|
```sh
|
|
|
|
dir="${TOP_DIR}/sub"
|
|
|
|
```
|
|
|
|
|
|
|
|
And **not** this:
|
|
|
|
|
|
|
|
```sh
|
|
|
|
# Bad!
|
|
|
|
dir="${TOP_DIR}"/sub
|
|
|
|
```
|
|
|
|
|
2021-04-09 13:07:18 +01:00
|
|
|
* When using `test` (aka `[`), spell compound conditions with `&&`, `||`, and
|
|
|
|
`!` **outside** of `test` instead of `-a`, `-o`, and `!` inside of `test`
|
|
|
|
correspondingly. The latter ones are pretty much deprecated in POSIX.
|
|
|
|
|
|
|
|
See also: “[Problems With the `test` Builtin: What Does `-a` Mean?]”.
|
|
|
|
|
|
|
|
[Problems With the `test` Builtin: What Does `-a` Mean?]: https://www.oilshell.org/blog/2017/08/31.html
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="text-including-comments" href="#text-including-comments">Text, Including Comments</a>
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-20 15:06:07 +00:00
|
|
|
* End sentences with appropriate punctuation.
|
|
|
|
|
|
|
|
* Headers should be written with all initial letters capitalized, except for
|
|
|
|
references to variable names that start with a lowercase letter.
|
|
|
|
|
|
|
|
* Start sentences with a capital letter, unless the first word is a reference
|
|
|
|
to a variable name that starts with a lowercase letter.
|
|
|
|
|
2020-11-13 10:01:07 +00:00
|
|
|
* Text should wrap at eighty (**80**) columns to be more readable, to use
|
|
|
|
a common standard, and to allow editing or diffing side-by-side without
|
|
|
|
wrapping.
|
|
|
|
|
|
|
|
The only exception are long hyperlinks.
|
|
|
|
|
|
|
|
* Use U.S. English, as it is the most widely used variety of English in the
|
|
|
|
code right now as well as generally.
|
|
|
|
|
|
|
|
* Use double spacing between sentences to make sentence borders more clear.
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* Use the serial comma (a.k.a. Oxford comma) to improve comprehension,
|
2020-11-13 10:01:07 +00:00
|
|
|
decrease ambiguity, and use a common standard.
|
|
|
|
|
|
|
|
* Write todos like this:
|
|
|
|
|
|
|
|
```go
|
|
|
|
// TODO(usr1): Fix the frobulation issue.
|
|
|
|
```
|
|
|
|
|
|
|
|
Or, if several people need to look at the code:
|
|
|
|
|
|
|
|
```go
|
|
|
|
// TODO(usr1, usr2): Fix the frobulation issue.
|
|
|
|
```
|
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
## <a id="yaml" href="#yaml">YAML</a>
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2020-11-20 15:06:07 +00:00
|
|
|
* **TODO(a.garipov):** Define naming conventions for schema names in our
|
2021-02-05 15:36:37 +00:00
|
|
|
OpenAPI YAML file. And just generally OpenAPI conventions.
|
2020-11-20 15:06:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* **TODO(a.garipov):** Find a YAML formatter or write our own.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* All strings, including keys, must be quoted. Reason: the “[NO-rway Law]”.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
* Indent with two (**2**) spaces. YAML documents can get pretty
|
2020-11-20 15:06:07 +00:00
|
|
|
deeply-nested.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
|
|
|
* No extra indentation in multiline arrays:
|
|
|
|
|
|
|
|
```yaml
|
|
|
|
'values':
|
|
|
|
- 'value-1'
|
|
|
|
- 'value-2'
|
|
|
|
- 'value-3'
|
|
|
|
```
|
|
|
|
|
2020-11-20 15:06:07 +00:00
|
|
|
* Prefer single quotes for strings to prevent accidental escaping, unless
|
|
|
|
escaping is required or there are single quotes inside the string (e.g. for
|
2021-02-05 15:36:37 +00:00
|
|
|
GitHub Actions).
|
2020-11-20 15:06:07 +00:00
|
|
|
|
2021-03-25 13:55:54 +00:00
|
|
|
* Use `>` for multiline strings, unless you need to keep the line breaks. Use
|
|
|
|
`|` for multiline strings when you do.
|
2020-11-13 10:01:07 +00:00
|
|
|
|
2021-02-05 15:36:37 +00:00
|
|
|
[NO-rway Law]: https://news.ycombinator.com/item?id=17359376
|