From 48a8d9480194fb70ba66e8248d3c8330c5b3e3bf Mon Sep 17 00:00:00 2001 From: Chandra Thumuluru Date: Wed, 23 Oct 2024 08:19:31 +0530 Subject: [PATCH] cli: don't advertise --tenant-name-scope just yet 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: https://github.com/cockroachdb/cockroach/issues/133168 Epic: CRDB-43487 Release note (multi-tenancy): Hide --tenant-name-scope cli flag until the implementation is ready. --- pkg/cli/flags.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/cli/flags.go b/pkg/cli/flags.go index 647419c48e30..60f6878fa1ba 100644 --- a/pkg/cli/flags.go +++ b/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)