From 2ed08890b7aa220a8f1f6015bb4f2ace46ac989f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 07:41:04 +0000 Subject: [PATCH 1/4] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.12.0 to 13.13.1 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.12.0...v13.13.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 84ea250..b588f95 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.8 require ( github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v13 v13.12.0 + github.com/essentialkaos/ek/v13 v13.13.1 ) require ( diff --git a/go.sum b/go.sum index 28f8617..9f8fc52 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1s4c8= github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= -github.com/essentialkaos/ek/v13 v13.12.0 h1:NV5pZWzD2vIMBDoTihAwFRoLuN2xV6ie47unhS/H8nc= -github.com/essentialkaos/ek/v13 v13.12.0/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg= +github.com/essentialkaos/ek/v13 v13.13.1 h1:JuBlzEEzWDvrNVW+goKUTG+2eB+fVNf/RY0WhGoY3Co= +github.com/essentialkaos/ek/v13 v13.13.1/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From 9a4d351c50ba037ab00bc80d857613853c14f6f6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 3 Dec 2024 00:52:29 +0300 Subject: [PATCH 2/4] Minor fix with defering response body close --- pachca.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pachca.go b/pachca.go index 293ab7e..6d1da2c 100644 --- a/pachca.go +++ b/pachca.go @@ -1628,12 +1628,12 @@ func (c *Client) UploadFile(file string) (*File, error) { }, ) - defer resp.Body.Close() - if err != nil { return nil, fmt.Errorf("Can't upload file %q data: %w", file, err) } + defer resp.Body.Close() + if resp.StatusCode >= 400 { return nil, fmt.Errorf( "Can't upload file %q data: %w", From c42d0fadb5f17ab7ca1be92fad455ff237eda489 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 3 Dec 2024 00:52:54 +0300 Subject: [PATCH 3/4] Regenerate Makefile with the latest version of gomakegen --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5dab5f7..fd466d8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 3.2.1 using next command: +# This Makefile generated by GoMakeGen 3.2.3 using next command: # gomakegen --mod . # # More info: https://kaos.sh/gomakegen @@ -48,19 +48,22 @@ else endif mod-init: - @echo "[1/2] Modules initialization…" + @echo "[1/3] Modules initialization…" + @rm -f go.mod go.sum ifdef MODULE_PATH ## Module path for initialization (String) @go mod init $(MODULE_PATH) else @go mod init endif - @echo "[2/2] Dependencies cleanup…" + @echo "[2/3] Dependencies cleanup…" ifdef COMPAT ## Compatible Go version (String) @go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT) else @go mod tidy $(VERBOSE_FLAG) endif + @echo "[3/3] Stripping toolchain info…" + @grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || : mod-update: @echo "[1/4] Updating dependencies…" @@ -109,6 +112,6 @@ help: ## Show this info | sort -h \ | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-13s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 3.2.1\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 3.2.3\033[0m\n' ################################################################################ From f9b1ab45bf1f3f986c3e73e8932cc965099f66c0 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 3 Dec 2024 00:53:00 +0300 Subject: [PATCH 4/4] Dependencies update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b588f95..d018efc 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.8 require ( github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v13 v13.13.1 + github.com/essentialkaos/ek/v13 v13.14.0 ) require ( diff --git a/go.sum b/go.sum index 9f8fc52..be48a96 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1s4c8= github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= -github.com/essentialkaos/ek/v13 v13.13.1 h1:JuBlzEEzWDvrNVW+goKUTG+2eB+fVNf/RY0WhGoY3Co= -github.com/essentialkaos/ek/v13 v13.13.1/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg= +github.com/essentialkaos/ek/v13 v13.14.0 h1:kBpA6r5wZxi09ND5vmlzpe9kvjfWSJ4AywBJM8Oq1ME= +github.com/essentialkaos/ek/v13 v13.14.0/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=