Merge in DNS/adguard-home from 2276-releases to master Updates #2276. Squashed commit of the following: commit 84961947c51477aae53606ec6e2e0cce0bdfc139 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:36:13 2020 +0300 all: fix github build commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 14:34:02 2020 +0300 all: remove old Dockerfile, improve build scripts commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e Merge: 2292b677a5e20ac7ed
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:47:19 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 30 13:30:10 2020 +0300 all: improve docker build commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc Merge: c7d3f12efaef4659e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 17:47:45 2020 +0300 Merge branch 'master' into WIP-2276-releases commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 16:28:25 2020 +0300 all: improve build scripts commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 15:36:47 2020 +0300 all: fix Makefile commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 14:16:19 2020 +0300 scripts: fix build-release commit ecc0577e2451afa86c37da7283a63a9d26fb37ba Merge: dde64ed8e483f02c92
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 29 13:59:32 2020 +0300 Merge branch 'master' into WIP-2276-releases commit dde64ed8e456f73559f21c2ca549dc3b46724add Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 18:04:46 2020 +0300 all: imp docs, other improvements commit be8574408db79901bb15c1d31916db3ca352a35f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 14:48:30 2020 +0300 all: imp docker build commit fc1876f34b93d667bf166226f4bc666d394f10c7 Merge: fa5a304c8955b735c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 25 13:54:29 2020 +0300 Merge branch 'master' into WIP-2276-releases commit fa5a304c83d86145796a2de4141de6d18f7c56bf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 19:10:51 2020 +0300 all: improve scripts commit 3f32e3fd5e658d058d5c5172519384efc6cfef83 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:50:01 2020 +0300 all: improve scripts commit 2d38b81421acab4b90a7a19da7598c75063e8e93 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:25:21 2020 +0300 all: fix shell for windows, improve go-lint.sh commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049 Merge: 313b020e99fb6bf82c
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:14:38 2020 +0300 Merge branch 'master' into WIP-2276-releases commit 313b020e9dfcdab736670cee72b2171eac8c32b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 18:13:31 2020 +0300 Makefile: use npm ci again commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:57:54 2020 +0300 all: try fixing windows build commit c63a2a54641ac8cd032a3306bb35e49b9ae74728 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:39:30 2020 +0300 all: imp scripts, try another goproxy and direct commit 423229e8b63ee73caeee8e84c23f67d145aff9df Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 24 17:25:29 2020 +0300 all: imp HACKING.md, try a new proxy ... and 1 more commit
7.8 KiB
AdGuard Home 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 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)
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 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.