Skip to content

Commit

Permalink
cli/flags: clear a deprecation notice
Browse files Browse the repository at this point in the history
Requested by bdarnell: for symmetry with `cockroach start`, we do not
need a deprecation notice on `cockroach demo`.

Release note: None
  • Loading branch information
knz committed Dec 8, 2022
1 parent e152297 commit ade6297
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions pkg/cli/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"strings"

"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/build"
"github.com/cockroachdb/cockroach/pkg/cli/clientflags"
"github.com/cockroachdb/cockroach/pkg/cli/clienturl"
"github.com/cockroachdb/cockroach/pkg/cli/cliflagcfg"
Expand Down Expand Up @@ -787,11 +786,8 @@ func init() {
cliflagcfg.BoolFlag(f, &demoCtx.GeoPartitionedReplicas, cliflags.DemoGeoPartitionedReplicas)
cliflagcfg.VarFlag(f, &demoCtx.demoNodeSQLMemSizeValue, cliflags.DemoNodeSQLMemSize)
cliflagcfg.VarFlag(f, &demoCtx.demoNodeCacheSizeValue, cliflags.DemoNodeCacheSize)
cliflagcfg.BoolFlag(f, &demoCtx.Insecure, cliflags.ClientInsecure)
// NB: Insecure for `cockroach demo` is deprecated. See #53404.
_ = f.MarkDeprecated(cliflags.ServerInsecure.Name,
"to start a test server without any security, run start-single-node --insecure\n"+
"For details, see: "+build.MakeIssueURL(53404))
cliflagcfg.BoolFlag(f, &demoCtx.Insecure, cliflags.ClientInsecure)

cliflagcfg.BoolFlag(f, &demoCtx.disableEnterpriseFeatures, cliflags.DemoNoLicense)
cliflagcfg.BoolFlag(f, &demoCtx.DefaultEnableRangefeeds, cliflags.DemoEnableRangefeeds)
Expand Down

0 comments on commit ade6297

Please sign in to comment.