Merge cockroachdb#131805

131805: cli: {2} is reserved tenant ID, use {3} as tenant ID for demoapp r=cthumuluru-crdb a=cthumuluru-crdb Co-authored-by: Chandra Thumuluru <[email protected]>
cthumuluru-crdb · Oct 4, 2024 · e7b9bdd · e7b9bdd
2 parents 4de315c + 86cd9ac
commit e7b9bdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cli/democluster/demo_cluster.go b/pkg/cli/democluster/demo_cluster.go
@@ -104,7 +104,7 @@ const maxNodeInitTime = 60 * time.Second
 
 // secondaryTenantID is the ID of the secondary tenant to use when
 // --multitenant=true.
-const secondaryTenantID = 2
+const secondaryTenantID = 3
 
 // demoOrg is the organization to use to request an evaluation
 // license.

diff --git a/pkg/cli/democluster/demo_cluster_test.go b/pkg/cli/democluster/demo_cluster_test.go
@@ -406,7 +406,7 @@ func TestTenantCapabilities(t *testing.T) {
 		if cap == tenantcapabilities.TenantSpanConfigBounds {
 			capValue = `{}`
 		}
-		expectedRows = append(expectedRows, []string{`2`, demoTenantName, `ready`, `shared`, cap.String(), capValue})
+		expectedRows = append(expectedRows, []string{`3`, demoTenantName, `ready`, `shared`, cap.String(), capValue})
 	}
 	if !reflect.DeepEqual(expectedRows, rows) {
 		t.Fatalf("expected:\n%v\ngot:\n%v", expectedRows, rows)