diff --git a/.gitignore b/.gitignore index e0c07bf..03e2404 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ bin config*.yaml *.log wiki -Taskfile.yml diff --git a/Taskfile.yml b/Taskfile.yml deleted file mode 100644 index 8a7f61b..0000000 --- a/Taskfile.yml +++ /dev/null @@ -1,135 +0,0 @@ -version: '3' -env: - AGH_MODEL_VERSION: v0.107.43 - GOBIN: '{{.USER_WORKING_DIR}}/bin' - -tasks: - - install-go-tool: - label: "Install {{ .TOOL_NAME }}" - cmds: - - go install {{ .TOOL_MODULE }} - status: - - test -f {{.GOBIN}}/{{.TOOL_NAME}} - - deepcopy-gen: - desc: Install deepcopy-gen - cmd: - task: install-go-tool - vars: - TOOL_NAME: deepcopy-gen - TOOL_MODULE: k8s.io/code-generator/cmd/deepcopy-gen - - ginkgo: - cmd: - task: install-go-tool - vars: - TOOL_NAME: ginkgo - TOOL_MODULE: github.com/onsi/ginkgo/v2/ginkgo - - goreleaser: - cmd: - task: install-go-tool - vars: - TOOL_NAME: goreleaser - TOOL_MODULE: github.com/goreleaser/goreleaser - - golangci-lint: - cmd: - task: install-go-tool - vars: - TOOL_NAME: golangci-lint - TOOL_MODULE: github.com/golangci/golangci-lint/cmd/golangci-lint - - mockgen: - cmd: - task: install-go-tool - vars: - TOOL_NAME: mockgen - TOOL_MODULE: go.uber.org/mock/mockgen - - oapi-codegen: - cmd: - task: install-go-tool - vars: - TOOL_NAME: oapi-codegen - TOOL_MODULE: github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen - - semver: - cmd: - task: install-go-tool - vars: - TOOL_NAME: semver - TOOL_MODULE: github.com/bakito/semver - - lint: - deps: - - golangci-lint - cmds: - - '{{.GOBIN}}/golangci-lint run --fix' - - tidy: - desc: Run go mod tidy - cmd: go mod tidy - - generate: - deps: - - deepcopy-gen - cmds: - - mkdir -p ./tmp - - touch ./tmp/deepcopy-gen-boilerplate.go.txt - - '{{.GOBIN}}/deepcopy-gen -h ./tmp/deepcopy-gen-boilerplate.go.txt -i ./pkg/types' - - mocks: - deps: - - mockgen - cmds: - - '{{.GOBIN}}/mockgen -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client' - - '{{.GOBIN}}/mockgen -package client -destination pkg/mocks/flags/mock.go github.com/bakito/adguardhome-sync/pkg/config Flags' - - test: - cmds: - - task: generate - - task: lint - - task: test-ci - - test-ci: - deps: - - ginkgo - - tidy - - mocks - cmds: - - '{{.GOBIN}}/ginkgo --cover --coverprofile coverage.out.tmp ./...' - - cat coverage.out.tmp | grep -v "_generated.go" > coverage.out - - go tool cover -func=coverage.out - - release: - deps: - - semver - - goreleaser - cmds: - - git tag -s $$version -m"Release $({{.GOBIN}}/semver) - - '{{.GOBIN}}/goreleaser --clean' - - test-release: - deps: - - goreleaser - - semver - cmds: - - '{{.GOBIN}}/goreleaser --skip=publish --snapshot --clean' - - model: - deps: - - oapi-codegen - cmds: - - mkdir -p tmp - - go run openapi/main.go {{.AGH_MODEL_VERSION}} - - '{{.GOBIN}}/oapi-codegen -package model -generate types,client -config .oapi-codegen.yaml tmp/schema.yaml > pkg/client/model/model_generated.go' - - model-diff: - deps: - - oapi-codegen - cmds: - - go run openapi/main.go {{.AGH_MODEL_VERSION}} - - go run openapi/main.go - - diff tmp/schema.yaml tmp/schema-master.yaml diff --git a/go.sum b/go.sum index f1d81cc..c707b08 100644 --- a/go.sum +++ b/go.sum @@ -152,12 +152,8 @@ golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= 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-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 h1:1wqE9dj9NpSm04INVsJhhEUzhuDVjbcyKH91sVyPATw= golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -168,8 +164,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -180,14 +174,10 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= @@ -196,8 +186,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=