Merge pull request #119 from cockroachdb/secure-version-gating

Fix up version gating for secure mode

Author: tbg

testing/main_test.go

@@ -193,11 +193,6 @@ var minRequiredVersionsByORMName = map[string]struct {
 	},
 }
 
-// minTenantVersion is the minimum version that supports creating SQL tenants
-// (i.e. the `cockroach mt start-sql command). Earlier versions cannot create
-// tenants.
-var minTenantVersion = version.MustParse("v20.2.0-alpha")
-
 type testInfo struct {
 	language, orm string
 	tableNames    testTableNames  // defaults to defaultTestTableNames
@@ -247,9 +242,32 @@ func testORM(t *testing.T, info testInfo) {
 			},
 		}
 
-		if crdbVersion.AtLeast(minTenantVersion) {
-			// This cockroach version supports creating tenants, add a test case to
-			// run a tenant server.
+		// This cockroach version supports creating tenants, add a test case to
+		// run a tenant server. We need at least 20.1-18 for everything to work out
+		// as the certificate story was reworked immediately before that version
+		// was minted.
+		var tenantsSupported bool
+		if err := db.QueryRow(`
+SELECT
+	(major = 20 AND minor = 1 AND unstable > 17)
+	OR (major = 20 AND minor > 1)
+	OR (major > 20)
+FROM
+	[
+		SELECT
+			regexp_extract(v, e'^(\\d+)\\.')::INT8 AS major,
+			regexp_extract(v, e'^\\d+\\.(\\d+)')::INT8
+				AS minor,
+			regexp_extract(v, e'^\\d+\\.\\d+-(\\d+)')::INT8
+				AS unstable
+		FROM
+			[SHOW CLUSTER SETTING version] AS t (v)
+	];
+`,
+		).Scan(&tenantsSupported); err != nil {
+			t.Fatalf("unable to read cluster version: %s", err)
+		}
+		if tenantsSupported {
 			tenant := newTenant(t, ts)
 			db, dbURL, stopDB := startServerWithApplication(t, tenant, app)
 			defer stopDB()
@@ -259,7 +277,7 @@ func testORM(t *testing.T, info testInfo) {
 				dbURL: dbURL,
 			})
 		} else {
-			t.Logf("not running tenant test case because minimum tenant version check was not satisfied (%s is < %s)", crdbVersion, minTenantVersion)
+			t.Logf("not running tenant test case because minimum tenant version check was not satisfied")
 		}
 	}
 
@@ -351,12 +369,7 @@ func testORM(t *testing.T, info testInfo) {
 }
 
 func TestGORM(t *testing.T) {
-	testORM(t, testInfo{
-		language: "go",
-		orm:      "gorm",
-		// TODO(rafi): Test secure mode. See https://github.com/cockroachdb/examples-orms/issues/117)
-		insecure: true,
-	})
+	testORM(t, testInfo{language: "go", orm: "gorm"})
 }
 
 func TestGOPG(t *testing.T) {
@@ -396,8 +409,6 @@ func TestSQLAlchemy(t *testing.T) {
 	testORM(t, testInfo{
 		language: "python",
 		orm:      "sqlalchemy",
-		// TODO(rafi): Test secure mode. See https://github.com/cockroachdb/examples-orms/issues/117)
-		insecure: true,
 	})
 }
 
@@ -414,19 +425,9 @@ func TestDjango(t *testing.T) {
 }
 
 func TestActiveRecord(t *testing.T) {
-	testORM(t, testInfo{
-		language: "ruby",
-		orm:      "activerecord",
-		// TODO(rafi): Test secure mode. See https://github.com/cockroachdb/examples-orms/issues/117)
-		insecure: true,
-	})
+	testORM(t, testInfo{language: "ruby", orm: "activerecord"})
 }
 
 func TestActiveRecord4(t *testing.T) {
-	testORM(t, testInfo{
-		language: "ruby",
-		orm:      "ar4",
-		// TODO(rafi): Test secure mode. See https://github.com/cockroachdb/examples-orms/issues/117)
-		insecure: true,
-	})
+	testORM(t, testInfo{language: "ruby", orm: "ar4"})
 }