@cubejs-backend/testing 1.6.66 → 1.7.0

package/birdbox-fixtures/lambda/cube.js

@@ -1,6 +1,3 @@
-const PostgresDriver = require("@cubejs-backend/postgres-driver");
-const KsqlDriver = require("@cubejs-backend/ksql-driver");
-
 module.exports = {
   orchestratorOptions: {
     preAggregationsOptions: {
@@ -10,22 +7,16 @@ module.exports = {
   contextToApiScopes: async () => new Promise((resolve) => {
     resolve(['graphql', 'meta', 'data', 'jobs']);
   }),
-  dbType: ({ dataSource }) => {
-    if (dataSource === 'default') {
-      return 'postgres';
-    }
-
-    return dataSource || 'postgres';
-  },
-  driverFactory: async ({ dataSource }) => {
-    if (dataSource === "ksql") {
-      return new KsqlDriver({
+  driverFactory: ({ dataSource }) => {
+    if (dataSource === 'ksql') {
+      return {
+        type: 'ksql',
         url: process.env.KSQL_URL,
         kafkaHost: process.env.KSQL_KAFKA_HOST,
         kafkaUseSsl: false,
-      });
+      };
     }
 
-    return new PostgresDriver();
+    return { type: 'postgres' };
   }
 };

package/birdbox-fixtures/multidb/cube.js

@@ -1,26 +1,21 @@
-const PostgresDriver = require('@cubejs-backend/postgres-driver');
-const MySqlDriver = require("@cubejs-backend/mysql-driver");
-
 module.exports = {
-  dbType: ({ dataSource }) => {
-    switch (dataSource) {
-      case 'suppliers': return 'postgres';
-      case 'products': return 'mysql';
-      default: return 'postgres';
-    }
-  },
-
   driverFactory: ({ dataSource }) => {
     switch (dataSource) {
-      case 'suppliers': return new PostgresDriver({});
-      case 'products': return new MySqlDriver({
-        host: process.env.CUBEJS_DB_HOST2,
-        port: process.env.CUBEJS_DB_PORT2,
-        database: process.env.CUBEJS_DB_NAME2,
-        user: process.env.CUBEJS_DB_USER2,
-        password: process.env.CUBEJS_DB_PASS2,
-      });
-      default: throw new Error(`driverFactory: Invalid dataSource '${dataSource}'`);
+      case 'suppliers':
+        return { type: 'postgres' };
+      case 'products':
+        return {
+          type: 'mysql',
+          host: process.env.CUBEJS_DB_HOST2,
+          port: process.env.CUBEJS_DB_PORT2,
+          database: process.env.CUBEJS_DB_NAME2,
+          user: process.env.CUBEJS_DB_USER2,
+          password: process.env.CUBEJS_DB_PASS2,
+        };
+      case 'default':
+        return { type: 'postgres' };
+      default:
+        throw new Error(`driverFactory: Invalid dataSource '${dataSource}'`);
     }
   },
 };

package/birdbox-fixtures/rbac/cube.js

@@ -1,5 +1,4 @@
 module.exports = {
-  contextToRoles: async (context) => context.securityContext.auth?.roles || [],
   contextToGroups: async (context) => context.securityContext.auth?.groups || [],
   canSwitchSqlUser: async () => true,
   checkSqlAuth: async (req, user, password) => {
@@ -19,8 +18,7 @@ module.exports = {
               canHaveAdmin: true,
               minDefaultId: 10000,
             },
-            roles: ['admin', 'ownder', 'hr'],
-            groups: ['leadership', 'hr'],
+            groups: ['leadership', 'hr', 'admin'],
           },
         },
       };
@@ -41,8 +39,7 @@ module.exports = {
               canHaveAdmin: false,
               minDefaultId: 10000,
             },
-            roles: ['manager'],
-            groups: ['management'],
+            groups: ['management', 'manager'],
           },
         },
       };
@@ -63,7 +60,6 @@ module.exports = {
               canHaveAdmin: false,
               minDefaultId: 20000,
             },
-            roles: [],
             groups: ['general'],
           },
         },
@@ -85,7 +81,6 @@ module.exports = {
               canHaveAdmin: true,
               minDefaultId: 20000,
             },
-            roles: ['restricted'],
             groups: ['restricted'],
           },
         },
@@ -107,14 +102,13 @@ module.exports = {
               region: 'CA',
               allowedCities: ['Los Angeles', 'New York'],
             },
-            roles: [],
             groups: ['developer'],
           },
         },
       };
     }
     // User for testing two-dimensional policy overlap (matches diagram in CompilerApi.ts)
-    // Has policy2_role, so both Policy 1 (*) and Policy 2 (policy2_role) apply
+    // Has policy2_group, so both Policy 1 (*) and Policy 2 (policy2_group) apply
     if (user === 'policy_test') {
       if (password && password !== 'policy_test_password') {
         throw new Error(`Password doesn't match for ${user}`);
@@ -126,13 +120,12 @@ module.exports = {
           auth: {
             username: 'policy_test',
             userAttributes: {},
-            roles: ['policy2_role'],
-            groups: [],
+            groups: ['policy2_group'],
           },
         },
       };
     }
-    // User for masking tests - no special roles, sees only masked values
+    // User for masking tests - no special groups, sees only masked values
     if (user === 'masking_viewer') {
       if (password && password !== 'masking_viewer_password') {
         throw new Error(`Password doesn't match for ${user}`);
@@ -144,13 +137,12 @@ module.exports = {
           auth: {
             username: 'masking_viewer',
             userAttributes: {},
-            roles: [],
             groups: [],
           },
         },
       };
     }
-    // User for masking tests - has full access role
+    // User for masking tests - has full access group
     if (user === 'masking_full') {
       if (password && password !== 'masking_full_password') {
         throw new Error(`Password doesn't match for ${user}`);
@@ -162,8 +154,7 @@ module.exports = {
           auth: {
             username: 'masking_full',
             userAttributes: {},
-            roles: ['masking_full_access'],
-            groups: [],
+            groups: ['masking_full_access'],
           },
         },
       };
@@ -180,8 +171,7 @@ module.exports = {
           auth: {
             username: 'masking_partial',
             userAttributes: {},
-            roles: ['masking_partial'],
-            groups: [],
+            groups: ['masking_partial'],
           },
         },
       };
@@ -199,7 +189,6 @@ module.exports = {
             userAttributes: {
               allowedProductIds: [1, 2],
             },
-            roles: [],
             groups: ['user_group', 'region_group'],
           },
         },
@@ -216,7 +205,6 @@ module.exports = {
           auth: {
             username: 'region_user_no_filter',
             userAttributes: {},
-            roles: [],
             groups: ['user_group'],
           },
         },
@@ -239,7 +227,6 @@ module.exports = {
           auth: {
             username: 'sc_test',
             userAttributes: {},
-            roles: [],
             groups: [],
           },
         },
@@ -256,8 +243,7 @@ module.exports = {
           auth: {
             username: 'conditional_mask_user',
             userAttributes: {},
-            roles: ['conditional_mask_role'],
-            groups: [],
+            groups: ['conditional_mask_group'],
           },
         },
       };
@@ -273,8 +259,7 @@ module.exports = {
           auth: {
             username: 'conditional_mask_multi_user',
             userAttributes: {},
-            roles: ['conditional_mask_role', 'conditional_mask_role_extra'],
-            groups: [],
+            groups: ['conditional_mask_group', 'conditional_mask_group_extra'],
           },
         },
       };
@@ -292,7 +277,6 @@ module.exports = {
           auth: {
             username: 'single_policy_measure_user',
             userAttributes: {},
-            roles: [],
             groups: ['spm_full_group'],
           },
         },
@@ -311,7 +295,6 @@ module.exports = {
           auth: {
             username: 'multi_group_user',
             userAttributes: {},
-            roles: [],
             groups: ['mg_group_a', 'mg_group_c'],
           },
         },

package/birdbox-fixtures/rbac/model/cubes/conditional_masking_test.yaml

@@ -26,13 +26,13 @@ cubes:
         type: sum
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: []
         member_masking:
           includes: "*"
 
-      - role: "conditional_mask_role"
+      - group: "conditional_mask_group"
         member_level:
           includes: "*"
         row_level:
@@ -42,7 +42,7 @@ cubes:
               values:
                 - "3"
 
-      - role: "conditional_mask_role_extra"
+      - group: "conditional_mask_group_extra"
         member_level:
           includes: "*"
         row_level:

package/birdbox-fixtures/rbac/model/cubes/line_items.js

@@ -47,7 +47,7 @@ cube('line_items', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       rowLevel: {
         filters: [{
           member: 'id',
@@ -61,13 +61,13 @@ cube('line_items', {
       },
     },
     {
-      role: 'restricted',
+      group: 'restricted',
       memberLevel: {
         excludes: ['count', 'price', 'price_dim'],
       },
     },
     {
-      role: 'admin',
+      group: 'admin',
       conditions: [
         {
           if: security_context.auth?.userAttributes?.region === 'CA',
@@ -82,7 +82,7 @@ cube('line_items', {
       },
     },
     {
-      role: 'manager',
+      group: 'manager',
       conditions: [
         {
           if: security_context.auth?.userAttributes?.region === 'CA',

package/birdbox-fixtures/rbac/model/cubes/masking_test.yaml

@@ -43,19 +43,19 @@ cubes:
         type: sum
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: []
         member_masking:
           includes: "*"
 
-      - role: "masking_full_access"
+      - group: "masking_full_access"
         member_level:
           includes: "*"
         row_level:
           allow_all: true
 
-      - role: "masking_partial"
+      - group: "masking_partial"
         member_level:
           includes:
             - id
@@ -102,7 +102,7 @@ cubes:
         type: sum
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: []
 
@@ -126,7 +126,7 @@ cubes:
         type: count
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: []
         member_masking:
@@ -205,7 +205,7 @@ cubes:
         type: count
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes:
             - id
@@ -231,7 +231,7 @@ views:
           - count_d
           - total_quantity
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: "*"
         row_level:
@@ -249,14 +249,14 @@ views:
           - count_d
           - total_quantity
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: []
         member_masking:
           includes: "*"
         row_level:
           allow_all: true
-      - role: "masking_full_access"
+      - group: "masking_full_access"
         member_level:
           includes: "*"
         row_level:
@@ -274,7 +274,7 @@ views:
           - count_d
           - total_quantity
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes:
             - public_dim
@@ -304,7 +304,7 @@ views:
           - count
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes:
             - view_mask_base_id
@@ -330,7 +330,7 @@ views:
           - count
           - total_quantity
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes:
             - public_dim
@@ -339,7 +339,7 @@ views:
           includes: "*"
         row_level:
           allow_all: true
-      - role: "masking_full_access"
+      - group: "masking_full_access"
         member_level:
           includes: "*"
         row_level:

package/birdbox-fixtures/rbac/model/cubes/orders.js

@@ -31,7 +31,7 @@ cube('orders', {
 
   access_policy: [
     {
-      role: '*',
+      group: '*',
       memberLevel: {
         // This cube is "private" by default and only accessible via views
         includes: [],
@@ -47,7 +47,7 @@ cube('orders', {
       },
     },
     {
-      role: 'admin',
+      group: 'admin',
       memberLevel: {
         // This cube is "private" by default and only accessible via views
         includes: [],

package/birdbox-fixtures/rbac/model/cubes/policy_overlap_test.yaml

@@ -51,7 +51,7 @@ views:
 
     access_policy:
       # Policy 1: covers members a, b (and count, id for filtering) with row filter R1 (id < 500)
-      - role: "*"
+      - group: "*"
         member_level:
           includes:
             - id
@@ -66,7 +66,7 @@ views:
                 - "500"
 
       # Policy 2: covers members b, c (and count, id for filtering) with row filter R2 (id >= 500)
-      - role: "policy2_role"
+      - group: "policy2_group"
         member_level:
           includes:
             - id

package/birdbox-fixtures/rbac/model/cubes/products.yaml

@@ -25,4 +25,4 @@ cubes:
         type: time
 
     access_policy:
-      - role: some_role
+      - group: some_group

package/birdbox-fixtures/rbac/model/cubes/region_test.yaml

@@ -17,7 +17,7 @@ cubes:
         type: number
 
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: "*"
         row_level:

package/birdbox-fixtures/rbac/model/cubes/security_context_test.js

@@ -96,7 +96,7 @@ cube('sc_ua_mask_test', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       memberLevel: {
         includes: [],
       },
@@ -133,7 +133,7 @@ cube('sc_cube_mask_test', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       memberLevel: {
         includes: [],
       },
@@ -181,7 +181,7 @@ cube('sc_joined_mask_test', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       memberLevel: {
         includes: [],
       },
@@ -215,7 +215,7 @@ cube('sc_groups_shorthand_test', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       rowLevel: {
         filters: [{
           member: 'product_id',

package/birdbox-fixtures/rbac/model/cubes/users.yaml

@@ -18,13 +18,13 @@ cubes:
         primary_key: true
 
     access_policy:
-      - role: "*"
+      - group: "*"
         row_level:
           filters:
             - member: "{CUBE}.city"
               operator: equals
               values: ["{ security_context.auth.userAttributes.city }"]
-      - role: admin
+      - group: admin
         conditions:
           # This thing will fail if there's no auth info in the context
           # Unfortunately, as of now, there's no way to write more complex expressions

package/birdbox-fixtures/rbac/model/views/users.js

@@ -4,7 +4,7 @@ view('users_view', {
     includes: '*',
   }],
   accessPolicy: [{
-    role: '*',
+    group: '*',
     rowLevel: {
       filters: [{
         member: 'id',

package/birdbox-fixtures/rbac/model/views/views.yaml

@@ -4,7 +4,7 @@ views:
       - join_path: line_items
         includes: "*"
     access_policy:
-      - role: "*"
+      - group: "*"
         row_level:
           filters:
             - member: "${CUBE}.price_dim"
@@ -30,14 +30,14 @@ views:
       - join_path: orders
         includes: "*"
     access_policy:
-      - role: admin
+      - group: admin
         member_level:
           includes: "*"
         row_level:
           allow_all: true
 
   # Two-layer row-level filtering: the underlying `orders` cube restricts rows
-  # to id IN {1, 10, 11} (role "*" → id = 1, role admin → id = 10 OR id = 11),
+  # to id IN {1, 10, 11} (group "*" → id = 1, group admin → id = 10 OR id = 11),
   # while this view adds its own row filter id < 11. A row must satisfy BOTH
   # the cube policy AND the view policy, so the result is id IN {1, 10}.
   - name: orders_two_layer_test
@@ -45,7 +45,7 @@ views:
       - join_path: orders
         includes: "*"
     access_policy:
-      - role: "*"
+      - group: "*"
         member_level:
           includes: "*"
         row_level:

package/birdbox-fixtures/rbac-graphql/cube.js

@@ -1,5 +1,5 @@
 module.exports = {
-  contextToRoles: ({ securityContext }) => securityContext?.auth?.roles || ['*'],
+  contextToGroups: ({ securityContext }) => securityContext?.auth?.groups || ['*'],
 
   // Same app ID for all tenants so they share a CompilerApi instance
   contextToAppId: () => 'CUBEJS_APP_shared',

package/birdbox-fixtures/rbac-graphql/model/Orders.js

@@ -33,20 +33,20 @@ cube('Orders', {
 
   accessPolicy: [
     {
-      role: '*',
+      group: '*',
       memberLevel: {
         includes: [],
       },
     },
     {
-      role: 'tenant-a',
+      group: 'tenant-a',
       memberLevel: {
         includes: '*',
         excludes: ['tier'],
       },
     },
     {
-      role: 'tenant-b',
+      group: 'tenant-b',
       memberLevel: {
         includes: '*',
         excludes: ['internalCode'],

package/birdbox-fixtures/rbac-python/cube.py

@@ -3,9 +3,9 @@
 from cube import config
 
 
-@config('context_to_roles')
-def context_to_roles(context):
-    return context.get("securityContext", {}).get("auth", {}).get("roles", [])
+@config('context_to_groups')
+def context_to_groups(context):
+    return context.get("securityContext", {}).get("auth", {}).get("groups", [])
 
 
 def extract_matching_dicts(data):
@@ -55,7 +55,7 @@ def check_sql_auth(query: dict, username: str, password: str) -> dict:
                         'canHaveAdmin': True,
                         'city': 'New York'
                     },
-                    'roles': ['admin']
+                    'groups': ['admin']
                 }
             }
         }

package/birdbox-fixtures/rbac-python/model/cubes/products.yaml

@@ -25,4 +25,4 @@ cubes:
         type: time
 
     access_policy:
-      - role: some_role
+      - group: some_group

package/birdbox-fixtures/rbac-python/model/cubes/users.yaml

@@ -18,13 +18,13 @@ cubes:
         primary_key: true
 
     access_policy:
-      - role: "*"
+      - group: "*"
         row_level:
           filters:
             - member: "{CUBE}.city"
               operator: equals
               values: ["{ security_context.auth.userAttributes.city }"]
-      - role: admin
+      - group: admin
         conditions:
           # This thing will fail if there's no auth info in the context
           # Unfortunately, as of now, there's no way to write more complex expressions

package/birdbox-fixtures/rbac-python/model/views/users_view.yaml

@@ -5,7 +5,7 @@ views:
         includes: "*"
 
     access_policy:
-      - role: '*'
+      - group: '*'
         row_level:
           filters:
             - member: id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-backend/testing",
-  "version": "1.6.66",
+  "version": "1.7.0",
   "description": "Cube.js e2e tests",
   "author": "Cube Dev, Inc.",
   "repository": {
@@ -12,7 +12,7 @@
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
   "engines": {
-    "node": "^14.0.0 || ^16.0.0 || >=17.0.0"
+    "node": ">=20.0.0"
   },
   "scripts": {
     "cypress:open": "kill-port 4000 && TEST_PLAYGROUND_PORT=3080 yarn cypress:birdbox",
@@ -100,15 +100,15 @@
     "birdbox-fixtures"
   ],
   "dependencies": {
-    "@cubejs-backend/cubestore-driver": "1.6.66",
+    "@cubejs-backend/cubestore-driver": "1.7.0",
     "@cubejs-backend/dotenv": "^9.0.2",
-    "@cubejs-backend/ksql-driver": "1.6.66",
-    "@cubejs-backend/postgres-driver": "1.6.66",
-    "@cubejs-backend/query-orchestrator": "1.6.66",
-    "@cubejs-backend/schema-compiler": "1.6.66",
-    "@cubejs-backend/shared": "1.6.66",
-    "@cubejs-backend/testing-shared": "1.6.66",
-    "@cubejs-client/ws-transport": "1.6.66",
+    "@cubejs-backend/ksql-driver": "1.7.0",
+    "@cubejs-backend/postgres-driver": "1.7.0",
+    "@cubejs-backend/query-orchestrator": "1.7.0",
+    "@cubejs-backend/schema-compiler": "1.7.0",
+    "@cubejs-backend/shared": "1.7.0",
+    "@cubejs-backend/testing-shared": "1.7.0",
+    "@cubejs-client/ws-transport": "1.7.0",
     "dedent": "^0.7.0",
     "fs-extra": "^8.1.0",
     "http-proxy": "^1.18.1",
@@ -119,13 +119,13 @@
   },
   "devDependencies": {
     "@4tw/cypress-drag-drop": "^1.6.0",
-    "@cubejs-backend/linter": "1.6.66",
-    "@cubejs-client/core": "1.6.66",
+    "@cubejs-backend/linter": "1.7.0",
+    "@cubejs-client/core": "1.7.0",
     "@jest/globals": "^29",
     "@types/dedent": "^0.7.0",
     "@types/http-proxy": "^1.17.5",
     "@types/jest": "^29",
-    "@types/node": "^20",
+    "@types/node": "^22",
     "cypress": "14.0.0",
     "cypress-image-snapshot": "^4.0.1",
     "cypress-localstorage-commands": "^1.4.5",
@@ -146,5 +146,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "ea64dffa4d2a5c9422928ae8e96a76196bd9d5ce"
+  "gitHead": "1635ffd9dc3bf1de886bd6de6a1ab86068918942"
 }