Merge #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: #133168 Epic: CRDB-43487 Release note (multi-tenancy): Hide --tenant-name-scope cli flag until the implementation is ready. Co-authored-by: Chandra Thumuluru <[email protected]>
cockroachdb · Oct 23, 2024 · ee6710a · ee6710a
2 parents 787f2e3 + 48a8d94
commit ee6710a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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)