From 15e356dc19c3a9639a4bed1c3f66814a45e40eb3 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 21 Feb 2024 17:51:47 +0200 Subject: [PATCH] Expose-errors (#461) * Bumped to golang 1.22 * Bumped golangci-lint to `v1.56.2` * Bumped mockery to `v2.42.0` * Bumped version to 1.0.3 --- Makefile | 6 +++--- codefresh.yaml | 2 +- go.mod | 4 +--- pkg/client/client.go | 6 +++--- pkg/mocks/http_mock.go | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 7ab081d..b92f05c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=v1.0.2 +VERSION=v1.0.3 ifndef GOBIN ifndef GOPATH @@ -48,9 +48,9 @@ cur-version: @echo -n $(VERSION) $(GOBIN)/mockery: - @go install github.com/vektra/mockery/v2@v2.39.1 + @go install github.com/vektra/mockery/v2@v2.42.0 @mockery --version $(GOBIN)/golangci-lint: @echo installing: golangci-lint - @curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.55.2 + @curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.56.2 diff --git a/codefresh.yaml b/codefresh.yaml index 6495afd..170c544 100644 --- a/codefresh.yaml +++ b/codefresh.yaml @@ -17,7 +17,7 @@ steps: prepare_env_vars: &deps stage: Prepare title: prepare-env - image: quay.io/codefresh/golang-ci-helper:1.21 + image: quay.io/codefresh/golang-ci-helper:1.22 commands: - cf_export GO111MODULE=on - cf_export GOCACHE=/codefresh/volume/gocache # change gopath to codefresh shared volume diff --git a/go.mod b/go.mod index 10f7ee8..dc0744b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/codefresh-io/go-sdk -go 1.21 - -toolchain go1.21.5 +go 1.22 require ( github.com/stretchr/testify v1.8.4 diff --git a/pkg/client/client.go b/pkg/client/client.go index da02143..27d27b6 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -48,7 +48,7 @@ type ( } GraphqlErrorResponse struct { - errors []GraphqlError + Errors []GraphqlError concatenatedErrors string } @@ -186,7 +186,7 @@ func (e GraphqlErrorResponse) Error() string { } var sb strings.Builder - for _, err := range e.errors { + for _, err := range e.Errors { sb.WriteString(fmt.Sprintln(err.Message)) } @@ -219,7 +219,7 @@ func GraphqlAPI[T any](ctx context.Context, client *CfClient, query string, vari } if wrapper.Errors != nil { - err = &GraphqlErrorResponse{errors: wrapper.Errors} + err = &GraphqlErrorResponse{Errors: wrapper.Errors} } return result, err diff --git a/pkg/mocks/http_mock.go b/pkg/mocks/http_mock.go index 1808162..01dece9 100644 --- a/pkg/mocks/http_mock.go +++ b/pkg/mocks/http_mock.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.39.1. DO NOT EDIT. +// Code generated by mockery v2.42.0. DO NOT EDIT. package mocks