From 8767e64ff07c0ef9a40157380cd5ed58b1a6cf60 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Mon, 28 Mar 2022 18:48:43 -0400 Subject: Log warning message when a deprecated function or datasource is used Signed-off-by: Dave Henderson --- internal/deprecated/deprecated.go | 14 ++++++++++++++ internal/tests/integration/datasources_boltdb_test.go | 9 +++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 internal/deprecated/deprecated.go (limited to 'internal') diff --git a/internal/deprecated/deprecated.go b/internal/deprecated/deprecated.go new file mode 100644 index 00000000..c453ebbe --- /dev/null +++ b/internal/deprecated/deprecated.go @@ -0,0 +1,14 @@ +package deprecated + +import ( + "context" + + "github.com/rs/zerolog" +) + +// WarnDeprecated - use this to warn about deprecated template functions or +// datasources +func WarnDeprecated(ctx context.Context, msg string) { + logger := zerolog.Ctx(ctx) + logger.Warn().Msgf("Deprecated: %s", msg) +} diff --git a/internal/tests/integration/datasources_boltdb_test.go b/internal/tests/integration/datasources_boltdb_test.go index fbae9782..848a3119 100644 --- a/internal/tests/integration/datasources_boltdb_test.go +++ b/internal/tests/integration/datasources_boltdb_test.go @@ -43,12 +43,13 @@ func setupDatasourcesBoltDBTest(t *testing.T) *fs.Dir { func TestDatasources_BoltDB_Datasource(t *testing.T) { tmpDir := setupDatasourcesBoltDBTest(t) - o, e, err := cmd(t, "-d", "config=boltdb://"+tmpDir.Join("config.db#Bucket1"), + // ignore the stderr output, it'll contain boltdb deprecation warning + o, _, err := cmd(t, "-d", "config=boltdb://"+tmpDir.Join("config.db#Bucket1"), "-i", `{{(ds "config" "foo")}}`).run() - assertSuccess(t, o, e, err, "bar") + assertSuccess(t, o, "", err, "bar") - o, e, err = cmd(t, "-d", "config=boltdb://"+tmpDir.Join("config.db#Bucket1"), + o, _, err = cmd(t, "-d", "config=boltdb://"+tmpDir.Join("config.db#Bucket1"), "-d", "config2=boltdb://"+tmpDir.Join("config.db#Bucket2"), "-i", `{{(ds "config" "foo")}}-{{(ds "config2" "foobar")}}`).run() - assertSuccess(t, o, e, err, "bar-baz") + assertSuccess(t, o, "", err, "bar-baz") } -- cgit v1.2.3