docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep replace keep keep replace keep keep keep | <mask>
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
<mask> case ctFilteringStatus:
<mask> // Go on, as we currently don't do quick matches against
<mask> // filtering statuses.
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove term := strings.ToLower(c.value)
</s> add </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> add (asciiTerm != "" && containsFold(host, asciiTerm)) || | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep keep replace keep keep keep keep keep | <mask> name = e.client.Name
<mask> }
<mask>
<mask> ip := e.IP.String()
<mask> term := strings.ToLower(c.value)
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep keep replace keep keep replace keep | <mask>
<mask> ip := e.IP.String()
<mask> term := strings.ToLower(c.value)
<mask> if c.strict {
<mask> return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
<mask> }
<mask>
<mask> return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
<mask> }
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove term := strings.ToLower(c.value)
</s> add </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove return c.ctDomainOrClientCaseNonStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep replace keep replace keep keep | <mask>
<mask> // How to test on a real Linux machine:
<mask> //
<mask> // 1. Run:
<mask> //
<mask> // sudo ipset create example_set hash:ip family ipv4
<mask> //
<mask> // 2. Run:
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
keep replace keep replace keep keep keep keep | <mask> //
<mask> // 2. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
//
// 4. Start AdGuardHome.
//
// 5. Make requests to example.com and its subdomains.
//
// 6. Run:
//
// sudo ipset list example_set
//
// The Members field should contain the resolved IP addresses.
</s> add // 6. Run "sudo ipset list example_set". The Members field should contain the
// resolved IP addresses. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
keep replace keep replace replace replace replace replace replace replace replace replace replace replace keep | <mask> //
<mask> // The Members field should be empty.
<mask> //
<mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> //
<mask> // 4. Start AdGuardHome.
<mask> //
<mask> // 5. Make requests to example.com and its subdomains.
<mask> //
<mask> // 6. Run:
<mask> //
<mask> // sudo ipset list example_set
<mask> //
<mask> // The Members field should contain the resolved IP addresses.
<mask>
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/aghnet/ipset_linux.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8
<mask> github.com/kisielk/errcheck v1.6.2
<mask> github.com/kyoh86/looppointer v0.1.7
<mask> github.com/securego/gosec/v2 v2.13.1
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
<mask> honnef.co/go/tools v0.3.3
<mask> mvdan.cc/gofumpt v0.3.1
<mask> mvdan.cc/unparam v0.0.0-20220831102321-2fc90a84c7ec
<mask> )
<mask>
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
keep keep replace keep replace keep keep keep | <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. </s> remove // sudo ipset create example_set hash:ip family ipv4
</s> add // 2. Run "sudo ipset list example_set". The Members field should be empty. | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
keep keep keep keep replace keep keep | <mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> )
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove // 1. Run:
</s> add // 1. Run "sudo ipset create example_set hash:ip family ipv4". </s> remove // 2. Run:
</s> add // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. </s> remove // sudo ipset list example_set
</s> add // 4. Start AdGuardHome. </s> remove // The Members field should be empty.
</s> add // 5. Make requests to example.com and its subdomains. | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
<mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
<mask> golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao=
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54=
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
<mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
<mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 h1:aE4T3aJwdCNz+s35ScSQYUzeGu7BOLDHZ1bBHVurqqY=
<mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05 h1:NWQHMTdThZhCArzUbnu1Bh+l3LdwUfjZws+ivBR2sxM=
<mask> golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request: imp-scripts
Merge in DNS/adguard-home from imp-scripts to master
Squashed commit of the following:
commit ab63a8a2dd1b64287e00a2a6f747fd48b530709e
Author: Ainar Garipov <[email protected]>
Date: Wed Sep 21 19:15:06 2022 +0300
all: imp scripts; upd tools; doc </s> remove golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
golang.org/x/vuln v0.0.0-20220912202342-0ed43f12cb05
</s> add golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5
golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o=
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA=
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
</s> add golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/11e4f09165fa48522efc13896b0e830ea69e5bd2 | internal/tools/go.sum |
keep keep replace replace replace keep keep replace replace keep keep keep | <mask> 'version': 2
<mask> 'plan':
<mask> 'project-key': 'AGH'
<mask> 'key': 'AGHBSNAPSPECS'
<mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
</s> add 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Build frontend'
<mask>
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Make release'
<mask>
<mask> - 'Make and publish docker':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Make and publish docker'
<mask>
<mask> - 'Publish to static storage':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Publish to static storage'
<mask>
<mask> - 'Publish to GitHub Releases':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Publish to GitHub Releases'
<mask>
<mask> 'Build frontend':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.YARN_DIR}': '${bamboo.cacheYarn}'
<mask> 'key': 'BF'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "${bamboo.repository.revision.number}"
<mask>
<mask> make js-deps js-build
<mask> 'artifacts':
<mask> - 'name': 'AdGuardHome frontend'
<mask> 'pattern': 'build*/**'
<mask> 'shared': true
<mask> 'required': true
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make release':
<mask> 'docker':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make release':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
<mask> '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
<mask> 'key': 'MR'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "${bamboo.repository.revision.number}"
<mask>
<mask> # Run the build with the specified channel.
<mask> echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
<mask> | awk '{ gsub(/\\n/, "\n"); print; }'\
<mask> | gpg --import --batch --yes
<mask>
<mask> make\
<mask> CHANNEL=${bamboo.channel}\
<mask> GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
<mask> FRONTEND_PREBUILT=1\
<mask> PARALLELISM=1\
<mask> VERBOSE=2\
<mask> build-release
<mask> # TODO(a.garipov): Use more fine-grained artifact rules.
<mask> 'artifacts':
<mask> - 'name': 'AdGuardHome dists'
<mask> 'pattern': 'dist/**'
<mask> 'shared': true
<mask> 'required': true
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Make and publish docker':
<mask> 'key': 'MPD'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> COMMIT="${bamboo.repository.revision.number}"
<mask> export COMMIT
<mask> readonly COMMIT
<mask>
<mask> # Explicitly checkout the revision that we need.
<mask> git checkout "$COMMIT"
<mask>
<mask> # Install Qemu, create builder.
<mask> docker version -f '{{ .Server.Experimental }}'
<mask> docker buildx rm buildx-builder || :
<mask> docker buildx create --name buildx-builder --driver docker-container\
<mask> --use
<mask> docker buildx inspect --bootstrap
<mask>
<mask> # Login to DockerHub.
<mask> docker login -u="${bamboo.dockerHubUsername}"\
<mask> -p="${bamboo.dockerHubPassword}"
<mask>
<mask> # Boot the builder.
<mask> docker buildx inspect --bootstrap
<mask>
<mask> # Print Docker info.
<mask> docker info
<mask>
<mask> # Prepare and push the build.
<mask> env\
<mask> CHANNEL="${bamboo.channel}"\
<mask> DIST_DIR='dist'\
<mask> DOCKER_IMAGE_NAME='adguard/adguardhome'\
<mask> DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
<mask> VERBOSE='1'\
<mask> sh ./scripts/make/build-docker.sh
<mask> 'environment':
<mask> DOCKER_CLI_EXPERIMENTAL=enabled
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to static storage':
<mask> 'key': 'PUB'
<mask> 'other':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to static storage':
<mask> 'key': 'PUB'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'clean'
<mask> - 'checkout':
<mask> 'repository': 'bamboo-deploy-publisher'
<mask> 'path': 'bamboo-deploy-publisher'
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> cd ./dist/
<mask>
<mask> CHANNEL="${bamboo.channel}"
<mask> export CHANNEL
<mask>
<mask> ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to GitHub Releases':
<mask> 'key': 'PTGR'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'clean'
<mask> - 'checkout':
<mask> 'repository': 'bamboo-deploy-publisher'
<mask> 'path': 'bamboo-deploy-publisher'
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask>
<mask> channel="${bamboo.channel}"
<mask> readonly channel
<mask>
<mask> if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
<mask> then
<mask> echo "don't publish to GitHub Releases for this channel"
<mask>
<mask> exit 0
<mask> fi
<mask>
<mask> cd ./dist/
<mask>
<mask> env\
<mask> GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
<mask> ../bamboo-deploy-publisher/deploy.sh adguard-home-github
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'triggers':
<mask> # Don't use minute values that end with a zero or a five as these are often used
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep replace replace replace keep replace replace replace replace replace replace replace replace | <mask> 'triggers':
<mask> # Don't use minute values that end with a zero or a five as these are often used
<mask> # in CI and so resources during these minutes can be quite busy.
<mask> - 'cron': '0 42 13 ? * MON-FRI *'
<mask> 'branches':
<mask> 'create': 'manually'
<mask> 'delete':
<mask> 'after-deleted-days': 1
<mask> 'after-inactive-days': 30
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'AdGuard Home - Build and publish release'
<mask> 'link-to-jira': true
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep keep keep replace replace replace replace replace replace keep keep keep replace keep keep keep keep | <mask> 'merge-from': 'AdGuard Home - Build and publish release'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-completed'
<mask> 'recipients':
<mask> - 'webhook':
<mask> 'name': 'Build webhook'
<mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
<mask>
<mask> 'branch-overrides':
<mask> # beta-vX.Y branches are the branches into which the commits that are needed to
<mask> # release a new patch version are initially cherry-picked.
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
<mask>
<mask> 'branch-overrides':
<mask> # beta-vX.Y branches are the branches into which the commits that are needed to
<mask> # release a new patch version are initially cherry-picked.
<mask> - '^beta-v[0-9]+\.[0-9]+':
<mask> # Build betas on release branches manually.
<mask> 'triggers': []
<mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'beta-v0.107'
<mask> # Build final releases on release branches manually.
<mask> 'triggers': []
<mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/release.yaml |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> env\
<mask> VERBOSE='1'\
<mask> sh ./scripts/snap/build.sh
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'Publish to Snapstore':
<mask> 'artifact-subscriptions':
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove set -e -f -u -x
</s> add set -e -f -u -x </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/snapcraft.yaml |
keep replace replace replace keep replace keep keep keep keep | <mask> 'plan':
<mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release'
</s> add 'project-key': 'AGH'
'key': 'AGHBSNAPSPECS'
'name': 'AdGuard Home - Build and publish release' </s> remove - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test'
</s> add - 'Tests':
'manual': false
'final': false
'jobs':
- 'Test' </s> remove 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true
</s> add 'create': 'for-pull-request'
'delete':
'after-deleted-days': 1
'after-inactive-days': 5
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and run tests'
'link-to-jira': true </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
keep keep keep replace replace replace replace replace keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <mask> 'dockerGo': 'adguard/golang-ubuntu:6.7'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
<mask> 'jobs':
<mask> - 'Test'
<mask>
<mask> 'Test':
<mask> 'docker':
<mask> 'image': '${bamboo.dockerGo}'
<mask> 'volumes':
<mask> '${system.YARN_DIR}': '${bamboo.cacheYarn}'
<mask> '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
<mask> '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
<mask> 'key': 'TEST'
<mask> 'other':
<mask> 'clean-working-dir': true
<mask> 'tasks':
<mask> - 'checkout':
<mask> 'force-clean-build': true
<mask> - 'script':
<mask> 'interpreter': 'SHELL'
<mask> 'scripts':
<mask> - |
<mask> #!/bin/sh
<mask>
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'MR'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
# Run the build with the specified channel.
echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
| awk '{ gsub(/\\n/, "\n"); print; }'\
| gpg --import --batch --yes
make\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
FRONTEND_PREBUILT=1\
PARALLELISM=1\
VERBOSE=2\
build-release
# TODO(a.garipov): Use more fine-grained artifact rules.
'artifacts':
- 'name': 'AdGuardHome dists'
'pattern': 'dist/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases'
</s> add - 'Build frontend':
'manual': false
'final': false
'jobs':
- 'Build frontend'
- 'Make release':
'manual': false
'final': false
'jobs':
- 'Make release'
- 'Make and publish docker':
'manual': false
'final': false
'jobs':
- 'Make and publish docker'
- 'Publish to static storage':
'manual': false
'final': false
'jobs':
- 'Publish to static storage'
- 'Publish to GitHub Releases':
'manual': false
'final': false
'jobs':
- 'Publish to GitHub Releases' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
keep replace keep replace replace replace replace replace | <mask>
<mask> set -e -f -u -x
<mask>
<mask> make VERBOSE=1 ci go-tools lint
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build*/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true'
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'key': 'BF'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
# Explicitly checkout the revision that we need.
git checkout "${bamboo.repository.revision.number}"
make js-deps js-build
'artifacts':
- 'name': 'AdGuardHome frontend'
'pattern': 'build/**'
'shared': true
'required': true
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PTGR'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
channel="${bamboo.channel}"
readonly channel
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
then
echo "don't publish to GitHub Releases for this channel"
exit 0
fi
cd ./dist/
env\
GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-github
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'MPD'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
COMMIT="${bamboo.repository.revision.number}"
export COMMIT
readonly COMMIT
# Explicitly checkout the revision that we need.
git checkout "$COMMIT"
# Install Qemu, create builder.
docker version -f '{{ .Server.Experimental }}'
docker buildx rm buildx-builder || :
docker buildx create --name buildx-builder --driver docker-container\
--use
docker buildx inspect --bootstrap
# Login to DockerHub.
docker login -u="${bamboo.dockerHubUsername}"\
-p="${bamboo.dockerHubPassword}"
# Boot the builder.
docker buildx inspect --bootstrap
# Print Docker info.
docker info
# Prepare and push the build.
env\
CHANNEL="${bamboo.channel}"\
DIST_DIR='dist'\
DOCKER_IMAGE_NAME='adguard/adguardhome'\
DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
VERBOSE='1'\
sh ./scripts/make/build-docker.sh
'environment':
DOCKER_CLI_EXPERIMENTAL=enabled
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep replace replace replace replace replace replace keep | <mask> 'requirements':
<mask> - 'adg-docker': 'true'
<mask>
<mask> 'branches':
<mask> 'create': 'for-pull-request'
<mask> 'delete':
<mask> 'after-deleted-days': 1
<mask> 'after-inactive-days': 5
<mask> 'integration':
<mask> 'push-on-success': false
<mask> 'merge-from': 'AdGuard Home - Build and run tests'
<mask> 'link-to-jira': true
<mask>
<mask> 'notifications':
<mask> - 'events':
<mask> - 'plan-status-changed'
<mask> 'recipients':
<mask> - 'webhook':
<mask> 'name': 'Build webhook'
<mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
<mask>
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true
</s> add 'create': 'manually'
'delete':
'after-deleted-days': 1
'after-inactive-days': 30
'integration':
'push-on-success': false
'merge-from': 'AdGuard Home - Build and publish release'
'link-to-jira': true </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add make VERBOSE=1 ci go-tools lint
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
</s> add 'project-key': 'AGH'
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' </s> remove # Don't use minute values that end with a zero or a five as these are often used
# in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *'
</s> add # Don't use minute values that end with a zero or a five as these are often
# used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
keep keep keep keep replace | <mask> 'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
<mask>
<mask> 'labels': []
<mask> 'other':
<mask> 'concurrent-build-plugin': 'system-default'
</s> Pull request 1885: AG-23334-fix-snap-plan
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master
Squashed commit of the following:
commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <[email protected]>
Date: Wed Jun 21 17:42:36 2023 +0300
bamboo-specs: fix snap build; fmt </s> remove - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
</s> add - 'events':
- 'plan-status-changed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo' </s> remove 'concurrent-build-plugin': 'system-default'
</s> add 'concurrent-build-plugin': 'system-default' </s> remove - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
</s> add - 'events':
- 'plan-completed'
'recipients':
- 'webhook':
'name': 'Build webhook'
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa' </s> remove # beta-vX.Y branches are the branches into which the commits that are needed to
# release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release
# is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7'
</s> add # beta-vX.Y branches are the branches into which the commits that are needed
# to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually.
'triggers': []
# Set the default release channel on the release branch to beta, as we may
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches.
'branch-config':
'integration':
'push-on-success': false
'merge-from': 'beta-v0.107'
# Build final releases on release branches manually.
'triggers': []
# Set the default release channel on the final branch to release, as these
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:6.7' </s> remove 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true'
</s> add 'key': 'PUB'
'other':
'clean-working-dir': true
'tasks':
- 'clean'
- 'checkout':
'repository': 'bamboo-deploy-publisher'
'path': 'bamboo-deploy-publisher'
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
set -e -f -u -x
cd ./dist/
CHANNEL="${bamboo.channel}"
export CHANNEL
../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
'final-tasks':
- 'clean'
'requirements':
- 'adg-docker': 'true' </s> remove 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh
</s> add 'docker':
'image': '${bamboo.dockerGo}'
'volumes':
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
'key': 'TEST'
'other':
'clean-working-dir': true
'tasks':
- 'checkout':
'force-clean-build': true
- 'script':
'interpreter': 'SHELL'
'scripts':
- |
#!/bin/sh | https://github.com/AdguardTeam/AdGuardHome/commit/123ca87388315bacc3a16ff4960c7470df936e09 | bamboo-specs/test.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> )
<mask>
<mask> func newARPDB() *cmdARPDB {
<mask> return &cmdARPDB{
<mask> parse: parseArpA,
<mask> ns: &neighs{
<mask> mu: &sync.RWMutex{},
<mask> ns: make([]Neighbor, 0),
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // Then, try "arp -a".
</s> add // Then, try "arp -a -n". </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_bsd.go |
keep keep keep keep replace replace keep keep keep replace keep keep keep | <mask> ns: &neighs{
<mask> mu: &sync.RWMutex{},
<mask> ns: make([]Neighbor, 0),
<mask> },
<mask> cmd: "arp",
<mask> args: []string{"-a"},
<mask> }
<mask> }
<mask>
<mask> // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD.
<mask> // The expected input format:
<mask> //
<mask> // host.name (192.168.0.1) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // parseArpA parses the output of the "arp -a" command on Linux. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on Linux. The
// expected input format: </s> remove // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on OpenBSD. The
// expected input format: </s> remove // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
</s> add // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_bsd.go |
keep keep keep replace keep keep keep keep replace keep keep keep | <mask> fsys: rootDirFS,
<mask> filename: "proc/net/arp",
<mask> },
<mask> // Then, try "arp -a".
<mask> &cmdARPDB{
<mask> parse: parseF,
<mask> ns: ns,
<mask> cmd: "arp",
<mask> args: []string{"-a"},
<mask> },
<mask> // Finally, try "ip neigh".
<mask> &cmdARPDB{
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_linux.go |
keep replace keep keep replace replace | <mask>
<mask> // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
<mask> // expected input format:
<mask> //
<mask> // IP address HW type Flags HW address Mask Device
<mask> // 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on OpenBSD. The
// expected input format: </s> remove // address stays here while it's inside clients. After leaving clients
// the address will be resolved once again. If the address couldn't be
// resolved, cache prevents further attempts to resolve it for some
// time.
</s> add // address stays here while it's inside clients. After leaving clients the
// address will be resolved once again. If the address couldn't be
// resolved, cache prevents further attempts to resolve it for some time. </s> remove // parseArpA parses the output of the "arp -a" command on Linux. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on Linux. The
// expected input format: </s> remove // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD.
</s> add // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD. </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_linux.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> return ns
<mask> }
<mask>
<mask> // parseArpA parses the output of the "arp -a" command on Linux. The expected
<mask> // input format:
<mask> //
<mask> // hostname (192.168.1.1) at ab:cd:ef:ab:cd:ef [ether] on enp0s3
<mask> //
<mask> func parseArpA(sc *bufio.Scanner, lenHint int) (ns []Neighbor) {
<mask> ns = make([]Neighbor, 0, lenHint)
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on OpenBSD. The
// expected input format: </s> remove // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD.
</s> add // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD. </s> remove // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
</s> add // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan </s> remove // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
</s> add // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_linux.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> func newARPDB() *cmdARPDB {
<mask> return &cmdARPDB{
<mask> parse: parseArpA,
<mask> ns: &neighs{
<mask> mu: &sync.RWMutex{},
<mask> ns: make([]Neighbor, 0),
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // Then, try "arp -a".
</s> add // Then, try "arp -a -n". </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_openbsd.go |
keep replace replace keep keep keep replace replace keep | <mask> },
<mask> cmd: "arp",
<mask> args: []string{"-a"},
<mask> }
<mask> }
<mask>
<mask> // parseArpA parses the output of the "arp -a" command on OpenBSD. The expected
<mask> // input format:
<mask> //
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD.
</s> add // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD. </s> remove // parseArpA parses the output of the "arp -a" command on Linux. The expected
// input format:
</s> add // parseArpA parses the output of the "arp -a -n" command on Linux. The
// expected input format: </s> remove // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
</s> add // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_openbsd.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strings"
<mask> "sync"
<mask> )
<mask>
<mask> func newARPDB() *cmdARPDB {
<mask> return &cmdARPDB{
<mask> parse: parseArpA,
<mask> ns: &neighs{
<mask> mu: &sync.RWMutex{},
<mask> ns: make([]Neighbor, 0),
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // Then, try "arp -a".
</s> add // Then, try "arp -a -n". </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/aghnet/arpdb_windows.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> testCases := []struct {
<mask> name string
<mask> msg dns.Msg
<mask> want bool
<mask> }{{
<mask> name: "simple",
<mask> msg: dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
<mask> Id: 1234,
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove want: false,
</s> add want: 0, </s> remove want: true,
</s> add want: 1, </s> remove
if tc.want {
assert.Equal(t, 1, rd.recentRequests.Stats().Count)
} else {
assert.Zero(t, rd.recentRequests.Stats().Count)
}
</s> add assert.Equal(t, tc.want, rd.recentRequests.Stats().Count) </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/dnsforward/recursiondetector_test.go |
keep replace keep keep keep replace keep keep | <mask> },
<mask> want: true,
<mask> }, {
<mask> name: "unencumbered",
<mask> msg: dns.Msg{},
<mask> want: false,
<mask> }}
<mask>
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove want bool
</s> add want int </s> remove // Then, try "arp -a".
</s> add // Then, try "arp -a -n". </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/dnsforward/recursiondetector_test.go |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> t.Run(tc.name, func(t *testing.T) {
<mask> t.Cleanup(rd.clear)
<mask>
<mask> rd.add(tc.msg)
<mask>
<mask> if tc.want {
<mask> assert.Equal(t, 1, rd.recentRequests.Stats().Count)
<mask> } else {
<mask> assert.Zero(t, rd.recentRequests.Stats().Count)
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
<mask> var sink []byte
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove want: false,
</s> add want: 0, </s> remove want: true,
</s> add want: 1, </s> remove // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
</s> add // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { </s> remove // parseArpA parses the output of the "arp -a" command on macOS and FreeBSD.
</s> add // parseArpA parses the output of the "arp -a -n" command on macOS and FreeBSD. </s> remove func newARPDB() *cmdARPDB {
</s> add func newARPDB() (arp *cmdARPDB) { | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/dnsforward/recursiondetector_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> type RDNS struct {
<mask> exchanger dnsforward.RDNSExchanger
<mask> clients *clientsContainer
<mask>
<mask> // usePrivate is used to store the state of current private RDNS
<mask> // resolving settings and to react to it's changes.
<mask> usePrivate uint32
<mask>
<mask> // ipCh used to pass client's IP to rDNS workerLoop.
<mask> ipCh chan net.IP
<mask>
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove // address stays here while it's inside clients. After leaving clients
// the address will be resolved once again. If the address couldn't be
// resolved, cache prevents further attempts to resolve it for some
// time.
</s> add // address stays here while it's inside clients. After leaving clients the
// address will be resolved once again. If the address couldn't be
// resolved, cache prevents further attempts to resolve it for some time. </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
</s> add // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan </s> remove // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
</s> add // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/home/rdns.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> // ipCh used to pass client's IP to rDNS workerLoop.
<mask> ipCh chan net.IP
<mask>
<mask> // ipCache caches the IP addresses to be resolved by rDNS. The resolved
<mask> // address stays here while it's inside clients. After leaving clients
<mask> // the address will be resolved once again. If the address couldn't be
<mask> // resolved, cache prevents further attempts to resolve it for some
<mask> // time.
<mask> ipCache cache.Cache
<mask> }
<mask>
<mask> // Default rDNS values.
<mask> const (
</s> Pull request: 3157 excessive ptrs
Merge in DNS/adguard-home from 3157-excessive-ptrs to master
Updates #3157.
Squashed commit of the following:
commit 6803988240dca2f147bb80a5b3f78d7749d2fa14
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:50:01 2022 +0300
aghnet: and again
commit 1a7f4d1dbc8fd4d3ae620349917526a75fa71b47
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:49:20 2022 +0300
aghnet: docs again
commit d88da1fc7135f3cd03aff10b02d9957c8ffdfd30
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:47:36 2022 +0300
aghnet: imp docs
commit c45dbc7800e882c6c4110aab640c32b03046f89a
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 14:41:19 2022 +0300
aghnet: keep alphabetical order
commit b61781785d096ef43f60fb4f1905a4ed3cdf7c68
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 19 13:50:56 2022 +0300
aghnet: imp code quality
commit 578dbd71ed2f2089c69343d7d4bf8bbc29150ace
Author: Eugene Burkov <[email protected]>
Date: Tue Apr 12 17:02:38 2022 +0300
aghnet: imp arp container </s> remove // usePrivate is used to store the state of current private RDNS
// resolving settings and to react to it's changes.
</s> add // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes. </s> remove // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan
</s> add // IP address HW type Flags HW address Mask Device
// 192.168.11.98 0x1 0x2 5a:92:df:a9:7e:28 * wan </s> remove // parseArpAWrt parses the output of the "arp -a" command on OpenWrt. The
</s> add // parseArpAWrt parses the output of the "arp -a -n" command on OpenWrt. The </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove args: []string{"-a"},
</s> add // Use -n flag to avoid resolving the hostnames of the neighbors.
// By default ARP attempts to resolve the hostnames via DNS. See
// man 8 arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, </s> remove cmd: "arp",
args: []string{"-a"},
</s> add cmd: "arp",
// Use -n flag to avoid resolving the hostnames of the neighbors. By
// default ARP attempts to resolve the hostnames via DNS. See man 8
// arp.
//
// See also https://github.com/AdguardTeam/AdGuardHome/issues/3157.
args: []string{"-a", "-n"}, | https://github.com/AdguardTeam/AdGuardHome/commit/12ee287d0b25cc1fb498e54c4484c995613e9bcb | internal/home/rdns.go |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.9'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'GO_VERSION': '1.18.9'
</s> add 'GO_VERSION': '1.19.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove useHTTP3: false,
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | .github/workflows/build.yml |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.9'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'GO_VERSION': '1.18.9'
</s> add 'GO_VERSION': '1.19.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove useHTTP3: false,
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | .github/workflows/lint.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.4'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'GO_VERSION': '1.18.9'
</s> add 'GO_VERSION': '1.19.5' </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.4'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { </s> remove // dbMu protects db.
dbMu *sync.Mutex
</s> add </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | bamboo-specs/release.yaml |
keep keep keep keep replace | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove s.dbMu.Lock()
defer s.dbMu.Unlock()
s.db = db
</s> add s.db.Store(db) | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:5.4'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'GO_VERSION': '1.18.9'
</s> add 'GO_VERSION': '1.19.5' </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> remove 'GO_VERSION': '1.18.9'
</s> add 'GO_VERSION': '1.19.5' </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | bamboo-specs/test.yaml |
keep keep replace keep keep keep keep keep | <mask> module github.com/AdguardTeam/AdGuardHome
<mask>
<mask> go 1.18
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.47.0
<mask> github.com/AdguardTeam/golibs v0.11.4
<mask> github.com/AdguardTeam/urlfilter v0.16.1
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/AdguardTeam/dnsproxy v0.47.0
</s> add // TODO(a.garipov): Use v0.48.0 when it's released.
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 </s> remove go 1.18
</s> add go 1.19 </s> remove github.com/AdguardTeam/dnsproxy v0.47.0 h1:h/ycmA8QhyuwlMYRj2Egtw86+AFxs5wQQT2qskLWyXU=
github.com/AdguardTeam/dnsproxy v0.47.0/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k=
</s> add github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 h1:n1oOiywOvdeqWLto809bK1rK1EPDkpaSfT/r1OiCVaQ=
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239/go.mod h1:+Sdi5ISrjDFbeCsKNqzcC1Ag7pJ5Hh9y+UBNb3dfqJ4= </s> remove github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add </s> remove golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33
honnef.co/go/tools v0.3.3
</s> add golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0 </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.18
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.47.0
<mask> github.com/AdguardTeam/golibs v0.11.4
<mask> github.com/AdguardTeam/urlfilter v0.16.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.5
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove go 1.18
</s> add go 1.19 </s> remove github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add </s> remove github.com/AdguardTeam/dnsproxy v0.47.0 h1:h/ycmA8QhyuwlMYRj2Egtw86+AFxs5wQQT2qskLWyXU=
github.com/AdguardTeam/dnsproxy v0.47.0/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k=
</s> add github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 h1:n1oOiywOvdeqWLto809bK1rK1EPDkpaSfT/r1OiCVaQ=
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239/go.mod h1:+Sdi5ISrjDFbeCsKNqzcC1Ag7pJ5Hh9y+UBNb3dfqJ4= </s> remove go 1.18
</s> add go 1.19 </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33
honnef.co/go/tools v0.3.3
</s> add golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0 | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/google/renameio v1.0.1
<mask> github.com/google/uuid v1.3.0
<mask> github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8
<mask> github.com/kardianos/service v1.2.2
<mask> github.com/lucas-clemente/quic-go v0.31.1
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.7.1
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that. Perhaps, use gopacket.
<mask> github.com/mdlayher/raw v0.1.0
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U=
github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg= </s> add running atomic.Bool </s> remove // TODO(a.garipov): use atomic.Bool in Go 1.19.
var numAcceptCalls uint32
</s> add var accepted atomic.Bool </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove atomic.AddUint32(&numAcceptCalls, 1)
</s> add accepted.Store(true) | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep add keep keep keep keep keep | <mask> github.com/mdlayher/raw v0.1.0
<mask> github.com/miekg/dns v1.1.50
<mask> github.com/stretchr/testify v1.8.1
<mask> github.com/ti-mo/netfilter v0.5.0
<mask> go.etcd.io/bbolt v1.3.7
<mask> golang.org/x/crypto v0.5.0
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 h1:O1QcdQUR9htWjzzsXVFPX+RJ3n1P/u/5bsQR8dbs5BY=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep keep keep keep replace keep replace replace | <mask> github.com/stretchr/testify v1.8.1
<mask> github.com/ti-mo/netfilter v0.5.0
<mask> go.etcd.io/bbolt v1.3.7
<mask> golang.org/x/crypto v0.5.0
<mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
<mask> golang.org/x/net v0.5.0
<mask> golang.org/x/sys v0.4.0
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> add github.com/quic-go/quic-go v0.32.0 </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> howett.net/plist v1.0.0
<mask> )
<mask>
<mask> require (
<mask> github.com/BurntSushi/toml v1.1.0 // indirect
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
<mask> github.com/ameshkov/dnsstamps v1.0.3 // indirect
<mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
<mask> github.com/bluele/gcache v0.0.2 // indirect
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect </s> add github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect </s> remove github.com/marten-seemann/qpack v0.3.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
</s> add </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep keep replace keep replace replace replace keep keep keep | <mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
<mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
<mask> github.com/josharian/native v1.1.0 // indirect
<mask> github.com/marten-seemann/qpack v0.3.0 // indirect
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
<mask> github.com/mdlayher/packet v1.1.1 // indirect
<mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect </s> add github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove github.com/BurntSushi/toml v1.1.0 // indirect
</s> add </s> remove github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
keep add keep keep keep keep keep keep | <mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
<mask> golang.org/x/mod v0.7.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.6.0 // indirect
<mask> golang.org/x/tools v0.5.0 // indirect
<mask> )
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect </s> remove github.com/marten-seemann/qpack v0.3.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
</s> add </s> remove github.com/BurntSushi/toml v1.1.0 // indirect
</s> add </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect </s> remove golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
</s> add golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.mod |
replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.47.0 h1:h/ycmA8QhyuwlMYRj2Egtw86+AFxs5wQQT2qskLWyXU=
<mask> github.com/AdguardTeam/dnsproxy v0.47.0/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
<mask> github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove go 1.18
</s> add go 1.19 </s> remove github.com/AdguardTeam/dnsproxy v0.47.0
</s> add // TODO(a.garipov): Use v0.48.0 when it's released.
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 </s> remove github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add </s> add github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= </s> remove honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA=
honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
</s> add honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
<mask> github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
<mask> github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
<mask> github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/AdguardTeam/dnsproxy v0.47.0
</s> add // TODO(a.garipov): Use v0.48.0 when it's released.
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 </s> remove github.com/AdguardTeam/dnsproxy v0.47.0 h1:h/ycmA8QhyuwlMYRj2Egtw86+AFxs5wQQT2qskLWyXU=
github.com/AdguardTeam/dnsproxy v0.47.0/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k=
</s> add github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239 h1:n1oOiywOvdeqWLto809bK1rK1EPDkpaSfT/r1OiCVaQ=
github.com/AdguardTeam/dnsproxy v0.47.1-0.20230207130636-533058b17239/go.mod h1:+Sdi5ISrjDFbeCsKNqzcC1Ag7pJ5Hh9y+UBNb3dfqJ4= </s> remove github.com/BurntSushi/toml v1.1.0 // indirect
</s> add </s> remove go 1.18
</s> add go 1.19 </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect </s> remove github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
<mask> github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
<mask> github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
<mask> github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
<mask> github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
<mask> github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
<mask> github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
<mask> github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
<mask> github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
<mask> github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/lucas-clemente/quic-go v0.31.1
</s> add </s> add github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect </s> remove github.com/marten-seemann/qpack v0.3.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
</s> add </s> remove honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA=
honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
</s> add honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
<mask> github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
<mask> github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
<mask> github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118/go.mod h1:ZFUnHIVchZ9lJoWoEGUg8Q3M4U8aNNWA3CVSUTkW4og=
<mask> github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
<mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/lucas-clemente/quic-go v0.31.1
</s> add </s> remove github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
</s> add github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect </s> remove github.com/marten-seemann/qpack v0.3.0 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
</s> add </s> add github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= </s> remove github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
</s> add </s> add github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep add keep keep keep keep keep keep | <mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
<mask> github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
<mask> github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
<mask> github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove github.com/securego/gosec/v2 v2.14.0 h1:U1hfs0oBackChXA72plCYVA4cOlQ4gO+209dHiSNZbI=
github.com/securego/gosec/v2 v2.14.0/go.mod h1:Ff03zEi5NwSOfXj9nFpBfhbWTtROCkg9N+9goggrYn4=
</s> add github.com/securego/gosec/v2 v2.15.0 h1:v4Ym7FF58/jlykYmmhZ7mTm7FQvN/setNm++0fgIAtw=
github.com/securego/gosec/v2 v2.15.0/go.mod h1:VOjTrZOkUtSDt2QLSJmQBMWnvwiQPEjg0l+5juIqGk8= </s> remove github.com/onsi/ginkgo/v2 v2.3.1 h1:8SbseP7qM32WcvE6VaN6vfXxv698izmsJ1UQX9ve7T8=
github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI=
</s> add github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> add github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
</s> add </s> remove honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA=
honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
</s> add honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
<mask> golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
<mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
<mask> golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
<mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 h1:O1QcdQUR9htWjzzsXVFPX+RJ3n1P/u/5bsQR8dbs5BY=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> add github.com/quic-go/quic-go v0.32.0 </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
<mask> golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
</s> add golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/sys v0.4.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
</s> add golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace replace keep keep keep replace keep keep keep | <mask> google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
<mask> gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
<mask> gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA=
honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw=
</s> add honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
</s> add golang.org/x/exp v0.0.0-20230206171751-46f607a40771 </s> remove golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 h1:je2aB5nnlseeGvJy5clg6EyC3jjbbCNsRDroC3qQJsA=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/lucas-clemente/quic-go"
<mask> )
<mask>
<mask> // ValidateClientID returns an error if id is not a valid ClientID.
<mask> func ValidateClientID(id string) (err error) {
<mask> err = netutil.ValidateDomainNameLabel(id)
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove "github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3" </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string) (r *http.Request) { </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> // clientServerName returns the TLS server name based on the protocol.
<mask> func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) {
<mask> switch proto {
<mask> case proxy.ProtoHTTPS:
<mask> // github.com/lucas-clemente/quic-go seems to not populate the TLS
<mask> // field. So, if the request comes over HTTP/3, use the Host header
<mask> // value as the server name.
<mask> //
<mask> // See https://github.com/lucas-clemente/quic-go/issues/2879.
<mask> //
<mask> // TODO(a.garipov): Remove this crutch once they fix it.
<mask> r := pctx.HTTPRequest
<mask> if r.ProtoAtLeast(3, 0) {
<mask> var host string
<mask> host, err = netutil.SplitHost(r.Host)
<mask> if err != nil {
<mask> return "", fmt.Errorf("parsing host: %w", err)
<mask> }
<mask>
<mask> srvName = host
<mask> } else if connState := r.TLS; connState != nil {
<mask> srvName = r.TLS.ServerName
<mask> }
<mask> case proxy.ProtoQUIC:
<mask> qConn := pctx.QUICConnection
<mask> conn, ok := qConn.(quicConnection)
<mask> if !ok {
<mask> return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn)
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove tx, err := s.db.Begin(true)
</s> add tx, err := s.db.Load().Begin(true) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove if err != nil {
atomic.StoreUint64(&svc.running, 0)
} else {
atomic.StoreUint64(&svc.running, 1)
}
</s> add svc.running.Store(err == nil) </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> // testTLSConn is a tlsConn for tests.
<mask> type testTLSConn struct {
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove "github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go/http3" </s> remove func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string) (r *http.Request) { </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove "github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3" | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName string
<mask> wantClientID string
<mask> wantErrMsg string
<mask> strictSNI bool
<mask> useHTTP3 bool
<mask> }{{
<mask> name: "udp",
<mask> proto: proxy.ProtoUDP,
<mask> hostSrvName: "",
<mask> cliSrvName: "",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_no_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_no_client_server_name",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_no_client_server_name_no_strict",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
}, {
name: "https_clientid_quic",
proto: proxy.ProtoHTTPS,
hostSrvName: "example.com",
cliSrvName: "cli.example.com",
wantClientID: "cli",
wantErrMsg: "",
strictSNI: true,
useHTTP3: true,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_clientid_hostname_error",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.net",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
}, {
name: "https_clientid_quic",
proto: proxy.ProtoHTTPS,
hostSrvName: "example.com",
cliSrvName: "cli.example.com",
wantClientID: "cli",
wantErrMsg: "",
strictSNI: true,
useHTTP3: true,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.example.net" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_invalid_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "!!!.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": ` +
<mask> `bad domain name label rune '!'`,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_clientid_too_long",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: `abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmno` +
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantErrMsg: `clientid check: invalid clientid "abcdefghijklmno` +
<mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` +
<mask> `domain name label is too long: got 72, max 63`,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "quic_clientid",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_clientid_issue3437",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.myexample.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
}, {
name: "https_clientid_quic",
proto: proxy.ProtoHTTPS,
hostSrvName: "example.com",
cliSrvName: "cli.example.com",
wantClientID: "cli",
wantErrMsg: "",
strictSNI: true,
useHTTP3: true,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.myexample.com" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "tls_case",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "quic_case",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
<mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "https_no_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> cliSrvName: "example.com",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "https_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
}, {
name: "https_clientid_quic",
proto: proxy.ProtoHTTPS,
hostSrvName: "example.com",
cliSrvName: "cli.example.com",
wantClientID: "cli",
wantErrMsg: "",
strictSNI: true,
useHTTP3: true,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: false,
<mask> }, {
<mask> name: "https_clientid_quic",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
<mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> useHTTP3: true,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> tlsConf := TLSConfig{
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add </s> remove useHTTP3: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> switch tc.proto {
<mask> case proxy.ProtoHTTPS:
<mask> httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3)
<mask> case proxy.ProtoQUIC:
<mask> qconn = testQUICConnection{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> case proxy.ProtoTLS:
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> remove dbMu: &sync.Mutex{},
</s> add </s> remove if usePrivate {
rDNS.usePrivate = 1
}
</s> add rDNS.usePrivate.Store(usePrivate) </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { </s> remove // TODO(a.garipov): use atomic.Bool in Go 1.19.
var numAcceptCalls uint32
</s> add var accepted atomic.Bool | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep | <mask> }
<mask> }
<mask>
<mask> // newHTTPReq is a helper to create HTTP requests for tests.
<mask> func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
<mask> u := &url.URL{
<mask> Path: "/dns-query",
<mask> }
<mask>
<mask> if useHTTP3 {
<mask> return &http.Request{
<mask> ProtoMajor: 3,
<mask> ProtoMinor: 0,
<mask> URL: u,
<mask> Host: cliSrvName,
<mask> TLS: &tls.ConnectionState{},
<mask> }
<mask> }
<mask>
<mask> return &http.Request{
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove db := s.database()
</s> add db := s.db.Load() </s> remove db := s.database()
</s> add db := s.db.Load() </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/dnsforward/clientid_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/lucas-clemente/quic-go/http3"
<mask> )
<mask>
<mask> // getAddrsResponse is the response for /install/get_addresses endpoint.
<mask> type getAddrsResponse struct {
<mask> Interfaces map[string]*aghnet.NetInterface `json:"interfaces"`
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove "github.com/lucas-clemente/quic-go"
"github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/http3" </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove // dbMu protects db.
dbMu *sync.Mutex
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/controlinstall.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> type RDNS struct {
<mask> exchanger dnsforward.RDNSExchanger
<mask> clients *clientsContainer
<mask>
<mask> // usePrivate is used to store the state of current private RDNS resolving
<mask> // settings and to react to it's changes.
<mask> usePrivate uint32
<mask>
<mask> // ipCh used to pass client's IP to rDNS workerLoop.
<mask> ipCh chan netip.Addr
<mask>
<mask> // ipCache caches the IP addresses to be resolved by rDNS. The resolved
<mask> // address stays here while it's inside clients. After leaving clients the
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:5.4'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.0' | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/rdns.go |
keep keep add keep keep keep keep keep keep | <mask> // address will be resolved once again. If the address couldn't be
<mask> // resolved, cache prevents further attempts to resolve it for some time.
<mask> ipCache cache.Cache
<mask> }
<mask>
<mask> // Default rDNS values.
<mask> const (
<mask> defaultRDNSCacheSize = 10000
<mask> defaultRDNSCacheTTL = 1 * 60 * 60
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove dbMu: &sync.Mutex{},
</s> add </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/rdns.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> MaxCount: defaultRDNSCacheSize,
<mask> }),
<mask> ipCh: make(chan netip.Addr, defaultRDNSIPChSize),
<mask> }
<mask> if usePrivate {
<mask> rDNS.usePrivate = 1
<mask> }
<mask>
<mask> go rDNS.workerLoop()
<mask>
<mask> return rDNS
<mask> }
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool </s> remove db := s.database()
</s> add db := s.db.Load() </s> remove if useHTTP3 {
return &http.Request{
ProtoMajor: 3,
ProtoMinor: 0,
URL: u,
Host: cliSrvName,
TLS: &tls.ConnectionState{},
}
}
</s> add </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/rdns.go |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> // TODO(e.burkov): Clearing cache each time this value changed is not a perfect
<mask> // approach since only unresolved locally-served addresses should be removed.
<mask> // Implement when improving the cache.
<mask> func (r *RDNS) ensurePrivateCache() {
<mask> var usePrivate uint32
<mask> if r.exchanger.ResolvesPrivatePTR() {
<mask> usePrivate = 1
<mask> }
<mask>
<mask> if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
<mask> r.ipCache.Clear()
<mask> }
<mask> }
<mask>
<mask> // isCached returns true if ip is already cached and not expired yet. It also
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool </s> remove func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string) (r *http.Request) { </s> remove if atomic.LoadUint64(&svc.running) == 1 {
</s> add if svc.running.Load() { </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/rdns.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/NYTimes/gziphandler"
<mask> "github.com/lucas-clemente/quic-go"
<mask> "github.com/lucas-clemente/quic-go/http3"
<mask> "golang.org/x/net/http2"
<mask> "golang.org/x/net/http2/h2c"
<mask> )
<mask>
<mask> const (
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove "github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go/http3" </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove golang.org/x/sys v0.4.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
</s> add golang.org/x/sys v0.5.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 </s> remove golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33
honnef.co/go/tools v0.3.3
</s> add golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0 </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/home/web.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> // Service is the AdGuard Home DNS service. A nil *Service is a valid
<mask> // [agh.Service] that does nothing.
<mask> type Service struct {
<mask> // running is an atomic boolean value. Keep it the first value in the
<mask> // struct to ensure atomic alignment. 0 means that the service is not
<mask> // running, 1 means that it is running.
<mask> //
<mask> // TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
<mask> // completely.
<mask> running uint64
<mask>
<mask> proxy *proxy.Proxy
<mask> bootstraps []string
<mask> upstreams []string
<mask> upsTimeout time.Duration
<mask> }
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> add running atomic.Bool </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // dbMu protects db.
dbMu *sync.Mutex
</s> add </s> remove db *bbolt.DB
</s> add db atomic.Pointer[bbolt.DB] </s> remove "github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go/http3" </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/dnssvc/dnssvc.go |
keep keep keep add keep keep keep keep | <mask> proxy *proxy.Proxy
<mask> bootstraps []string
<mask> upstreams []string
<mask> upsTimeout time.Duration
<mask> }
<mask>
<mask> // New returns a new properly initialized *Service. If c is nil, svc is a nil
<mask> // *Service that does nothing. The fields of c must not be modified after
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove "github.com/lucas-clemente/quic-go"
</s> add "github.com/quic-go/quic-go" </s> remove github.com/lucas-clemente/quic-go v0.31.1
</s> add </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/dnssvc/dnssvc.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> defer func() {
<mask> // TODO(a.garipov): [proxy.Proxy.Start] doesn't actually have any way to
<mask> // tell when all servers are actually up, so at best this is merely an
<mask> // assumption.
<mask> if err != nil {
<mask> atomic.StoreUint64(&svc.running, 0)
<mask> } else {
<mask> atomic.StoreUint64(&svc.running, 1)
<mask> }
<mask> }()
<mask>
<mask> return svc.proxy.Start()
<mask> }
<mask>
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.database()
</s> add db := s.db.Load() </s> remove tx, err := s.db.Begin(true)
</s> add tx, err := s.db.Load().Begin(true) </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/dnssvc/dnssvc.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (svc *Service) Config() (c *Config) {
<mask> // TODO(a.garipov): Do we need to get the TCP addresses separately?
<mask>
<mask> var addrs []netip.AddrPort
<mask> if atomic.LoadUint64(&svc.running) == 1 {
<mask> udpAddrs := svc.proxy.Addrs(proxy.ProtoUDP)
<mask> addrs = make([]netip.AddrPort, len(udpAddrs))
<mask> for i, a := range udpAddrs {
<mask> addrs[i] = a.(*net.UDPAddr).AddrPort()
<mask> }
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove var usePrivate uint32
if r.exchanger.ResolvesPrivatePTR() {
usePrivate = 1
}
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
</s> add usePrivate := r.exchanger.ResolvesPrivatePTR()
if r.usePrivate.CompareAndSwap(!usePrivate, usePrivate) { </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> remove func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string) (r *http.Request) { </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/dnssvc/dnssvc.go |
keep keep keep keep replace replace keep keep keep keep replace keep keep keep | <mask> UpstreamServers: []string{"1.1.1.1"},
<mask> UpstreamTimeout: websvc.JSONDuration(2 * time.Second),
<mask> }
<mask>
<mask> // TODO(a.garipov): Use [atomic.Bool] in Go 1.19.
<mask> var numStarted uint64
<mask> confMgr := newConfigManager()
<mask> confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
<mask> return &aghtest.ServiceWithConfig[*dnssvc.Config]{
<mask> OnStart: func() (err error) {
<mask> atomic.AddUint64(&numStarted, 1)
<mask>
<mask> return nil
<mask> },
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove atomic.AddUint32(&numAcceptCalls, 1)
</s> add accepted.Store(true) </s> remove // TODO(a.garipov): use atomic.Bool in Go 1.19.
var numAcceptCalls uint32
</s> add var accepted atomic.Bool </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/websvc/dns_test.go |
keep keep keep keep replace keep keep keep | <mask> resp := &websvc.HTTPAPIDNSSettings{}
<mask> err := json.Unmarshal(respBody, resp)
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, uint64(1), numStarted)
<mask> assert.Equal(t, wantDNS, resp)
<mask> assert.Equal(t, wantDNS, resp)
<mask> }
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove assert.Equal(t, uint32(1), atomic.LoadUint32(&numAcceptCalls))
</s> add assert.True(t, accepted.Load()) </s> remove tx, err := s.db.Begin(true)
</s> add tx, err := s.db.Load().Begin(true) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/websvc/dns_test.go |
keep keep replace replace keep keep replace keep | <mask>
<mask> func TestWaitListener_Accept(t *testing.T) {
<mask> // TODO(a.garipov): use atomic.Bool in Go 1.19.
<mask> var numAcceptCalls uint32
<mask> var l net.Listener = &aghtest.Listener{
<mask> OnAccept: func() (conn net.Conn, err error) {
<mask> atomic.AddUint32(&numAcceptCalls, 1)
<mask>
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // TODO(a.garipov): Use [atomic.Bool] in Go 1.19.
var numStarted uint64
</s> add var started atomic.Bool </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove atomic.AddUint64(&numStarted, 1)
</s> add started.Store(true) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/websvc/waitlistener_internal_test.go |
keep keep keep keep replace keep | <mask>
<mask> wg.Wait()
<mask> close(done)
<mask>
<mask> assert.Equal(t, uint32(1), atomic.LoadUint32(&numAcceptCalls))
<mask> }
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove assert.Equal(t, uint64(1), numStarted)
</s> add assert.True(t, started.Load()) </s> remove if usePrivate {
rDNS.usePrivate = 1
}
</s> add rDNS.usePrivate.Store(usePrivate) </s> remove if useHTTP3 {
return &http.Request{
ProtoMajor: 3,
ProtoMinor: 0,
URL: u,
Host: cliSrvName,
TLS: &tls.ConnectionState{},
}
}
</s> add </s> remove func newHTTPReq(cliSrvName string, useHTTP3 bool) (r *http.Request) {
</s> add func newHTTPReq(cliSrvName string) (r *http.Request) { </s> remove if err != nil {
atomic.StoreUint64(&svc.running, 0)
} else {
atomic.StoreUint64(&svc.running, 1)
}
</s> add svc.running.Store(err == nil) </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/next/websvc/waitlistener_internal_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> // StatsCtx collects the statistics and flushes it to the database. Its default
<mask> // flushing interval is one hour.
<mask> //
<mask> // TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
<mask> type StatsCtx struct {
<mask> // limitHours is the maximum number of hours to collect statistics into the
<mask> // current unit.
<mask> //
<mask> // It is of type uint32 to be accessed by atomic. It's arranged at the
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // dbMu protects db.
dbMu *sync.Mutex
</s> add </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove db *bbolt.DB
</s> add db atomic.Pointer[bbolt.DB] </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/stats/stats.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> currMu *sync.RWMutex
<mask> // curr is the actual statistics collection result.
<mask> curr *unit
<mask>
<mask> // dbMu protects db.
<mask> dbMu *sync.Mutex
<mask> // db is the opened statistics database, if any.
<mask> db *bbolt.DB
<mask>
<mask> // unitIDGen is the function that generates an identifier for the current
<mask> // unit. It's here for only testing purposes.
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove db *bbolt.DB
</s> add db atomic.Pointer[bbolt.DB] </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add </s> remove "github.com/lucas-clemente/quic-go/http3"
</s> add "github.com/quic-go/quic-go/http3" </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/stats/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // dbMu protects db.
<mask> dbMu *sync.Mutex
<mask> // db is the opened statistics database, if any.
<mask> db *bbolt.DB
<mask>
<mask> // unitIDGen is the function that generates an identifier for the current
<mask> // unit. It's here for only testing purposes.
<mask> unitIDGen UnitIDGenFunc
<mask>
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove // dbMu protects db.
dbMu *sync.Mutex
</s> add </s> remove //
// TODO(e.burkov): Use atomic.Pointer for accessing db in go1.19.
</s> add </s> remove // running is an atomic boolean value. Keep it the first value in the
// struct to ensure atomic alignment. 0 means that the service is not
// running, 1 means that it is running.
//
// TODO(a.garipov): Use [atomic.Bool] in Go 1.19 or get rid of it
// completely.
running uint64
</s> add </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove // usePrivate is used to store the state of current private RDNS resolving
// settings and to react to it's changes.
usePrivate uint32
</s> add </s> remove // database returns the database if it's opened. It's safe for concurrent use.
func (s *StatsCtx) database() (db *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
return s.db
}
// swapDatabase swaps the database with another one and returns it. It's safe
// for concurrent use.
func (s *StatsCtx) swapDatabase(with *bbolt.DB) (old *bbolt.DB) {
s.dbMu.Lock()
defer s.dbMu.Unlock()
old, s.db = s.db, with
return old
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/stats/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask> defer withRecovered(&err)
<mask>
<mask> s = &StatsCtx{
<mask> currMu: &sync.RWMutex{},
<mask> dbMu: &sync.Mutex{},
<mask> filename: conf.Filename,
<mask> configModified: conf.ConfigModified,
<mask> httpRegister: conf.HTTPRegister,
<mask> }
<mask> if s.limitHours = conf.LimitDays * 24; !checkInterval(conf.LimitDays) {
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove s.dbMu.Lock()
defer s.dbMu.Unlock()
s.db = db
</s> add s.db.Store(db) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> add // usePrivate stores the state of current private reverse-DNS resolving
// settings.
usePrivate atomic.Bool </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove if usePrivate {
rDNS.usePrivate = 1
}
</s> add rDNS.usePrivate.Store(usePrivate) </s> remove // TODO(a.garipov): Use [atomic.Bool] in Go 1.19.
var numStarted uint64
</s> add var started atomic.Bool | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/stats/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> var udb *unitDB
<mask> id := s.unitIDGen()
<mask>
<mask> tx, err := s.db.Begin(true)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("stats: opening a transaction: %w", err)
<mask> }
<mask>
<mask> deleted := deleteOldUnits(tx, id-s.limitHours-1)
</s> Pull request 1729: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 0e13d6863a3d463289823a27414b427cb76be88c
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:20:14 2023 +0300
scripts: try increasing test timeout
commit 8e7d230e40de8f49a2b74a6d32a7fc78a361edab
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 20:00:17 2023 +0300
all: upd quic-go; imp atomic values
commit fae2b75b6990f2bd77e5c019a35a72322bac85f7
Author: Ainar Garipov <[email protected]>
Date: Tue Feb 7 17:36:33 2023 +0300
all: upd go, deps; imp atomic values </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName
}
</s> add srvName = pctx.HTTPRequest.TLS.ServerName </s> remove db := s.database()
</s> add db := s.db.Load() </s> remove assert.Equal(t, uint64(1), numStarted)
</s> add assert.True(t, started.Load()) </s> remove db := s.swapDatabase(nil)
</s> add db := s.db.Swap(nil) </s> remove db := s.database()
</s> add db := s.db.Load() | https://github.com/AdguardTeam/AdGuardHome/commit/137d280032c8f2f0331f16b00cba83682369a43f | internal/stats/stats.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.