From f7aca7e741c13355a619ec3c122cdd1116067ad5 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 27 Sep 2019 02:09:28 +0300 Subject: [PATCH 1/2] Update ek package to v11 --- .travis.yml | 2 ++ CHANGELOG.md | 6 ++++++ Makefile | 15 +++++++++----- README.md | 10 +++++---- SECURITY.md | 36 +++++++++++++++++++++++++++++++++ examples/annotations_example.go | 2 +- examples/async_example.go | 2 +- examples/basic_example.go | 2 +- examples/collector_example.go | 2 +- librato.go | 8 ++++---- 10 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 SECURITY.md diff --git a/.travis.yml b/.travis.yml index 474c9a3..8ee3339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ language: go go: - 1.10.x - 1.11.x + - 1.12.x + - 1.13.x - tip branches: diff --git a/CHANGELOG.md b/CHANGELOG.md index 605cf38..d9efcaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## Changelog +### 9.0.0 + +* `ek` package updated to v11 + +--- + ### 8.0.0 * `ek` package updated to v10 diff --git a/Makefile b/Makefile index f03f958..94b9d7e 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,22 @@ ################################################################################ -# This Makefile generated by GoMakeGen 0.8.1 using next command: +# This Makefile generated by GoMakeGen 1.2.0 using next command: # gomakegen --metalinter . +# +# More info: https://kaos.sh/gomakegen ################################################################################ .DEFAULT_GOAL := help -.PHONY = fmt deps metalinter help +.PHONY = fmt git-config deps metalinter help ################################################################################ -deps: ## Download dependencies +git-config: ## Configure git redirects for stable import path services git config --global http.https://pkg.re.followRedirects true - go get -d -v pkg.re/essentialkaos/ek.v10 + +deps: git-config ## Download dependencies + go get -d -v pkg.re/essentialkaos/ek.v11 fmt: ## Format source code with gofmt find . -name "*.go" -exec gofmt -s -w {} \; @@ -22,9 +26,10 @@ metalinter: ## Install and run gometalinter $(GOPATH)/bin/gometalinter --deadline 30s help: ## Show this info - @echo -e '\nSupported targets:\n' + @echo -e '\n\033[1mSupported targets:\033[0m\n' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' @echo -e '' + @echo -e '\033[90mGenerated by GoMakeGen 1.2.0\033[0m\n' ################################################################################ diff --git a/README.md b/README.md index 4b7668d..ce33474 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@

-

Installation • Examples • License

-

@@ -10,6 +8,10 @@

+

Installation • Examples • License

+ +
+ Package for working with [Librato Metrics](https://www.librato.com) API from Go code. ### Installation @@ -23,13 +25,13 @@ git config --global http.https://pkg.re.followRedirects true Make sure you have a working Go 1.10+ workspace (_[instructions](https://golang.org/doc/install)_), then ``` -go get pkg.re/essentialkaos/librato.v8 +go get pkg.re/essentialkaos/librato.v9 ``` For update to latest stable release, do: ``` -go get -u pkg.re/essentialkaos/librato.v8 +go get -u pkg.re/essentialkaos/librato.v9 ``` ### Examples diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..f42c71e --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,36 @@ +# Security Policies and Procedures + +This document outlines security procedures and general policies for all +ESSENTIAL KAOS projects. + + * [Reporting a Bug](#reporting-a-bug) + * [Disclosure Policy](#disclosure-policy) + +## Reporting a Bug + +The ESSENTIAL KAOS team and community take all security bugs in our projects +very seriously. Thank you for improving the security of our project. We +appreciate your efforts and responsible disclosure and will make every effort +to acknowledge your contributions. + +Report security bugs by emailing our security team at security@essentialkaos.com. + +The security team will acknowledge your email within 48 hours and will send a +more detailed response within 48 hours, indicating the next steps in handling +your report. After the initial reply to your report, the security team will +endeavor to keep you informed of the progress towards a fix and full +announcement, and may ask for additional information or guidance. + +Report security bugs in third-party dependencies to the person or team +maintaining the dependencies. + +## Disclosure Policy + +When the security team receives a security bug report, they will assign it to a +primary handler. This person will coordinate the fix and release process, +involving the following steps: + + * Confirm the problem and determine the affected versions; + * Audit code to find any similar potential problems; + * Prepare fixes for all releases still under maintenance. These fixes will be + released as fast as possible. diff --git a/examples/annotations_example.go b/examples/annotations_example.go index d120ca9..311b8d0 100644 --- a/examples/annotations_example.go +++ b/examples/annotations_example.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "pkg.re/essentialkaos/librato.v8" + "pkg.re/essentialkaos/librato.v9" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/async_example.go b/examples/async_example.go index 93bf1d8..cf047e2 100644 --- a/examples/async_example.go +++ b/examples/async_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v8" + "pkg.re/essentialkaos/librato.v9" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/basic_example.go b/examples/basic_example.go index 443a55b..817a00a 100644 --- a/examples/basic_example.go +++ b/examples/basic_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v8" + "pkg.re/essentialkaos/librato.v9" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/collector_example.go b/examples/collector_example.go index 26b0477..033c27a 100644 --- a/examples/collector_example.go +++ b/examples/collector_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v8" + "pkg.re/essentialkaos/librato.v9" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/librato.go b/librato.go index e072692..32673ca 100644 --- a/librato.go +++ b/librato.go @@ -3,7 +3,7 @@ package librato // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2009-2018 ESSENTIAL KAOS // +// Copyright (c) 2009-2019 ESSENTIAL KAOS // // Essential Kaos Open Source License // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -15,14 +15,14 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v10/req" - "pkg.re/essentialkaos/ek.v10/timeutil" + "pkg.re/essentialkaos/ek.v11/req" + "pkg.re/essentialkaos/ek.v11/timeutil" ) // ////////////////////////////////////////////////////////////////////////////////// // // VERSION contains current version of librato package and used as part of User-Agent -const VERSION = "8.0.0" +const VERSION = "9.0.0" // ////////////////////////////////////////////////////////////////////////////////// // From 17619fb4e47207f91fbe17e1fd53133ed7505ac1 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 27 Sep 2019 02:21:11 +0300 Subject: [PATCH 2/2] Update import path in examples --- examples/annotations_example.go | 2 +- examples/async_example.go | 2 +- examples/basic_example.go | 2 +- examples/collector_example.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/annotations_example.go b/examples/annotations_example.go index 311b8d0..c5fe9e7 100644 --- a/examples/annotations_example.go +++ b/examples/annotations_example.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "pkg.re/essentialkaos/librato.v9" + "github.com/essentialkaos/librato" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/async_example.go b/examples/async_example.go index cf047e2..366c68d 100644 --- a/examples/async_example.go +++ b/examples/async_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v9" + "github.com/essentialkaos/librato" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/basic_example.go b/examples/basic_example.go index 817a00a..b2ec0ee 100644 --- a/examples/basic_example.go +++ b/examples/basic_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v9" + "github.com/essentialkaos/librato" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/examples/collector_example.go b/examples/collector_example.go index 033c27a..eea92ba 100644 --- a/examples/collector_example.go +++ b/examples/collector_example.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "pkg.re/essentialkaos/librato.v9" + "github.com/essentialkaos/librato" ) // ////////////////////////////////////////////////////////////////////////////////// //