From 37a2e87a4e6855cdac48f2d3c1ca00b099636993 Mon Sep 17 00:00:00 2001 From: HenryFuhengWu Date: Fri, 16 Jul 2021 11:54:40 -0700 Subject: [PATCH 1/2] clean up code --- .travis.yml | 3 +++ README.md | 8 +++----- go/errors.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a27e537..bcd282d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,9 @@ matrix: include: - go: 1.12.x - go: 1.13.x + - go: 1.14.x + - go: 1.15.x + - go: 1.16.x env: LINT=1 install: diff --git a/README.md b/README.md index 0764ea7..326fb0d 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ [![CodeCov][cov-img]][cov] [![GoDoc][doc-img]][doc] [![Github release][release-img]][release] -[![Build Status][ci-img]][ci] -[![FOSSA][fossa-img]][fossa] [![Go Report Card][report-card-img]][report-card] [![lic][license-img]][license] [![made][made-img]][made] @@ -1154,7 +1152,7 @@ For the contributors, the following is `athenadriver` Package's UML Class Diagra ---- -`athenadriver` is brought to you by Uber ATG Infrastructure. Copyright (c) 2020 Uber Technologies, Inc. ![](resources/atg-infra.png) +`athenadriver` is brought to you by Uber. Copyright (c) 2020 Uber Technologies, Inc. @@ -1179,6 +1177,6 @@ For the contributors, the following is `athenadriver` Package's UML Class Diagra [release-policy]: https://golang.org/doc/devel/release.html#policy -[made-img]: https://img.shields.io/badge/By-Uber%20ATG-red -[made]: https://www.uber.com/us/en/atg/ +[made-img]: https://img.shields.io/badge/By-Uber%20Tech-red +[made]: https://www.uber.com diff --git a/go/errors.go b/go/errors.go index 2e64b9a..925c817 100644 --- a/go/errors.go +++ b/go/errors.go @@ -42,5 +42,5 @@ var ( ErrAthenaNilAPI = errors.New("athenaAPI must not be nil") ErrTestMockGeneric = errors.New("some_mock_error_for_test") ErrTestMockFailedByAthena = errors.New("the reason why Athena failed the query") - ErrServiceLimitOverride = errors.New(fmt.Sprintf("service limit override must be greater than %d", PoolInterval)) + ErrServiceLimitOverride = fmt.Errorf("service limit override must be greater than %d", PoolInterval) ) From 137ed81c9220d57d99d94ab3332f3aaa9a047728 Mon Sep 17 00:00:00 2001 From: HenryFuhengWu Date: Fri, 16 Jul 2021 12:08:41 -0700 Subject: [PATCH 2/2] release 1.1.13 --- ChangeLog.txt | 4 ++++ README.md | 2 +- athenareader/go.mod | 2 +- go/constants.go | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 358f5fe..c388614 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +v1.1.13 - Merge community contribution (July 16, 2021) + - Overriding Athena Service Limits for Query Timeout + - README cleanup + v1.1.12 - Minor bug fix and more documentation (October 29, 2020) - Use exact match for Query ID search diff --git a/README.md b/README.md index 326fb0d..f71c3e4 100644 --- a/README.md +++ b/README.md @@ -1163,7 +1163,7 @@ For the contributors, the following is `athenadriver` Package's UML Class Diagra [cov-img]: https://codecov.io/gh/uber/athenadriver/branch/master/graph/badge.svg [cov]: https://codecov.io/gh/uber/athenadriver -[release-img]: https://img.shields.io/badge/release-v1.1.12-red +[release-img]: https://img.shields.io/badge/release-v1.1.13-red [release]: https://github.com/uber/athenadriver/releases [report-card-img]: https://goreportcard.com/badge/github.com/uber/athenadriver diff --git a/athenareader/go.mod b/athenareader/go.mod index afa8614..6070a1f 100644 --- a/athenareader/go.mod +++ b/athenareader/go.mod @@ -3,6 +3,6 @@ module github.com/uber/athenadriver/athenareader go 1.13 require ( - github.com/uber/athenadriver v1.1.12 + github.com/uber/athenadriver v1.1.13 go.uber.org/fx v1.12.0 ) diff --git a/go/constants.go b/go/constants.go index f3df544..bb4928f 100644 --- a/go/constants.go +++ b/go/constants.go @@ -108,4 +108,4 @@ const PCStopQID = "stop_query_id" const PCGetDriverVersion = "get_driver_version" // DriverVersion is athenadriver's version -const DriverVersion = "1.1.12" +const DriverVersion = "1.1.13"