Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(go): bump github.com/kunitsucom/util.go from 0.0.62 to 0.0.66 #74

Merged
merged 3 commits into from
Jun 2, 2024
Merged

build(go): bump github.com/kunitsucom/util.go from 0.0.62 to 0.0.66 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7654aa
build(go): bump github.com/kunitsucom/util.go from 0.0.62 to 0.0.66
ginokent Jun 2, 2024
11c95c6
ci: Fix .golangci.yml
ginokent Jun 2, 2024
c9ef83e
fix: typo
ginokent Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
run:
skip-files:
- cmd/sandbox/main.go
- internal/integrationtest/samples/.*\.go
modules-download-mode: readonly
allow-parallel-runners: true

Expand All @@ -12,22 +9,16 @@ linters:
- depguard # unnecessary
- dupl # disable to avoid encouraging excessive DRY
- exhaustruct # https://github.com/GaijinEntertainment/go-exhaustruct
- exhaustivestruct # https://github.com/mbilski/exhaustivestruct
- gci # unnecessary
- goconst # unnecessary
- godox # unnecessary
- golint # deprecated https://github.com/golang/lint
- gomnd # https://github.com/tommy-muehle/go-mnd
- gosmopolitan # unnecessary
- ifshort # for readability
- interfacebloat # unnecessary
- interfacer # deprecated https://github.com/mvdan/interfacer
- lll # unnecessary
- maligned # deprecated https://github.com/mdempsky/maligned
- nlreturn # ignore "return with no blank line before"
- nolintlint # unnecessary
- nonamedreturns # unnecessary
- nosnakecase # for environment variable key
- varnamelen # unnecessary
- wsl # ignore "declarations should never be cuddled"

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ versenv:
githooks:
@diff -q "${REPO_ROOT}/.githooks/pre-push" "${PRE_PUSH}" || cp -ai "${REPO_ROOT}/.githooks/pre-push" "${PRE_PUSH}"

clean: ## Clean up chace, etc
clean: ## Clean up cache, etc
go clean -x -cache -testcache -modcache -fuzzcache
golangci-lint cache clean

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.3
require (
github.com/go-sql-driver/mysql v1.8.1
github.com/googleapis/go-sql-spanner v1.3.1
github.com/kunitsucom/util.go v0.0.62
github.com/kunitsucom/util.go v0.0.66
github.com/lib/pq v1.10.9
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ github.com/googleapis/go-sql-spanner v1.3.1 h1:SNq7uPla66H6UB2e0YR8KvFG7kPKq33qG
github.com/googleapis/go-sql-spanner v1.3.1/go.mod h1:JK3o13Nt9Ov8KkNKMiMKHlQhAa05lzilABlUhKKx2Z8=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/kunitsucom/util.go v0.0.62 h1:2Ry6i4IXtDXPUu5eDMw92sNtB74pXiYTNm9xSLNI/M4=
github.com/kunitsucom/util.go v0.0.62/go.mod h1:bYFf2JvRqVF1brBtpdt3xkkTGJBxmYBxZlItrc/lf7Y=
github.com/kunitsucom/util.go v0.0.66 h1:+yVu2mXL2p7D+JjGI9RUtxyhgXcFJcE3eayUo4oDnOM=
github.com/kunitsucom/util.go v0.0.66/go.mod h1:bYFf2JvRqVF1brBtpdt3xkkTGJBxmYBxZlItrc/lf7Y=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddlctl/apply/ddlctl_apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
switch driverName {
case ddlmysql.DriverName:
ddls := strings.Split(ddlStr, ";\n")
retryer := retry.New(retry.NewConfig(time.Second, time.Second, retry.WithMaxRetries(len(ddls))))
if err := retryer.Do(ctx, func(ctx context.Context) error {
retryer := retry.New(ctx, retry.NewConfig(time.Second, time.Second, retry.WithMaxRetries(len(ddls))))
if err := retryer.Do(func(ctx context.Context) error {

Check warning on line 118 in pkg/ddlctl/apply/ddlctl_apply.go

View check run for this annotation

Codecov / codecov/patch

pkg/ddlctl/apply/ddlctl_apply.go#L117-L118 

Added lines #L117 - L118 were not covered by tests
var outerErr error
for _, q := range ddls {
if len(q) == 0 {
Expand Down
Loading