Merge in DNS/adguard-home from 2102-rules-result to master Updates #2102. Squashed commit of the following: commit 47b2aa94c56b37be492c3c01e8111054612d9722 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 17 13:12:27 2020 +0300 querylog: remove pre-v0.99.3 compatibility code commit 2af0ee43c2444a7d842fcff057f2ba02f300244b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 17 13:00:27 2020 +0300 all: improve documentation commit 3add300a42f0aa67bb315a448e294636c85d0b3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 16 18:30:01 2020 +0300 all: improve changelog commit e04ef701fc2de7f4453729e617641c47e0883679 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 16 17:56:53 2020 +0300 all: improve code and documentation commit 4f04845ae275ae4291869e00c62e4ff81b01eaa3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 16 17:01:08 2020 +0300 all: document changes, improve api commit bc59b7656a402d0c65f13bd74a71d8dda6a8a65d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 15 18:22:01 2020 +0300 all: allow multiple rules in dns filter results
6.9 KiB
AdGuardHome Developer Guidelines
As of December 2020, this document is partially a work-in-progress, but should still be followed. 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.
The rules are mostly sorted in the alphabetical order.
Git
-
Call your branches either
NNNN-fix-foo
(whereNNNN
is the ID of the GitHub issue you worked on in this branch) or justfix-foo
if there was no GitHub issue. -
Follow the commit message header format:
pkg: fix the network error logging issue
Where
pkg
is the package where most changes took place. If there are several such packages, or the change is top-level only, writeall
. -
Keep your commit messages, including headers, to eighty (80) columns.
-
Only use lowercase letters in your commit message headers. The rest of the message should follow the plain text conventions below.
The only exceptions are direct mentions of identifiers from the source code and filenames like
HACKING.md
.
Go
Not Golang, not GO, not GOLANG, not GoLang. It is Go in natural language, golang for others.
— @rakyll
Code And Naming
-
Avoid
goto
. -
Avoid
init
and use explicit initialization functions instead. -
Avoid
new
, especially with structs. -
Constructors should validate their arguments and return meaningful errors. As a corollary, avoid lazy initialization.
-
Don't use naked
return
s. -
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.
-
Don't write 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.
-
Eschew external dependencies, including transitive, unless absolutely necessary.
-
Name benchmarks and tests using the same convention as examples. For example:
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 the deferred errors (e.g. when closing something)
cerr
. -
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
. -
Unused arguments in anonymous functions must be called
_
:v.onSuccess = func(_ int, msg string) { // … }
-
Use linters.
-
Use named returns to improve readability of function signatures.
-
Write logs and error messages in lowercase only to make it easier to
grep
logs and error messages without using the-i
flag.
Commenting
-
See also the Text, Including Comments section below.
-
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.
-
When a method implements an interface, start the doc comment with the standard template:
// Foo implements the Fooer interface for *foo. func (f *foo) Foo() { // … }
When the implemented interface is unexported:
// Unwrap implements the hidden wrapper interface for *fooError. func (err *fooError) Unwrap() (unwrapped error) { // … }
Formatting
-
Add an empty line before
break
,continue
,fallthrough
, andreturn
, unless it's the only statement in that block. -
Use
gofumpt --extra -s
. -
Write slices of struct like this:
ts := []T{{ Field: Value0, // … }, { Field: Value1, // … }, { Field: Value2, // … }}
Recommended Reading
Markdown
- TODO(a.garipov): Define our Markdown conventions.
Shell Scripting
-
Avoid bashisms, prefer POSIX features only.
-
Prefer
'raw strings'
to"double quoted strings"
whenever possible. -
Put spaces within
$( cmd )
,$(( expr ))
, and{ cmd; }
. -
snake_case
, notcamelCase
. -
Use
set -e -f -u
and alsoset -x
in verbose mode. -
Use the
"$var"
form instead of the$var
form, unless word splitting is required.
Text, Including Comments
-
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.
-
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.
-
Use the serial comma (a.k.a. Oxford comma) to improve comprehension, decrease ambiguity, and use a common standard.
-
Write todos like this:
// TODO(usr1): Fix the frobulation issue.
Or, if several people need to look at the code:
// TODO(usr1, usr2): Fix the frobulation issue.
YAML
-
TODO(a.garipov): Define naming conventions for schema names in our OpenAPI YAML file. And just generally OpenAPI conventions.
-
TODO(a.garipov): Find a YAML formatter or write our own.
-
All strings, including keys, must be quoted. Reason: the NO-rway Law.
-
Indent with two (2) spaces. YAML documents can get pretty deeply-nested.
-
No extra indentation in multiline arrays:
'values': - 'value-1' - 'value-2' - 'value-3'
-
Prefer single quotes for strings to prevent accidental escaping, unless escaping is required or there are single quotes inside the string (e.g. for GitHub Actions).
-
Use
>
for multiline strings, unless you need to keep the line breaks.