From d7aebb1ab33cab4f1bdc7bfc45a78601e3c8bfd0 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Sun, 18 Oct 2026 18:07:07 +0300 Subject: [PATCH 1/2] src: module path is github.com/insei/tinyconf/v2 Signed-off-by: Dmitriy Aleksandrov --- Readme.md | 19 ++++++++++--------- cmp118/cmp.go | 6 +++--- docs/drivers/consul.md | 2 +- docs/drivers/env.md | 2 +- docs/drivers/etcd.md | 2 +- docs/drivers/flag.md | 2 +- docs/drivers/format.md | 2 +- docs/drivers/ini.md | 2 +- docs/drivers/json.md | 2 +- docs/drivers/properties.md | 2 +- docs/drivers/tag.md | 2 +- docs/drivers/toml.md | 2 +- docs/drivers/vault.md | 2 +- docs/drivers/yaml.md | 2 +- docs/features/logging.md | 2 +- docs/index.md | 14 +++++++------- drivers/bench_test.go | 8 ++++---- drivers/conformance_test.go | 16 ++++++++-------- drivers/consul/client.go | 2 +- drivers/consul/consul.go | 6 +++--- drivers/consul/consul_test.go | 4 ++-- drivers/embedded_test.go | 10 +++++----- drivers/env/env.go | 8 ++++---- drivers/env/env_test.go | 2 +- drivers/env/example_test.go | 4 ++-- drivers/etcd/client.go | 2 +- drivers/etcd/etcd.go | 6 +++--- drivers/etcd/etcd_test.go | 4 ++-- drivers/flag/example_test.go | 4 ++-- drivers/flag/flag.go | 4 ++-- drivers/flag/flag_test.go | 2 +- drivers/format/example_test.go | 4 ++-- drivers/format/format.go | 6 +++--- drivers/format/format_test.go | 4 ++-- drivers/ini/ini.go | 6 +++--- drivers/ini/ini_test.go | 4 ++-- drivers/internal/tree/tree.go | 4 ++-- drivers/internal/tree/tree_test.go | 4 ++-- drivers/json/json.go | 6 +++--- drivers/json/json_gendoc_test.go | 2 +- drivers/json/json_source_test.go | 4 ++-- drivers/json/json_test.go | 2 +- drivers/json/json_watch_test.go | 2 +- drivers/merge_test.go | 8 ++++---- drivers/properties/properties.go | 6 +++--- drivers/properties/properties_test.go | 4 ++-- drivers/struct_pointers_test.go | 8 ++++---- drivers/tag/tag.go | 4 ++-- drivers/toml/toml.go | 6 +++--- drivers/toml/toml_gendoc_test.go | 2 +- drivers/toml/toml_source_test.go | 4 ++-- drivers/toml/toml_test.go | 2 +- drivers/toml/toml_watch_test.go | 2 +- drivers/vault/client.go | 4 ++-- drivers/vault/vault.go | 6 +++--- drivers/vault/vault_test.go | 2 +- drivers/yaml/example_test.go | 4 ++-- drivers/yaml/yaml.go | 10 +++++----- drivers/yaml/yaml_gendoc_test.go | 2 +- drivers/yaml/yaml_source_test.go | 4 ++-- drivers/yaml/yaml_test.go | 2 +- e2e/consul_test.go | 6 +++--- e2e/etcd_test.go | 6 +++--- e2e/go.mod | 4 ++-- e2e/vault_test.go | 4 ++-- example/go.mod | 4 ++-- example/main.go | 12 ++++++------ example_test.go | 10 +++++----- go.mod | 2 +- logger/fields_test.go | 2 +- logger/fmt.go | 2 +- logger/fmt_test.go | 2 +- logger/slog.go | 2 +- logger/slog_test.go | 2 +- logger/zaplogger/go.mod | 4 ++-- logger/zaplogger/zaplogger.go | 2 +- logger/zaplogger/zaplogger_test.go | 2 +- parser.go | 2 +- subscribe.go | 2 +- 79 files changed, 173 insertions(+), 172 deletions(-) diff --git a/Readme.md b/Readme.md index f5d7025..2c0a05f 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ [![codecov](https://codecov.io/gh/Insei/tinyconf/graph/badge.svg?token=TSOJ1SWF9D)](https://codecov.io/gh/Insei/tinyconf) [![build](https://github.com/insei/tinyconf/actions/workflows/go.yml/badge.svg)](https://github.com/Insei/tinyconf/actions/workflows/go.yml) [![Goreport](https://goreportcard.com/badge/github.com/insei/tinyconf)](https://goreportcard.com/report/github.com/insei/tinyconf) -[![GoDoc](https://godoc.org/github.com/insei/tinyconf?status.svg)](https://godoc.org/github.com/insei/tinyconf) +[![GoDoc](https://godoc.org/github.com/insei/tinyconf/v2?status.svg)](https://godoc.org/github.com/insei/tinyconf/v2) # tinyconf tinyconf - a simple and universal library for parsing configs. @@ -10,8 +10,9 @@ Documentation: [insei.github.io/tinyconf](https://insei.github.io/tinyconf/) — # Installation Install via go get. Note that Go 1.19 or newer is required. ```sh -go get github.com/insei/tinyconf@latest +go get github.com/insei/tinyconf/v2@latest ``` +Upgrading from v1: see [Upgrading to v2](https://insei.github.io/tinyconf/latest/upgrading/). # Description tinyconf fills config structs with values from drivers. When initializing `tinyconf.Manager`, you can add a logger to it, @@ -190,12 +191,12 @@ import ( "fmt" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/flag" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" - "github.com/insei/tinyconf/logger" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/flag" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" + "github.com/insei/tinyconf/v2/logger" ) type HTTP struct { @@ -305,4 +306,4 @@ If the driver implements the optional `tinyconf.Loader` or `tinyconf.ContextLoad so the driver can read its source once and not for every field. If the driver implements the optional `tinyconf.Watcher` interface, it can report changes of its source for reloading. -More examples: the service in the [`example`](example) directory, runnable examples on [pkg.go.dev](https://pkg.go.dev/github.com/insei/tinyconf#pkg-examples), recipes in the [documentation](https://insei.github.io/tinyconf/latest/use-cases/). +More examples: the service in the [`example`](example) directory, runnable examples on [pkg.go.dev](https://pkg.go.dev/github.com/insei/tinyconf/v2#pkg-examples), recipes in the [documentation](https://insei.github.io/tinyconf/latest/use-cases/). diff --git a/cmp118/cmp.go b/cmp118/cmp.go index f871886..abe3872 100644 --- a/cmp118/cmp.go +++ b/cmp118/cmp.go @@ -11,9 +11,9 @@ package cmp118 // See the [Compare] function for a consistent way to compare NaN values. type Ordered interface { ~int | ~int8 | ~int16 | ~int32 | ~int64 | - ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr | - ~float32 | ~float64 | - ~string + ~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~uintptr | + ~float32 | ~float64 | + ~string } // Compare returns diff --git a/docs/drivers/consul.md b/docs/drivers/consul.md index cbb06a5..4f321cd 100644 --- a/docs/drivers/consul.md +++ b/docs/drivers/consul.md @@ -12,7 +12,7 @@ Both ways report changes for [reloading](../features/reloading.md) as soon as th ## Key per field ```go -import "github.com/insei/tinyconf/drivers/consul" +import "github.com/insei/tinyconf/v2/drivers/consul" consulDriver, err := consul.New("app") ``` diff --git a/docs/drivers/env.md b/docs/drivers/env.md index 261100d..8764ed6 100644 --- a/docs/drivers/env.md +++ b/docs/drivers/env.md @@ -3,7 +3,7 @@ The env driver reads values from environment variables and `.env` files. ```go -import "github.com/insei/tinyconf/drivers/env" +import "github.com/insei/tinyconf/v2/drivers/env" envDriver, err := env.New() ``` diff --git a/docs/drivers/etcd.md b/docs/drivers/etcd.md index df5ff86..3472792 100644 --- a/docs/drivers/etcd.md +++ b/docs/drivers/etcd.md @@ -12,7 +12,7 @@ Both ways report changes for [reloading](../features/reloading.md) as soon as th ## Key per field ```go -import "github.com/insei/tinyconf/drivers/etcd" +import "github.com/insei/tinyconf/v2/drivers/etcd" etcdDriver, err := etcd.New("app") ``` diff --git a/docs/drivers/flag.md b/docs/drivers/flag.md index 6f3213e..58c5852 100644 --- a/docs/drivers/flag.md +++ b/docs/drivers/flag.md @@ -3,7 +3,7 @@ The flag driver reads values from command line flags. ```go -import "github.com/insei/tinyconf/drivers/flag" +import "github.com/insei/tinyconf/v2/drivers/flag" flagDriver, err := flag.New() ``` diff --git a/docs/drivers/format.md b/docs/drivers/format.md index c5a5f0b..7aac55b 100644 --- a/docs/drivers/format.md +++ b/docs/drivers/format.md @@ -3,7 +3,7 @@ The format driver reads config files of any format with nested objects. The format is set by a function that decodes the content to a map, everything else is the same as in the [yaml](yaml.md), [json](json.md) and [toml](toml.md) drivers: several files, merging, embedded files, [remote documents](consul.md#document), environment variables in the content, [reloading](../features/reloading.md), [documentation](../features/gendoc.md). ```go -import "github.com/insei/tinyconf/drivers/format" +import "github.com/insei/tinyconf/v2/drivers/format" driver, err := format.New("hujson", decodeHuJSON, "config.hujson") ``` diff --git a/docs/drivers/ini.md b/docs/drivers/ini.md index 4fcfed5..cf7f587 100644 --- a/docs/drivers/ini.md +++ b/docs/drivers/ini.md @@ -3,7 +3,7 @@ The ini driver reads values from INI files. ```go -import "github.com/insei/tinyconf/drivers/ini" +import "github.com/insei/tinyconf/v2/drivers/ini" iniDriver, err := ini.New("config.ini") ``` diff --git a/docs/drivers/json.md b/docs/drivers/json.md index b4f461f..1a06178 100644 --- a/docs/drivers/json.md +++ b/docs/drivers/json.md @@ -3,7 +3,7 @@ The json driver reads values from JSON files. ```go -import "github.com/insei/tinyconf/drivers/json" +import "github.com/insei/tinyconf/v2/drivers/json" jsonDriver, err := json.New("config.json") ``` diff --git a/docs/drivers/properties.md b/docs/drivers/properties.md index e978526..066e03b 100644 --- a/docs/drivers/properties.md +++ b/docs/drivers/properties.md @@ -3,7 +3,7 @@ The properties driver reads values from `.properties` files — the format of Java and Spring, `application.properties`. ```go -import "github.com/insei/tinyconf/drivers/properties" +import "github.com/insei/tinyconf/v2/drivers/properties" propertiesDriver, err := properties.New("application.properties") ``` diff --git a/docs/drivers/tag.md b/docs/drivers/tag.md index 76abb38..2e3b9fd 100644 --- a/docs/drivers/tag.md +++ b/docs/drivers/tag.md @@ -3,7 +3,7 @@ The tag driver takes values right from the struct tags. It is used for default values. ```go -import "github.com/insei/tinyconf/drivers/tag" +import "github.com/insei/tinyconf/v2/drivers/tag" tagDriver, err := tag.New("initial") ``` diff --git a/docs/drivers/toml.md b/docs/drivers/toml.md index b36cf31..7510ed3 100644 --- a/docs/drivers/toml.md +++ b/docs/drivers/toml.md @@ -3,7 +3,7 @@ The toml driver reads values from TOML files. ```go -import "github.com/insei/tinyconf/drivers/toml" +import "github.com/insei/tinyconf/v2/drivers/toml" tomlDriver, err := toml.New("config.toml") ``` diff --git a/docs/drivers/vault.md b/docs/drivers/vault.md index 34ef3be..dcf5938 100644 --- a/docs/drivers/vault.md +++ b/docs/drivers/vault.md @@ -3,7 +3,7 @@ The vault driver reads values from the [KV secrets engine](https://developer.hashicorp.com/vault/docs/secrets/kv) of HashiCorp Vault. ```go -import "github.com/insei/tinyconf/drivers/vault" +import "github.com/insei/tinyconf/v2/drivers/vault" vaultDriver, err := vault.New("app/config") ``` diff --git a/docs/drivers/yaml.md b/docs/drivers/yaml.md index 9cf5da5..2738605 100644 --- a/docs/drivers/yaml.md +++ b/docs/drivers/yaml.md @@ -3,7 +3,7 @@ The yaml driver reads values from YAML files. ```go -import "github.com/insei/tinyconf/drivers/yaml" +import "github.com/insei/tinyconf/v2/drivers/yaml" yamlDriver, err := yaml.New("config.yaml") ``` diff --git a/docs/features/logging.md b/docs/features/logging.md index 758e457..ead4042 100644 --- a/docs/features/logging.md +++ b/docs/features/logging.md @@ -64,7 +64,7 @@ Add the tag to the parent, `yaml:"http"`, to read the value from `http.host`. ## Bundled loggers ```go -import "github.com/insei/tinyconf/logger" +import "github.com/insei/tinyconf/v2/logger" // prints to stdout, levels: FATAL, ERROR, WARN, INFO, DEBUG, TRACE tinyconf.WithLogger(logger.NewFmtLogger(logger.INFO)) diff --git a/docs/index.md b/docs/index.md index 5adf4b6..7957e15 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ ## Install ```bash -go get github.com/insei/tinyconf@latest +go get github.com/insei/tinyconf/v2@latest ``` Minimum Go version is **1.19**. @@ -22,11 +22,11 @@ import ( "fmt" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" - "github.com/insei/tinyconf/logger" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" + "github.com/insei/tinyconf/v2/logger" ) type HTTP struct { @@ -114,7 +114,7 @@ and `HTTP_HOST=example.com` in the environment the program prints Bundled drivers and how to write your own. -- :simple-go:{ .lg } **[API reference →](https://pkg.go.dev/github.com/insei/tinyconf)** +- :simple-go:{ .lg } **[API reference →](https://pkg.go.dev/github.com/insei/tinyconf/v2)** Autogenerated on pkg.go.dev. diff --git a/drivers/bench_test.go b/drivers/bench_test.go index 1216f7b..cc4ceb9 100644 --- a/drivers/bench_test.go +++ b/drivers/bench_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" ) type benchServer struct { diff --git a/drivers/conformance_test.go b/drivers/conformance_test.go index 97106d7..0262148 100644 --- a/drivers/conformance_test.go +++ b/drivers/conformance_test.go @@ -18,14 +18,14 @@ import ( "github.com/stretchr/testify/assert" yamlv3 "gopkg.in/yaml.v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/flag" - jsondriver "github.com/insei/tinyconf/drivers/json" - "github.com/insei/tinyconf/drivers/tag" - tomldriver "github.com/insei/tinyconf/drivers/toml" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/flag" + jsondriver "github.com/insei/tinyconf/v2/drivers/json" + "github.com/insei/tinyconf/v2/drivers/tag" + tomldriver "github.com/insei/tinyconf/v2/drivers/toml" + "github.com/insei/tinyconf/v2/drivers/yaml" ) type conformanceNamedString string diff --git a/drivers/consul/client.go b/drivers/consul/client.go index b9abe69..8aa1f0a 100644 --- a/drivers/consul/client.go +++ b/drivers/consul/client.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) const ( diff --git a/drivers/consul/consul.go b/drivers/consul/consul.go index 4094514..741d5a2 100644 --- a/drivers/consul/consul.go +++ b/drivers/consul/consul.go @@ -15,9 +15,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const name = "consul" diff --git a/drivers/consul/consul_test.go b/drivers/consul/consul_test.go index 97e1797..ef87287 100644 --- a/drivers/consul/consul_test.go +++ b/drivers/consul/consul_test.go @@ -14,8 +14,8 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/yaml" ) func init() { diff --git a/drivers/embedded_test.go b/drivers/embedded_test.go index d0eb48f..1bc8e3b 100644 --- a/drivers/embedded_test.go +++ b/drivers/embedded_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/json" - "github.com/insei/tinyconf/drivers/toml" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/json" + "github.com/insei/tinyconf/v2/drivers/toml" + "github.com/insei/tinyconf/v2/drivers/yaml" ) type embeddedCommon struct { diff --git a/drivers/env/env.go b/drivers/env/env.go index 66c92c6..d93331c 100644 --- a/drivers/env/env.go +++ b/drivers/env/env.go @@ -10,10 +10,10 @@ import ( "strings" "unicode" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/cmp118" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/slices118" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/cmp118" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/slices118" "github.com/insei/fmap/v3" ) diff --git a/drivers/env/env_test.go b/drivers/env/env_test.go index 81d71bf..e215e1a 100644 --- a/drivers/env/env_test.go +++ b/drivers/env/env_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" "github.com/stretchr/testify/assert" ) diff --git a/drivers/env/example_test.go b/drivers/env/example_test.go index 3f4b57b..6d68605 100644 --- a/drivers/env/example_test.go +++ b/drivers/env/example_test.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" ) // With the prefix, auto keys and indexed keys the variables are found without the env tags of every field. diff --git a/drivers/etcd/client.go b/drivers/etcd/client.go index c285fbc..4acce73 100644 --- a/drivers/etcd/client.go +++ b/drivers/etcd/client.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) // DefaultEndpoint is used if the endpoints are not set by the option and by the ETCDCTL_ENDPOINTS variable. diff --git a/drivers/etcd/etcd.go b/drivers/etcd/etcd.go index 994f786..c556273 100644 --- a/drivers/etcd/etcd.go +++ b/drivers/etcd/etcd.go @@ -15,9 +15,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const name = "etcd" diff --git a/drivers/etcd/etcd_test.go b/drivers/etcd/etcd_test.go index 41c562d..d8fe681 100644 --- a/drivers/etcd/etcd_test.go +++ b/drivers/etcd/etcd_test.go @@ -12,8 +12,8 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/yaml" ) func init() { diff --git a/drivers/flag/example_test.go b/drivers/flag/example_test.go index aea0185..41577fc 100644 --- a/drivers/flag/example_test.go +++ b/drivers/flag/example_test.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/flag" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/flag" ) // Flags are read from the arguments, unknown flags are ignored, so the driver works next to any CLI framework. diff --git a/drivers/flag/flag.go b/drivers/flag/flag.go index f772211..9d61199 100644 --- a/drivers/flag/flag.go +++ b/drivers/flag/flag.go @@ -9,8 +9,8 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" ) type flagDriver struct { diff --git a/drivers/flag/flag_test.go b/drivers/flag/flag_test.go index 16f3f7e..483605a 100644 --- a/drivers/flag/flag_test.go +++ b/drivers/flag/flag_test.go @@ -10,7 +10,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type testConfig struct { diff --git a/drivers/format/example_test.go b/drivers/format/example_test.go index aecda62..3b79a4a 100644 --- a/drivers/format/example_test.go +++ b/drivers/format/example_test.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/format" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/format" ) // A format is plugged by the decoder: here it is JSON without the lines with // comments. diff --git a/drivers/format/format.go b/drivers/format/format.go index c52995a..e2a83e6 100644 --- a/drivers/format/format.go +++ b/drivers/format/format.go @@ -9,9 +9,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) // Decoder decodes the content of the config to the map: keys of the map are the keys of the config, diff --git a/drivers/format/format_test.go b/drivers/format/format_test.go index fa466b9..580320b 100644 --- a/drivers/format/format_test.go +++ b/drivers/format/format_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) // decodeLines decodes the format of the tests: key.path=value lines, the parts of the key are nested objects. diff --git a/drivers/ini/ini.go b/drivers/ini/ini.go index c4a2127..25874ce 100644 --- a/drivers/ini/ini.go +++ b/drivers/ini/ini.go @@ -12,9 +12,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const name = "ini" diff --git a/drivers/ini/ini_test.go b/drivers/ini/ini_test.go index add0138..87c682b 100644 --- a/drivers/ini/ini_test.go +++ b/drivers/ini/ini_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) type server struct { diff --git a/drivers/internal/tree/tree.go b/drivers/internal/tree/tree.go index fda4179..23a0d7b 100644 --- a/drivers/internal/tree/tree.go +++ b/drivers/internal/tree/tree.go @@ -18,8 +18,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" ) // Decoder decodes the config content to the map. diff --git a/drivers/internal/tree/tree_test.go b/drivers/internal/tree/tree_test.go index c251517..8d2104b 100644 --- a/drivers/internal/tree/tree_test.go +++ b/drivers/internal/tree/tree_test.go @@ -16,8 +16,8 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" ) func TestLookup(t *testing.T) { diff --git a/drivers/json/json.go b/drivers/json/json.go index ace7ae9..ca55217 100644 --- a/drivers/json/json.go +++ b/drivers/json/json.go @@ -10,9 +10,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) type jsonDriver struct { diff --git a/drivers/json/json_gendoc_test.go b/drivers/json/json_gendoc_test.go index 1a51520..fa0e39e 100644 --- a/drivers/json/json_gendoc_test.go +++ b/drivers/json/json_gendoc_test.go @@ -7,7 +7,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestJSONDriver_GenDoc_NotEncodable(t *testing.T) { diff --git a/drivers/json/json_source_test.go b/drivers/json/json_source_test.go index 3d72a8e..c99c27f 100644 --- a/drivers/json/json_source_test.go +++ b/drivers/json/json_source_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) func TestJSONDriver_WithSource(t *testing.T) { diff --git a/drivers/json/json_test.go b/drivers/json/json_test.go index 8de6d89..281fc86 100644 --- a/drivers/json/json_test.go +++ b/drivers/json/json_test.go @@ -11,7 +11,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type testConfig struct { diff --git a/drivers/json/json_watch_test.go b/drivers/json/json_watch_test.go index 6a94312..48d5396 100644 --- a/drivers/json/json_watch_test.go +++ b/drivers/json/json_watch_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestJSONDriver_Watch(t *testing.T) { diff --git a/drivers/merge_test.go b/drivers/merge_test.go index f4d7fcb..098e078 100644 --- a/drivers/merge_test.go +++ b/drivers/merge_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" ) func TestMergeTag(t *testing.T) { diff --git a/drivers/properties/properties.go b/drivers/properties/properties.go index bc1969b..1ec8896 100644 --- a/drivers/properties/properties.go +++ b/drivers/properties/properties.go @@ -13,9 +13,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const name = "properties" diff --git a/drivers/properties/properties_test.go b/drivers/properties/properties_test.go index b634d02..a9dbd1c 100644 --- a/drivers/properties/properties_test.go +++ b/drivers/properties/properties_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) type server struct { diff --git a/drivers/struct_pointers_test.go b/drivers/struct_pointers_test.go index 347c8da..0878b1d 100644 --- a/drivers/struct_pointers_test.go +++ b/drivers/struct_pointers_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" ) type pointersTLS struct { diff --git a/drivers/tag/tag.go b/drivers/tag/tag.go index 2ed9795..10ed375 100644 --- a/drivers/tag/tag.go +++ b/drivers/tag/tag.go @@ -5,8 +5,8 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" ) type defaultTagDriver struct { diff --git a/drivers/toml/toml.go b/drivers/toml/toml.go index 86d8c8b..127cee9 100644 --- a/drivers/toml/toml.go +++ b/drivers/toml/toml.go @@ -10,9 +10,9 @@ import ( "github.com/BurntSushi/toml" "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) type tomlDriver struct { diff --git a/drivers/toml/toml_gendoc_test.go b/drivers/toml/toml_gendoc_test.go index a0fa63e..9c4c72c 100644 --- a/drivers/toml/toml_gendoc_test.go +++ b/drivers/toml/toml_gendoc_test.go @@ -6,7 +6,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestTOMLDriver_GenDoc_NilItems(t *testing.T) { diff --git a/drivers/toml/toml_source_test.go b/drivers/toml/toml_source_test.go index 9d5a4ac..ebceb39 100644 --- a/drivers/toml/toml_source_test.go +++ b/drivers/toml/toml_source_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) func TestTomlDriver_WithSource(t *testing.T) { diff --git a/drivers/toml/toml_test.go b/drivers/toml/toml_test.go index 67d90b5..a8a9683 100644 --- a/drivers/toml/toml_test.go +++ b/drivers/toml/toml_test.go @@ -11,7 +11,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type testServer struct { diff --git a/drivers/toml/toml_watch_test.go b/drivers/toml/toml_watch_test.go index 111590f..5a42c80 100644 --- a/drivers/toml/toml_watch_test.go +++ b/drivers/toml/toml_watch_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestTOMLDriver_Watch(t *testing.T) { diff --git a/drivers/vault/client.go b/drivers/vault/client.go index 729263f..35f5613 100644 --- a/drivers/vault/client.go +++ b/drivers/vault/client.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const ( diff --git a/drivers/vault/vault.go b/drivers/vault/vault.go index def36e0..c74a6c4 100644 --- a/drivers/vault/vault.go +++ b/drivers/vault/vault.go @@ -14,9 +14,9 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) const name = "vault" diff --git a/drivers/vault/vault_test.go b/drivers/vault/vault_test.go index f865846..ca2e668 100644 --- a/drivers/vault/vault_test.go +++ b/drivers/vault/vault_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) // fakeVault is a minimal HTTP API of the KV secrets engine of Vault. diff --git a/drivers/yaml/example_test.go b/drivers/yaml/example_test.go index 5721153..835f471 100644 --- a/drivers/yaml/example_test.go +++ b/drivers/yaml/example_test.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/yaml" ) // Several sources are merged in the order of addition: the next source overrides the keys of the previous one. diff --git a/drivers/yaml/yaml.go b/drivers/yaml/yaml.go index cdd4c8e..bfd466e 100644 --- a/drivers/yaml/yaml.go +++ b/drivers/yaml/yaml.go @@ -10,11 +10,11 @@ import ( "gopkg.in/yaml.v3" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/cmp118" - "github.com/insei/tinyconf/convert" - "github.com/insei/tinyconf/drivers/internal/tree" - "github.com/insei/tinyconf/slices118" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/cmp118" + "github.com/insei/tinyconf/v2/convert" + "github.com/insei/tinyconf/v2/drivers/internal/tree" + "github.com/insei/tinyconf/v2/slices118" ) type yamlDriver struct { diff --git a/drivers/yaml/yaml_gendoc_test.go b/drivers/yaml/yaml_gendoc_test.go index 8b8e28b..e1be4e2 100644 --- a/drivers/yaml/yaml_gendoc_test.go +++ b/drivers/yaml/yaml_gendoc_test.go @@ -7,7 +7,7 @@ import ( "github.com/insei/fmap/v3" "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestYamlDriver_GenDoc_NotEncodable(t *testing.T) { diff --git a/drivers/yaml/yaml_source_test.go b/drivers/yaml/yaml_source_test.go index 778aecd..2a1eaaa 100644 --- a/drivers/yaml/yaml_source_test.go +++ b/drivers/yaml/yaml_source_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/internal/tree" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/internal/tree" ) func TestYamlDriver_WithSource(t *testing.T) { diff --git a/drivers/yaml/yaml_test.go b/drivers/yaml/yaml_test.go index 980d98b..307fbd6 100644 --- a/drivers/yaml/yaml_test.go +++ b/drivers/yaml/yaml_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/insei/fmap/v3" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" "github.com/stretchr/testify/assert" ) diff --git a/e2e/consul_test.go b/e2e/consul_test.go index 7c467ae..688c3bf 100644 --- a/e2e/consul_test.go +++ b/e2e/consul_test.go @@ -21,9 +21,9 @@ import ( "github.com/testcontainers/testcontainers-go" tcconsul "github.com/testcontainers/testcontainers-go/modules/consul" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/consul" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/consul" + "github.com/insei/tinyconf/v2/drivers/yaml" ) const consulImage = "hashicorp/consul:1.20" diff --git a/e2e/etcd_test.go b/e2e/etcd_test.go index 0d724b4..06bc155 100644 --- a/e2e/etcd_test.go +++ b/e2e/etcd_test.go @@ -18,9 +18,9 @@ import ( "github.com/testcontainers/testcontainers-go" tcetcd "github.com/testcontainers/testcontainers-go/modules/etcd" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/etcd" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/etcd" + "github.com/insei/tinyconf/v2/drivers/yaml" ) const etcdImage = "quay.io/coreos/etcd:v3.5.17" diff --git a/e2e/go.mod b/e2e/go.mod index b6d3d54..559e2f7 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -2,10 +2,10 @@ module github.com/insei/tinyconf/e2e go 1.25.0 -replace github.com/insei/tinyconf => ../ +replace github.com/insei/tinyconf/v2 => ../ require ( - github.com/insei/tinyconf v1.3.2 + github.com/insei/tinyconf/v2 v2.0.0 github.com/moby/moby/api v1.55.0 github.com/stretchr/testify v1.12.1 github.com/testcontainers/testcontainers-go v0.44.0 diff --git a/e2e/vault_test.go b/e2e/vault_test.go index a934bcc..1a243de 100644 --- a/e2e/vault_test.go +++ b/e2e/vault_test.go @@ -15,8 +15,8 @@ import ( "github.com/testcontainers/testcontainers-go" tcvault "github.com/testcontainers/testcontainers-go/modules/vault" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/vault" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/vault" ) const ( diff --git a/example/go.mod b/example/go.mod index f19f937..801898e 100644 --- a/example/go.mod +++ b/example/go.mod @@ -2,7 +2,7 @@ module example go 1.21 -require github.com/insei/tinyconf v1.1.0 +require github.com/insei/tinyconf/v2 v2.0.0 require ( github.com/fsnotify/fsnotify v1.9.0 // indirect @@ -13,4 +13,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/insei/tinyconf v1.1.0 => ../ +replace github.com/insei/tinyconf/v2 v2.0.0 => ../ diff --git a/example/main.go b/example/main.go index 468ee64..2dda21c 100644 --- a/example/main.go +++ b/example/main.go @@ -13,12 +13,12 @@ import ( "os/signal" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/flag" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" - "github.com/insei/tinyconf/logger" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/flag" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" + "github.com/insei/tinyconf/v2/logger" ) // HTTP is the config of the HTTP server package. diff --git a/example_test.go b/example_test.go index eda9ae2..6649917 100644 --- a/example_test.go +++ b/example_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "time" - "github.com/insei/tinyconf" - "github.com/insei/tinyconf/drivers/env" - "github.com/insei/tinyconf/drivers/flag" - "github.com/insei/tinyconf/drivers/tag" - "github.com/insei/tinyconf/drivers/yaml" + "github.com/insei/tinyconf/v2" + "github.com/insei/tinyconf/v2/drivers/env" + "github.com/insei/tinyconf/v2/drivers/flag" + "github.com/insei/tinyconf/v2/drivers/tag" + "github.com/insei/tinyconf/v2/drivers/yaml" ) type HTTP struct { diff --git a/go.mod b/go.mod index f7685a8..cec748a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/insei/tinyconf +module github.com/insei/tinyconf/v2 go 1.19 diff --git a/logger/fields_test.go b/logger/fields_test.go index 6c2f08b..d91f629 100644 --- a/logger/fields_test.go +++ b/logger/fields_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestFmtLogger_Fields(t *testing.T) { diff --git a/logger/fmt.go b/logger/fmt.go index 926962c..fefbded 100644 --- a/logger/fmt.go +++ b/logger/fmt.go @@ -3,7 +3,7 @@ package logger import ( "fmt" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type level uint8 diff --git a/logger/fmt_test.go b/logger/fmt_test.go index a196876..1148946 100644 --- a/logger/fmt_test.go +++ b/logger/fmt_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) // define a utility to capture stdout diff --git a/logger/slog.go b/logger/slog.go index 550acea..346148b 100644 --- a/logger/slog.go +++ b/logger/slog.go @@ -6,7 +6,7 @@ import ( "context" "log/slog" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type slogLogger struct { diff --git a/logger/slog_test.go b/logger/slog_test.go index 90e2751..8d1b57c 100644 --- a/logger/slog_test.go +++ b/logger/slog_test.go @@ -7,7 +7,7 @@ import ( "log/slog" "testing" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestSlogLogger(t *testing.T) { diff --git a/logger/zaplogger/go.mod b/logger/zaplogger/go.mod index 0353c59..89a0255 100644 --- a/logger/zaplogger/go.mod +++ b/logger/zaplogger/go.mod @@ -2,10 +2,10 @@ module github.com/insei/tinyconf/logger/zaplogger go 1.19 -replace github.com/insei/tinyconf => ../../ +replace github.com/insei/tinyconf/v2 => ../../ require ( - github.com/insei/tinyconf v1.3.2 + github.com/insei/tinyconf/v2 v2.0.0 github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.27.0 ) diff --git a/logger/zaplogger/zaplogger.go b/logger/zaplogger/zaplogger.go index 5aefbd8..bacba87 100644 --- a/logger/zaplogger/zaplogger.go +++ b/logger/zaplogger/zaplogger.go @@ -7,7 +7,7 @@ package zaplogger import ( "go.uber.org/zap" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) type zapLogger struct { diff --git a/logger/zaplogger/zaplogger_test.go b/logger/zaplogger/zaplogger_test.go index 3ef89cb..3ecc0e4 100644 --- a/logger/zaplogger/zaplogger_test.go +++ b/logger/zaplogger/zaplogger_test.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/insei/tinyconf" + "github.com/insei/tinyconf/v2" ) func TestLogger(t *testing.T) { diff --git a/parser.go b/parser.go index 31321f1..2e63e86 100644 --- a/parser.go +++ b/parser.go @@ -10,7 +10,7 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2/convert" ) type Registered struct { diff --git a/subscribe.go b/subscribe.go index 4f85384..4b4335e 100644 --- a/subscribe.go +++ b/subscribe.go @@ -10,7 +10,7 @@ import ( "github.com/insei/fmap/v3" - "github.com/insei/tinyconf/convert" + "github.com/insei/tinyconf/v2/convert" ) // configState is the state of the registered config. From e937fa4c2b490f5d66cd479bcb101c95ed2f0d81 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Sun, 18 Oct 2026 18:07:07 +0300 Subject: [PATCH 2/2] docs: add the upgrading to v2 page, zap is not a dependency of the core Signed-off-by: Dmitriy Aleksandrov --- docs/upgrading.md | 15 +++++++++++++++ docs/why-tinyconf.md | 4 +++- mkdocs.yml | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 docs/upgrading.md diff --git a/docs/upgrading.md b/docs/upgrading.md new file mode 100644 index 0000000..61d270e --- /dev/null +++ b/docs/upgrading.md @@ -0,0 +1,15 @@ +# Upgrading to v2 + +v2 changes the module path and a few methods. The steps for the code of v1: + +1. Change the imports from `github.com/insei/tinyconf/...` to `github.com/insei/tinyconf/v2/...`: + + ```sh + go get github.com/insei/tinyconf/v2@latest + ``` + +2. `Parse` takes the context: `Parse(conf)` is `Parse(context.Background(), conf)`. The context stops the requests of the [remote drivers](features/manager.md#parse). + +3. The zap adapter is the separate module, zap is not a dependency of the core anymore: `logger.NewZapLogger(l)` is `zaplogger.New(l)` from `github.com/insei/tinyconf/logger/zaplogger`, see [Logging](features/logging.md). + +4. Fields of an [embedded struct](features/structs.md#embedded-structs) without the tag are on the level of the embedding struct, like in `encoding/json`. Check the keys of such fields in the files and the environment variables. diff --git a/docs/why-tinyconf.md b/docs/why-tinyconf.md index 2ecd173..8a3f339 100644 --- a/docs/why-tinyconf.md +++ b/docs/why-tinyconf.md @@ -63,11 +63,13 @@ Checked against the current documentation of the libraries on 2026-10-16. - **No HCL out of the box.** The [format driver](drivers/format.md) accepts any decoder, but the conversion of HCL to a map is up to you. - **Own flag parser.** It ignores unknown flags, so it lives next to cobra or any CLI framework, but it is not a pflag integration. - **Subscriptions are package functions,** `tinyconf.Subscribe(ctx, config, ...)`, to keep Go 1.19 support; methods with type parameters need Go 1.27. -- **zap is a dependency of the core** because of the bundled logger adapter, even if you use another logger. - **A younger and smaller project** than viper and koanf. ## Migrating +From tinyconf v1: see [Upgrading to v2](upgrading.md). + + | From | To tinyconf | |---|---| | viper `SetDefault("http.port", 8080)` | `initial:"8080"` with the [tag driver](drivers/tag.md) | diff --git a/mkdocs.yml b/mkdocs.yml index 634f491..e67771d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -67,12 +67,13 @@ extra: - icon: fontawesome/brands/github link: https://github.com/Insei/tinyconf - icon: simple/go - link: https://pkg.go.dev/github.com/insei/tinyconf + link: https://pkg.go.dev/github.com/insei/tinyconf/v2 nav: - Get started: index.md - Why tinyconf?: why-tinyconf.md - Use cases: use-cases.md + - Upgrading to v2: upgrading.md - Features: - features/index.md - Manager: features/manager.md