From efbd5e88bfbbf466fe9e5c99d43cb5607acde50d Mon Sep 17 00:00:00 2001 From: Ravi Atluri Date: Mon, 14 Aug 2023 10:14:19 +0530 Subject: [PATCH 1/2] Releasing v0.4.0 --- examples/xkafka/go.mod | 6 +++--- examples/xload/go.mod | 4 ++-- version.go | 2 +- xkafka/middleware/go.mod | 2 +- xkafka/middleware/prometheus/go.mod | 2 +- xkafka/middleware/zerolog/go.mod | 2 +- xload/providers/yaml/go.mod | 2 +- xpod/go.mod | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/xkafka/go.mod b/examples/xkafka/go.mod index 36e96d4..7bc2b35 100644 --- a/examples/xkafka/go.mod +++ b/examples/xkafka/go.mod @@ -12,9 +12,9 @@ replace ( require ( github.com/gojekfarm/xrun v0.3.0 - github.com/gojekfarm/xtools/xkafka v0.3.0 - github.com/gojekfarm/xtools/xkafka/middleware/prometheus v0.3.0 - github.com/gojekfarm/xtools/xkafka/middleware/zerolog v0.3.0 + github.com/gojekfarm/xtools/xkafka v0.4.0 + github.com/gojekfarm/xtools/xkafka/middleware/prometheus v0.4.0 + github.com/gojekfarm/xtools/xkafka/middleware/zerolog v0.4.0 github.com/prometheus/client_golang v1.14.0 github.com/rs/xid v1.4.0 github.com/rs/zerolog v1.29.0 diff --git a/examples/xload/go.mod b/examples/xload/go.mod index 2ac683f..95dff2a 100644 --- a/examples/xload/go.mod +++ b/examples/xload/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - github.com/gojekfarm/xtools/xload v0.0.0-00010101000000-000000000000 - github.com/gojekfarm/xtools/xload/providers/yaml v0.0.0-00010101000000-000000000000 + github.com/gojekfarm/xtools/xload v0.4.0 + github.com/gojekfarm/xtools/xload/providers/yaml v0.4.0 ) require ( diff --git a/version.go b/version.go index 1396131..17bb7df 100644 --- a/version.go +++ b/version.go @@ -2,6 +2,6 @@ package xtools // Version can be used to get the current xtools library version func Version() string { - return "0.3.0" + return "0.4.0" // This string is updated by the pre_release.sh script during release } diff --git a/xkafka/middleware/go.mod b/xkafka/middleware/go.mod index 96a3b28..13160de 100644 --- a/xkafka/middleware/go.mod +++ b/xkafka/middleware/go.mod @@ -5,7 +5,7 @@ go 1.19 replace github.com/gojekfarm/xtools/xkafka => ../ require ( - github.com/gojekfarm/xtools/xkafka v0.3.0 + github.com/gojekfarm/xtools/xkafka v0.4.0 github.com/stretchr/testify v1.8.1 ) diff --git a/xkafka/middleware/prometheus/go.mod b/xkafka/middleware/prometheus/go.mod index d0764b0..6f7c14b 100644 --- a/xkafka/middleware/prometheus/go.mod +++ b/xkafka/middleware/prometheus/go.mod @@ -5,7 +5,7 @@ go 1.19 replace github.com/gojekfarm/xtools/xkafka => ../../ require ( - github.com/gojekfarm/xtools/xkafka v0.3.0 + github.com/gojekfarm/xtools/xkafka v0.4.0 github.com/prometheus/client_golang v1.14.0 github.com/stretchr/testify v1.8.1 ) diff --git a/xkafka/middleware/zerolog/go.mod b/xkafka/middleware/zerolog/go.mod index 82239ca..76ef680 100644 --- a/xkafka/middleware/zerolog/go.mod +++ b/xkafka/middleware/zerolog/go.mod @@ -5,7 +5,7 @@ go 1.19 replace github.com/gojekfarm/xtools/xkafka => ../../ require ( - github.com/gojekfarm/xtools/xkafka v0.3.0 + github.com/gojekfarm/xtools/xkafka v0.4.0 github.com/rs/zerolog v1.29.0 ) diff --git a/xload/providers/yaml/go.mod b/xload/providers/yaml/go.mod index 6bd97df..13d8688 100644 --- a/xload/providers/yaml/go.mod +++ b/xload/providers/yaml/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/gojekfarm/xtools/xload => ../.. require ( - github.com/gojekfarm/xtools/xload v0.0.0-00010101000000-000000000000 + github.com/gojekfarm/xtools/xload v0.4.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/xpod/go.mod b/xpod/go.mod index 1d417e9..7aca5cc 100644 --- a/xpod/go.mod +++ b/xpod/go.mod @@ -3,7 +3,7 @@ module github.com/gojekfarm/xtools/xpod go 1.18 require ( - github.com/gojekfarm/xtools/generic v0.3.0 + github.com/gojekfarm/xtools/generic v0.4.0 github.com/stretchr/testify v1.8.2 ) From f3e2aec85c39205a022f0e029e5368a6e298e7b6 Mon Sep 17 00:00:00 2001 From: Ravi Atluri Date: Mon, 14 Aug 2023 11:46:00 +0530 Subject: [PATCH 2/2] Updated CHANGELOG --- .gitignore | 4 +++- CHANGELOG.md | 23 +++++++++++++++-------- xload/doc.go | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5da6556..c132651 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,6 @@ vendor/ tools/vendor go.work -go.work.sum \ No newline at end of file +go.work.sum + +.envrc \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f004a5..bf49841 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,17 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [0.4.0] + +### Added + +- [`xload`](./xload) Added `xload` package which is a struct first data loading library. +- [`xload/providers/yaml`](./xload/providers/yaml) Added `yaml` provider for `xload` package. + +### Changed + +- [`xmap`](./xmap) Added `xmap.Merge` function to merge two maps. + ## [0.3.0] ### Added @@ -15,8 +26,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [`xpod`](./xpod) Added `xpod` package which contains utilities that help implement best practices for health checks and more, while building go apps for kubernetes pods. - [`xkafka/middleware`](./xkafka/middleware) - - Added Prometheus middleware for `Consumer` and `Producer` implementations. - - Added Logging MiddlewareFunc. + - Added Prometheus middleware for `Consumer` and `Producer` implementations. + - Added Logging MiddlewareFunc. ## [0.2.0] @@ -39,13 +50,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [`generic`](./generic) package added - [`xproto`](./xproto) package added -[Unreleased]: https://github.com/gojekfarm/xtools/compare/v0.3.0...HEAD - +[Unreleased]: https://github.com/gojekfarm/xtools/compare/v0.4.0...HEAD +[0.4.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.4.0 [0.3.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.3.0 - [0.2.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.2.0 - [0.1.1]: https://github.com/gojekfarm/xtools/releases/tag/v0.1.1 - [0.1.0]: https://github.com/gojekfarm/xtools/releases/tag/v0.1.0 - diff --git a/xload/doc.go b/xload/doc.go index 75f2d0d..a0677d8 100644 --- a/xload/doc.go +++ b/xload/doc.go @@ -1,4 +1,4 @@ -// Package xload is a struct first configuration loading library. +// Package xload is a struct first data loading library. // xload provides a simple Loader interface to implement custom // loaders and compose them in different ways. package xload