Skip to content

Commit

Permalink
Merge #133215
Browse files Browse the repository at this point in the history
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 <chandra.thumuluru@cockroachlabs.com>
  • Loading branch information
craig[bot] and cthumuluru-crdb committed Oct 23, 2024
2 parents 787f2e3 + 48a8d94 commit ee6710a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkg/cli/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ee6710a

Please sign in to comment.