Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following: commit 507d038c2709de59246fc0b65c3c4ab8e38d1990 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:33:05 2021 +0300 aghtest: fix file name commit 8e19f99337bee1d88ad6595adb96f9bb23fa3c41 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:06:43 2021 +0300 aghnet: rm redundant mutexes commit 361fa418b33ed160ca20862be1c455ab9378c03f Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:45:30 2021 +0300 all: fix names, docs commit 14034f4f0230d7aaa3645054946ae5c278089a99 Merge: 35e265cca72ce1cf
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:38:15 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit 35e265cc8cd308ef1fda414b58c0217cb5f258e4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:33:35 2021 +0300 aghnet: imp naming commit 7a7edac7208a40697d7bc50682b923a144e28e2b Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:59:54 2021 +0300 changelog: oops, nope yet commit d26a5d2513daf662ac92053b5e235189a64cc022 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:55:53 2021 +0300 all: some renaming for the glory of semantics commit 9937fa619452b0742616217b975e3ff048d58acb Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 29 15:34:42 2021 +0300 all: log changes commit d8d9e6dfeea8474466ee25f27021efdd3ddb1592 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 18:32:23 2021 +0300 all: imp localresolver, imp cutting off own addresses commit 344140df449b85925f19b460fd7dc7c08e29c35a Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 14:53:33 2021 +0300 all: imp code quality commit 1c5c0babec73b125044e23dd3aa75d8eefc19b28 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:44:08 2021 +0300 all: fix go.mod commit 0b9fb3c2369a752e893af8ddc45a86bb9fb27ce5 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:38:51 2021 +0300 all: add error handling commit a7a2e51f57fc6f8f74b95a264ad345cd2a9e026e Merge: c13be63427f4f052
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 19:48:36 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit c13be634f47bcaed9320a732a51c0e4752d0dad0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 18:52:28 2021 +0300 all: cover rdns with tests, imp aghnet functionality commit 48bed9025944530c613ee53e7961d6d5fbabf8be Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 20:18:07 2021 +0300 home: make rdns great again commit 1dbacfc8d5b6895807797998317fe3cc814617c1 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 16:07:52 2021 +0300 all: imp external client restriction commit 1208a319a7f4ffe7b7fa8956f245d7a19437c0a4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 22 15:26:45 2021 +0300 all: finish local ptr processor commit c8827fc3db289e1a5d7a11d057743bab39957b02 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 2 13:41:22 2021 +0300 all: imp ipdetector, add local ptr processor
11 KiB
AdGuard Home Developer Guidelines
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.
The rules are mostly sorted in the alphabetical order.
Contents
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 directory or Go package (without theinternal/
part) 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
-
Always
recover
from panics in new goroutines. Preferably in the very first statement. If all you want there is a log message, useagherr.LogPanic
. -
Avoid
errors.New
, useaghnet.Error
instead. -
Avoid
goto
. -
Avoid
init
and use explicit initialization functions instead. -
Avoid
new
, especially with structs. -
Check against empty strings like this:
if s == "" { // … }
Except when the check is done to then use the first character:
if len(s) > 0 { c := s[0] }
-
Constructors should validate their arguments and return meaningful errors. As a corollary, avoid lazy initialization.
-
Don't mix horizontal and vertical placement of arguments in function and method calls. That is, either this:
err := f(a, b, c)
Or, when the arguments are too long, this:
err := functionWithALongName( firstArgumentWithALongName, secondArgumentWithALongName, thirdArgumentWithALongName, )
But never this:
err := functionWithALongName(firstArgumentWithALongName, secondArgumentWithALongName, thirdArgumentWithALongName, )
-
Don't use
fmt.Sprintf
where a more structured approach to string conversion could be used. For example,net.JoinHostPort
orurl.(*URL).String
. -
Don't use naked
return
s. -
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.
-
Eschew external dependencies, including transitive, unless absolutely necessary.
-
Minimize scope of variables as much as possible.
-
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
. -
Prefer to use named functions for goroutines.
-
Program code lines should not be longer than one hundred (100) columns. For comments, see the text section below.
-
Use linters.
make go-lint
. -
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
-
Decorate
break
,continue
,fallthrough
,return
, and other function exit points with empty lines 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, // … }}
Naming
-
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:
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:
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
_
:v.onSuccess = func(_ int, msg string) { // … }
-
Use named returns to improve readability of function signatures.
Testing
-
Use
assert.NoError
andrequire.NoError
instead ofassert.Nil
andrequire.Nil
on errors. -
Use functions like
require.Foo
instead ofassert.Foo
when the test cannot continue if the condition is false.
Recommended Reading
Markdown
-
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.
-
Use either link references or link destinations only. Put all link reference definitions at the end of the second-level block.
Shell Scripting
-
Avoid bashisms and GNUisms, prefer POSIX features only.
-
Prefer
'raw strings'
to"double quoted strings"
whenever possible. -
Put spaces within
$( cmd )
,$(( expr ))
, and{ cmd; }
. -
Put utility flags in the ASCII order and don't group them together. For example,
ls -1 -A -q
. -
snake_case
, notcamelCase
for variables.kebab-case
for filenames. -
UPPERCASE names for external exported variables, lowercase for local, unexported ones.
-
Use
set -e -f -u
and alsoset -x
in verbose mode. -
Use
readonly
liberally. -
Use the
"$var"
form instead of the$var
form, unless word splitting is required. -
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 variablevar_tmp
. -
When concatenating, surround the whole string with quotes. That is, use this:
dir="${TOP_DIR}/sub"
And not this:
# Bad! dir="${TOP_DIR}"/sub
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. Use|
for multiline strings when you do.