Merge cockroachdb#133215

133215: cli: don't advertise --tenant-name-scope just yet r=cthumuluru-crdb a=cthumuluru-crdb

Implementation to authenticate using tenant name scopes from the client certs is not ready yet. Defer advertising the cli flag till it is ready.

Fixes: cockroachdb#133168
Epic: CRDB-43487
Release note (multi-tenancy): Hide --tenant-name-scope cli flag until the implementation is ready.

Co-authored-by: Chandra Thumuluru <chandra.thumuluru@cockroachlabs.com>

pkg/cli/flags.go

@@ -647,6 +647,7 @@ func init() {
 		if cmd == createClientCertCmd {
 			cliflagcfg.VarFlag(f, &tenantIDSetter{tenantIDs: &certCtx.tenantScope}, cliflags.TenantScope)
 			cliflagcfg.VarFlag(f, &tenantNameSetter{tenantNames: &certCtx.tenantNameScope}, cliflags.TenantScopeByNames)
+			_ = f.MarkHidden(cliflags.TenantScopeByNames.Name)
 
 			// PKCS8 key format is only available for the client cert command.
 			cliflagcfg.BoolFlag(f, &certCtx.generatePKCS8Key, cliflags.GeneratePKCS8Key)