Skip to content

Commit

Permalink
ui refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
markus621 committed Aug 7, 2022
1 parent 969c99d commit 8977226
Show file tree
Hide file tree
Showing 81 changed files with 4,787 additions and 2,159 deletions.
6 changes: 4 additions & 2 deletions .deb.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package: fdns
source: fdns
version: '1:0.0.4'
version: '1:0.0.5'
architecture:
- amd64
- arm64
maintainer: DewepOnline <[email protected]>
homepage: https://dewep.online/fdns.html
homepage: https://www.dewep.online/products/fdns
description:
- Filter DNS
section: web
Expand All @@ -14,9 +14,11 @@ control:
depends:
- systemd
- ca-certificates
- sqlite3
build: scripts/build.sh
conffiles:
- /etc/fdns/config.yaml
- /var/lib/fdns/data.sqlite
preinst: scripts/preinst.sh
postinst: scripts/postinst.sh
prerm: scripts/prerm.sh
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
*.out
*.lock
*.log
*.sqlite

.DS_Store
.glide
.idea
.vscode
.tools
/vendor

.angulardoc.json
Expand Down
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ SHELL=/bin/bash
.PHONY: run_back run_front
run_back:
go generate ./...
go run -race cmd/fdns/main.go -config=./configs/config.dev.yaml
go run -race cmd/fdns/main.go run -config=./configs/config.dev.yaml
run_front:
cd web && npm ci --no-delete --cache=/tmp && npm run start

.PHONY: build_back build_font
build_back:
bash scripts/build.sh back
bash scripts/build.sh amd64
build_font:
bash scripts/build.sh front

Expand All @@ -31,5 +31,12 @@ develop_down:
ci:
bash scripts/ci.sh

deb: build_font build_back
deb: build_font
deb-builder build

nslookup:
nslookup -port=8053 google.com 127.0.0.1
nslookup -port=8053 yandex.ru 127.0.0.1
nslookup -port=8053 vk.com 127.0.0.1
nslookup -port=8053 dewep.pro 127.0.0.1
nslookup -port=8053 dewep.online 127.0.0.1
51 changes: 29 additions & 22 deletions cmd/fdns/main.go
Original file line number Diff line number Diff line change
@@ -1,35 +1,42 @@
package main

import (
"flag"

"github.com/dewep-online/fdns/internal/api"
"github.com/dewep-online/fdns/internal/dnsserver"
"github.com/dewep-online/fdns/internal/webserver"
"github.com/dewep-online/fdns/pkg"
"github.com/deweppro/go-app/application"
"github.com/deweppro/go-app/console"
"github.com/deweppro/go-logger"
)

var configFile = flag.String("config", "./config.yaml", "path to config file")

func main() {
flag.Parse()
root := console.New("uri-one", "help uri-one")
root.AddCommand(appRun())
root.Exec()
}

application.New().
Logger(logger.Default()).
ConfigFile(
*configFile,
pkg.Config,
webserver.Config,
dnsserver.Config,
api.Config,
).
Modules(
pkg.Module,
webserver.Module,
dnsserver.Module,
api.Module,
).
Run()
func appRun() console.CommandGetter {
return console.NewCommand(func(setter console.CommandSetter) {
setter.Setup("run", "run application")
setter.Example("run --config=./config.yaml")
setter.Flag(func(f console.FlagsSetter) {
f.StringVar("config", "./config.yaml", "path to config file")
})
setter.ExecFunc(func(_ []string, config string) {
application.New().
Logger(logger.Default()).
ConfigFile(
config,
pkg.Config,
webserver.Config,
dnsserver.Config,
).
Modules(
pkg.Module,
webserver.Module,
dnsserver.Module,
).
Run()
})
})
}
40 changes: 5 additions & 35 deletions configs/config.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ log: /dev/stdout
level: 3

http:
addr: 0.0.0.0:10053
addr: 0.0.0.0:10080
debug:
addr: 0.0.0.0:12053
addr: 0.0.0.0:10081

srv:
enable: true
Expand All @@ -25,37 +25,7 @@ blacklistip:
- 127.0.0.1
- 10.0.0.0/24

dns:
- 1.1.1.1
- "1.0.0.1:53"
sqlite:
- file: ./data.sqlite

dump-rules: ./dump.txt

adblock-rules:
- https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
- https://easylist.to/easylist/easylist.txt
- https://filters.adtidy.org/extension/ublock/filters/11.txt
- https://easylist.to/easylist/easyprivacy.txt
- https://filters.adtidy.org/extension/ublock/filters/17.txt
- https://filters.adtidy.org/extension/ublock/filters/3.txt
- https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badware.txt
- https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt
- https://filters.adtidy.org/extension/ublock/filters/4.txt
- https://filters.adtidy.org/extension/ublock/filters/14.txt
- https://raw.githubusercontent.com/Spam404/lists/master/adblock-list.txt

dns-rules:
"example-ns.com": "8.8.8.8, [2001:4860:4860::8888]:53"

host-rules:
"example-host.com": "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"
"example-host2.com": ""

regexp-rules:
'.*\.example-regexp\.com': "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"
'(\d+)-(\d+)-(\d+)-(\d+)\.example\.com': "$1.$2.$3.$4"
'(\d+)-(\d+)-(\d+)-(\d+)\.example2\.com': ""

query-rules:
"ex?mple.*": "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"
"ex?mple2.*": ""
adblock-rules: https://fdns.dewep.online/adblock-rules.json
35 changes: 3 additions & 32 deletions configs/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,7 @@ blacklistip:
- 127.0.0.1
- 10.0.0.0/24

dns:
- 1.1.1.1
- "1.0.0.1:53"
# - "2606:4700:4700::1111"
# - "[2606:4700:4700::1001]:53"
sqlite:
- file: /var/lib/fdns/data.sqlite

dump-rules: /var/lib/fdns/dump.txt

adblock-rules:
- https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
- https://easylist.to/easylist/easylist.txt
- https://filters.adtidy.org/extension/ublock/filters/11.txt
- https://easylist.to/easylist/easyprivacy.txt
- https://filters.adtidy.org/extension/ublock/filters/17.txt
- https://filters.adtidy.org/extension/ublock/filters/3.txt
- https://cdn.statically.io/gh/uBlockOrigin/uAssets/master/filters/badware.txt
- https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt
- https://filters.adtidy.org/extension/ublock/filters/4.txt
- https://filters.adtidy.org/extension/ublock/filters/14.txt
- https://raw.githubusercontent.com/Spam404/lists/master/adblock-list.txt

dns-rules:
# "example-ns.com": "8.8.8.8, [2001:4860:4860::8888]:53"

host-rules:
# "example-host.com": "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"

regexp-rules:
# '.*\.example-regexp\.com': "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"
# '(\d+)-(\d+)-(\d+)-(\d+)\.example\.com': "$1.$2.$3.$4"

query-rules:
# "ex?mple.*": "255.255.255.255, 0:0:0:0:0:ffff:ffff:ffff"
adblock-rules: https://fdns.dewep.online/adblock-rules.json
33 changes: 18 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ module github.com/dewep-online/fdns
go 1.17

require (
github.com/deweppro/go-app v1.4.3
github.com/deweppro/go-http v1.3.4
github.com/deweppro/go-logger v1.2.3
github.com/deweppro/go-static v1.0.6
github.com/deweppro/go-app v1.5.4
github.com/deweppro/go-errors v0.0.4
github.com/deweppro/go-http v1.4.3
github.com/deweppro/go-logger v1.3.0
github.com/deweppro/go-orm v1.1.0
github.com/deweppro/go-static v1.1.1
github.com/mailru/easyjson v0.7.7
github.com/miekg/dns v1.1.46
github.com/miekg/dns v1.1.50
github.com/stretchr/testify v1.7.1
)

require (
github.com/deweppro/go-algorithms v1.1.1 // indirect
github.com/deweppro/go-chan-pool v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deweppro/go-algorithms v1.2.0 // indirect
github.com/deweppro/go-chan-pool v1.1.2 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/pelletier/go-toml v1.9.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c // indirect
golang.org/x/tools v0.1.9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
github.com/mattn/go-sqlite3 v1.14.13 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/tools v0.1.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
87 changes: 46 additions & 41 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,49 +1,54 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deweppro/go-algorithms v1.1.1 h1:FOzPuYmFuFGN6Nmcos5zC1WfD3Ya8XxUJ6OihrhFh4Q=
github.com/deweppro/go-algorithms v1.1.1/go.mod h1:h50x8PTIGbiIhOh5vH/10J39vTzi2UmG7TVLupellqY=
github.com/deweppro/go-app v1.4.3 h1:hS+9HnAkPutdx2Cegtg7iuKBR4eV3jac93b5QdwBYQQ=
github.com/deweppro/go-app v1.4.3/go.mod h1:Tm4RUCOw7R/qnomzYT/rIykfqRI1zNfDArpHsaLgl/I=
github.com/deweppro/go-chan-pool v1.1.1 h1:TCoQhgXG6GP7zTJiKwOmqSeaR64651cWFpVniD5BIys=
github.com/deweppro/go-chan-pool v1.1.1/go.mod h1:lEtDI+rhCE/ES1i9q0FOtYgjMftw5PCCepit4a+9Uds=
github.com/deweppro/go-http v1.3.4 h1:TFTzHL9aum8vV0+rKxvULCM43niOrX8HawHRrYbThX0=
github.com/deweppro/go-http v1.3.4/go.mod h1:ojctNbO2yH7tiSMTu+PN0zgJPS7hFIWGPdoUS+dERQQ=
github.com/deweppro/go-logger v1.2.3 h1:icOV4UwBGc8s9S8zcNIcDjBK00qQtcuBZzBgRmMaq24=
github.com/deweppro/go-logger v1.2.3/go.mod h1:bPDvX/7B3+i5f8nGOq4bZbhJrf4PgjYRCePqMrF5smw=
github.com/deweppro/go-static v1.0.6 h1:9tT0fUjVUVPIp2yWT/7uaJykp0X8sT2O5pltqusyi9s=
github.com/deweppro/go-static v1.0.6/go.mod h1:Y74ygnNwniS2d22EIe4e4kASIBaD6IlmaLKUbq90PQE=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/deweppro/go-algorithms v1.2.0 h1:fBS+GNQaeSDSmvFWdmkKLcKXo2DhX5M0AJaCxEqGedY=
github.com/deweppro/go-algorithms v1.2.0/go.mod h1:zYdfRdlpaXgdT36OgvdjH1qtTZFWEeBi3KUQmWltMPI=
github.com/deweppro/go-app v1.5.4 h1:Dqg6fk4lGP2z2NtlhmT5qdDpGuYwzvRMzsEpVgvnh68=
github.com/deweppro/go-app v1.5.4/go.mod h1:rZ95OfFGvRnm5ndIJI+DOtoOuVrgy3NeQ2vwmbmi0Tk=
github.com/deweppro/go-chan-pool v1.1.2 h1:mm+gvwAFB5NijCiJDSx9RqrB2AWTembzL9Rf6XTv4BI=
github.com/deweppro/go-chan-pool v1.1.2/go.mod h1:6meJsORhraeyvJNPy4hx8xgBNjp2xx3KGB/d5Q5a/I4=
github.com/deweppro/go-errors v0.0.4 h1:TW91LRqHAkUauDJ5lzz73LziANH7mjli1tyvtwzXRCM=
github.com/deweppro/go-errors v0.0.4/go.mod h1:BLsNcxaHh1fjNl/o1TB69JwA8XueSk/Nszkvw4ZwI/I=
github.com/deweppro/go-http v1.4.3 h1:bm4PY+SBoZ9KISdtrAx8rV/hKn6t+ggt5P12+hqlE3o=
github.com/deweppro/go-http v1.4.3/go.mod h1:zta7HINyRd9nmSRtqxw6APOTXwDPBI42G9iZQwqtQVU=
github.com/deweppro/go-logger v1.3.0 h1:KN6RQmb6IoNBxQ7zx7Y1AtptHeL//FRgvQyEF5PrcsE=
github.com/deweppro/go-logger v1.3.0/go.mod h1:jxBBLyHmIvJ4erGUj5qeE6ir36ztyAL1pI+9GymOHVI=
github.com/deweppro/go-orm v1.1.0 h1:CmW1OU+W6mn0Nk1MdoMf6PWxP12nIK/sXImboIwindw=
github.com/deweppro/go-orm v1.1.0/go.mod h1:JEbxJLmXMjSOtlwhuJmrJKZRLhcJcexRvGZ6hgautaw=
github.com/deweppro/go-static v1.1.1 h1:FMKScbEj/GWEqmjiOuBFTHph15kui79RQwyT9QxZjVE=
github.com/deweppro/go-static v1.1.1/go.mod h1:xE+EEQL4vtpACZ+IkgfQvx6hbGsXnNeEodrPwN22s1c=
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/miekg/dns v1.1.46 h1:uzwpxRtSVxtcIZmz/4Uz6/Rn7G11DvsaslXoy5LxQio=
github.com/miekg/dns v1.1.46/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/mattn/go-sqlite3 v1.14.13 h1:1tj15ngiFfcZzii7yd82foL+ks+ouQcj8j/TPq3fk1I=
github.com/mattn/go-sqlite3 v1.14.13/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
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=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -53,32 +58,32 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c h1:sSIdNI2Dd6vGv47bKc/xArpfxVmEz2+3j0E6I484xC4=
golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Loading

0 comments on commit 8977226

Please sign in to comment.