From 966f266f2e4f4471527dc78d8d3134050e32af51 Mon Sep 17 00:00:00 2001 From: Daniel Baptista Dias Date: Wed, 16 Aug 2023 12:07:27 -0300 Subject: [PATCH] chore(cli): add deprecation notice when running a transaction (#3069) --- cli/cmd/resources.go | 2 +- cli/runner/registry.go | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cli/cmd/resources.go b/cli/cmd/resources.go index 9e49f4182b..53c14cadd8 100644 --- a/cli/cmd/resources.go +++ b/cli/cmd/resources.go @@ -25,7 +25,7 @@ var ( formatters.TestSuiteRun(func() string { return cliConfig.URL() }, true), ) - runnerRegistry = runner.NewRegistry(). + runnerRegistry = runner.NewRegistry(cliLogger). Register(runner.TestRunner( testClient, openapiClient, diff --git a/cli/runner/registry.go b/cli/runner/registry.go index 2f865791a9..af62ade05f 100644 --- a/cli/runner/registry.go +++ b/cli/runner/registry.go @@ -2,17 +2,21 @@ package runner import ( "fmt" + + "go.uber.org/zap" ) type Registry struct { runners map[string]Runner proxies map[string]string + logger *zap.Logger } -func NewRegistry() Registry { +func NewRegistry(logger *zap.Logger) Registry { return Registry{ runners: map[string]Runner{}, proxies: map[string]string{}, + logger: logger, } } @@ -30,17 +34,18 @@ var ErrNotFound = fmt.Errorf("runner not found") func (r Registry) Get(name string) (Runner, error) { runner, ok := r.runners[name] - if !ok { - if runnerName, ok := r.proxies[name]; ok { - if !ok { - return nil, ErrNotFound - } + if ok { + return runner, nil // found runner, return it to the user + } - return r.Get(runnerName) - } + // fallback, check if the runner has a proxy + runnerName, ok := r.proxies[name] + if !ok { + return nil, ErrNotFound } - return runner, nil + r.logger.Warn(fmt.Sprintf("The resource `%s` is deprecated and will be removed in a future version. Please use `%s` instead.", name, runnerName)) + return r.Get(runnerName) } func (r Registry) List() []string {